From 249f635772bea11714e48ecc4764bbaf617b5081 Mon Sep 17 00:00:00 2001
From: Mo8it <mo8it@proton.me>
Date: Thu, 22 Sep 2022 20:30:43 +0200
Subject: [PATCH] Remove number_of_all_experiment_marks from assistants home
 page

---
 advlabdb/custom_classes.py                    | 10 ++--------
 advlabdb/templates/assistant_index.jinja.html |  3 +--
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/advlabdb/custom_classes.py b/advlabdb/custom_classes.py
index e634c1e..abc663c 100644
--- a/advlabdb/custom_classes.py
+++ b/advlabdb/custom_classes.py
@@ -63,25 +63,19 @@ class SecureAssistantIndexView(CustomIndexView):
 
     @expose("/")
     def index(self):
-        active_semester_experiment_mark_ids_stmt = (
+        number_of_missing_final_experiment_marks = db.session.scalar(
             select(func.count(ExperimentMark.final_experiment_mark))
             .join(GroupExperiment)
             .join(SemesterExperiment)
             .where(SemesterExperiment.semester == current_user.active_semester)
             .join(SemesterExperiment.assistants)
             .where(Assistant.user == current_user)
-        )
-
-        number_of_all_experiment_marks = db.session.scalar(active_semester_experiment_mark_ids_stmt)
-
-        number_of_missing_final_experiment_marks = db.session.scalar(
-            active_semester_experiment_mark_ids_stmt.where(ExperimentMark.final_experiment_mark == None)
+            .where(ExperimentMark.final_experiment_mark == None)
         )
 
         return self.render(
             "assistant_index.jinja.html",
             number_of_missing_final_experiment_marks=number_of_missing_final_experiment_marks,
-            number_of_all_experiment_marks=number_of_all_experiment_marks,
         )
 
 
diff --git a/advlabdb/templates/assistant_index.jinja.html b/advlabdb/templates/assistant_index.jinja.html
index ad8e6cc..3054b8b 100644
--- a/advlabdb/templates/assistant_index.jinja.html
+++ b/advlabdb/templates/assistant_index.jinja.html
@@ -7,8 +7,7 @@
     <hr>
 
     <p>
-        Number of <strong>missing</strong> final experiment marks:
-        {{ number_of_missing_final_experiment_marks }} / {{ number_of_all_experiment_marks }}
+        Number of <strong>missing</strong> final experiment marks: {{ number_of_missing_final_experiment_marks }}
     </p>
 
     {{ super() }}