mirror of
https://codeberg.org/Mo8it/AdvLabDB.git
synced 2025-03-23 20:13:57 +00:00
Remove number_of_all_experiment_marks from assistants home page
This commit is contained in:
parent
83f4726296
commit
249f635772
2 changed files with 3 additions and 10 deletions
advlabdb
|
@ -63,25 +63,19 @@ class SecureAssistantIndexView(CustomIndexView):
|
||||||
|
|
||||||
@expose("/")
|
@expose("/")
|
||||||
def index(self):
|
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))
|
select(func.count(ExperimentMark.final_experiment_mark))
|
||||||
.join(GroupExperiment)
|
.join(GroupExperiment)
|
||||||
.join(SemesterExperiment)
|
.join(SemesterExperiment)
|
||||||
.where(SemesterExperiment.semester == current_user.active_semester)
|
.where(SemesterExperiment.semester == current_user.active_semester)
|
||||||
.join(SemesterExperiment.assistants)
|
.join(SemesterExperiment.assistants)
|
||||||
.where(Assistant.user == current_user)
|
.where(Assistant.user == current_user)
|
||||||
)
|
.where(ExperimentMark.final_experiment_mark == None)
|
||||||
|
|
||||||
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)
|
|
||||||
)
|
)
|
||||||
|
|
||||||
return self.render(
|
return self.render(
|
||||||
"assistant_index.jinja.html",
|
"assistant_index.jinja.html",
|
||||||
number_of_missing_final_experiment_marks=number_of_missing_final_experiment_marks,
|
number_of_missing_final_experiment_marks=number_of_missing_final_experiment_marks,
|
||||||
number_of_all_experiment_marks=number_of_all_experiment_marks,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -7,8 +7,7 @@
|
||||||
<hr>
|
<hr>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
Number of <strong>missing</strong> final experiment marks:
|
Number of <strong>missing</strong> final experiment marks: {{ number_of_missing_final_experiment_marks }}
|
||||||
{{ number_of_missing_final_experiment_marks }} / {{ number_of_all_experiment_marks }}
|
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
{{ super() }}
|
{{ super() }}
|
||||||
|
|
Loading…
Add table
Reference in a new issue