diff --git a/advlabdb/assistantModelViews.py b/advlabdb/assistantModelViews.py index f66e8ca..65a8759 100644 --- a/advlabdb/assistantModelViews.py +++ b/advlabdb/assistantModelViews.py @@ -35,6 +35,8 @@ from advlabdb.utils import ( class AssistantAppointmentView(SecureAssistantModelView): + can_edit = True + column_list = [ "date", "special", @@ -51,6 +53,7 @@ class AssistantAppointmentView(SecureAssistantModelView): column_editable_list = [ "date", ] + form_columns = column_editable_list def queryFilter(self): return and_( @@ -62,6 +65,8 @@ class AssistantAppointmentView(SecureAssistantModelView): class AssistantExperimentMarkView(SecureAssistantModelView): + can_edit = True + column_list = [ "oral_mark", "protocol_mark", @@ -98,6 +103,8 @@ class AssistantExperimentMarkView(SecureAssistantModelView): "oral_mark", "protocol_mark", ] + form_columns = column_editable_list + form_args = { "oral_mark": {"validators": [NumberRange(0, 15)]}, "protocol_mark": {"validators": [NumberRange(0, 15)]}, diff --git a/advlabdb/templates/admin_index.html b/advlabdb/templates/admin_index.html index 567b641..d96fa6e 100644 --- a/advlabdb/templates/admin_index.html +++ b/advlabdb/templates/admin_index.html @@ -3,7 +3,8 @@ {% block body %} {{information(current_user, userActiveSemester, role="admin")}} -

Welcome back, commander!

+ +
{{missing_final_experiment_marks(number_of_missing_final_experiment_marks, number_of_all_experiment_marks)}} diff --git a/advlabdb/templates/assistant_index.html b/advlabdb/templates/assistant_index.html index 65753c1..2ff4e5b 100644 --- a/advlabdb/templates/assistant_index.html +++ b/advlabdb/templates/assistant_index.html @@ -3,7 +3,8 @@ {% block body %} {{information(current_user, userActiveSemester, role="assistant")}} -

Welcome back!

+ +
{{missing_final_experiment_marks(number_of_missing_final_experiment_marks, number_of_all_experiment_marks)}} diff --git a/advlabdb/templates/macros.html b/advlabdb/templates/macros.html index 75b2228..fc5ebc2 100644 --- a/advlabdb/templates/macros.html +++ b/advlabdb/templates/macros.html @@ -12,7 +12,7 @@ User: