From 2e6151d05f898ad4f7c65e1b218b7fe8390da608 Mon Sep 17 00:00:00 2001 From: Mo8it Date: Sun, 15 May 2022 21:07:00 +0200 Subject: [PATCH] Remove ExperimentMark.customInit --- advlabdb/adminModelViews.py | 4 +--- advlabdb/models.py | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/advlabdb/adminModelViews.py b/advlabdb/adminModelViews.py index ff323ca..6012599 100644 --- a/advlabdb/adminModelViews.py +++ b/advlabdb/adminModelViews.py @@ -1359,9 +1359,7 @@ class ExperimentMarkView(SecureAdminModelView): """ def customCreateModel(self, form): - return ExperimentMark.customInit( - part_student=form.part_student.data, group_experiment=form.group_experiment.data - ) + return ExperimentMark(part_student=form.part_student.data, group_experiment=form.group_experiment.data) def update_model(self, form, model): if (form.oral_mark and form.oral_mark.data != model.oral_mark) or ( diff --git a/advlabdb/models.py b/advlabdb/models.py index 69198e7..71f99a8 100644 --- a/advlabdb/models.py +++ b/advlabdb/models.py @@ -226,7 +226,7 @@ class GroupExperiment(db.Model): super().__init__(semester_experiment=semester_experiment, group=group) for partStudent in group.part_students: - db.session.add(ExperimentMark.customInit(part_student=partStudent, group_experiment=self)) + db.session.add(ExperimentMark(part_student=partStudent, group_experiment=self)) def repr(self): return f"SemExp {self.semester_experiment.repr()}; Gr {self.group.repr()}" @@ -528,14 +528,14 @@ class ExperimentMark(db.Model): __table_args__ = (db.UniqueConstraint(part_student_id, group_experiment_id),) - def customInit(part_student, group_experiment): + def __init__(self, part_student, group_experiment): if not part_student.group: raise DataBaseException("The part student does not have a group yet!") else: if group_experiment not in part_student.group.group_experiments: raise DataBaseException("The group of the part student does not have the given group experiment!") - return ExperimentMark(part_student=part_student, group_experiment=group_experiment) + super().__init__(part_student=part_student, group_experiment=group_experiment) def updateFinalExperimentMark(self): if None not in (self.oral_mark, self.protocol_mark):