From f287a5325cad63ceb679450b1616f054a8705ee0 Mon Sep 17 00:00:00 2001
From: Mo8it <mo8it@proton.me>
Date: Thu, 24 Feb 2022 01:28:09 +0100
Subject: [PATCH] Fix assistant's editing

---
 advlabdb/assistantModelViews.py         | 7 +++++++
 advlabdb/templates/admin_index.html     | 3 ++-
 advlabdb/templates/assistant_index.html | 3 ++-
 advlabdb/templates/macros.html          | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

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")}}
-<h3>Welcome back, commander!</h3>
+
+<hr>
 
 {{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")}}
-<h3>Welcome back!</h3>
+
+<hr>
 
 {{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: <a href="{{ url_for('index') }}{{ role }}/user/details/?id={{ current_user
 
 {% macro missing_final_experiment_marks(number_of_missing_final_experiment_marks, number_of_all_experiment_marks) %}
 <p>
-    Number of missing final experiment marks:
+    Number of <strong>missing</strong> final experiment marks:
     {{ number_of_missing_final_experiment_marks }} / {{ number_of_all_experiment_marks }}
 </p>
 {% endmacro %}
\ No newline at end of file