From e92c7fe127caf2337190c0b31f2122f885b0dba2 Mon Sep 17 00:00:00 2001 From: Mo8it Date: Tue, 28 Jun 2022 03:53:17 +0200 Subject: [PATCH] Change Submit to save --- advlabdb/advlabdb_independent_funs.py | 2 +- advlabdb/forms.py | 2 +- advlabdb/templates/assistant_group_experiment_form.html | 5 ++++- advlabdb/templates/docs/admin.html | 4 +--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/advlabdb/advlabdb_independent_funs.py b/advlabdb/advlabdb_independent_funs.py index 072d9c8..f7c6c94 100644 --- a/advlabdb/advlabdb_independent_funs.py +++ b/advlabdb/advlabdb_independent_funs.py @@ -30,7 +30,7 @@ def deep_getattr(object, composed_name): def missing_formatter(view, context, model, name): attr = deep_getattr(model, name) if attr is None: - return Markup("MISSING") + return Markup("MISSING") return attr diff --git a/advlabdb/forms.py b/advlabdb/forms.py index cd7b503..fc54069 100644 --- a/advlabdb/forms.py +++ b/advlabdb/forms.py @@ -6,7 +6,7 @@ from .model_dependent_funs import selection_mark_field class AssistantGroupExperimentFormBase(FlaskForm): - submit = SubmitField(label="Submit", render_kw={"class": "btn btn-success"}) + submit = SubmitField(label="Save", render_kw={"class": "btn btn-primary btn-block"}) def assistant_group_experiment_form_factory(current_user, group_experiment): diff --git a/advlabdb/templates/assistant_group_experiment_form.html b/advlabdb/templates/assistant_group_experiment_form.html index da600f0..893cfbe 100644 --- a/advlabdb/templates/assistant_group_experiment_form.html +++ b/advlabdb/templates/assistant_group_experiment_form.html @@ -102,7 +102,7 @@ {% if final_experiment_mark is none %} - None + None {% else %} {{ final_experiment_mark }} {% endif %} @@ -128,6 +128,8 @@ +
+ {{ form.submit }} @@ -140,5 +142,6 @@ It is for information related to the experiment and group. Examples: Protocol received, submission until ..., etc.

+ {{ footer|safe }} {% endblock body %} diff --git a/advlabdb/templates/docs/admin.html b/advlabdb/templates/docs/admin.html index bc39ea0..91dd849 100644 --- a/advlabdb/templates/docs/admin.html +++ b/advlabdb/templates/docs/admin.html @@ -1,3 +1 @@ -
-

Coming soon…​

-
\ No newline at end of file +

Coming soon...