From 7a1c0e9d550e727443bcc82708facb240e4d3c95 Mon Sep 17 00:00:00 2001 From: Mo8it Date: Sun, 10 Apr 2022 21:01:56 +0200 Subject: [PATCH] Fix updateFinalExperimentMark --- advlabdb/models.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/advlabdb/models.py b/advlabdb/models.py index be3a2e4..1697f9a 100644 --- a/advlabdb/models.py +++ b/advlabdb/models.py @@ -535,11 +535,12 @@ class ExperimentMark(db.Model): return ExperimentMark(part_student=part_student, group_experiment=group_experiment) def updateFinalExperimentMark(self): - semesterExperiment = self.group_experiment.semester_experiment - self.final_experiment_mark = roundHalfUpToInt( - semesterExperiment.oral_weighting * self.oral_mark - + semesterExperiment.protocol_weighting * self.protocol_mark - ) + if None not in (self.oral_mark, self.protocol_mark): + semesterExperiment = self.group_experiment.semester_experiment + self.final_experiment_mark = roundHalfUpToInt( + semesterExperiment.oral_weighting * self.oral_mark + + semesterExperiment.protocol_weighting * self.protocol_mark + ) def repr(self): return f"Mark {self.final_experiment_mark}; Exp {self.group_experiment.semester_experiment.repr()}"