From 2ac895e0473d93636cff5c773e89d29437658b23 Mon Sep 17 00:00:00 2001
From: Mo8it <mo8it@proton.me>
Date: Sat, 11 Sep 2021 15:25:13 +0200
Subject: [PATCH] Fixed not calling ExperimentMark.customInit

---
 .gitignore                  | 4 +++-
 advlabdb/adminModelViews.py | 9 +++++++--
 advlabdb/models.py          | 4 ++--
 testDB.py                   | 4 ++--
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0c0be95..4314885 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
+__pycache__
 *.pyc
 .vscode
 advLab.db
-server_setup.md
\ No newline at end of file
+server_setup.md
+db_backups
\ No newline at end of file
diff --git a/advlabdb/adminModelViews.py b/advlabdb/adminModelViews.py
index 802f10f..bcce772 100644
--- a/advlabdb/adminModelViews.py
+++ b/advlabdb/adminModelViews.py
@@ -587,7 +587,9 @@ class GroupExperimentView(SecureAdminModelView):
                 [form.appointment1_assistant.data, form.appointment2_assistant.data],
             ):
                 if date:
-                    appointment = Appointment.customInit(date, special, assistant, model)
+                    appointment = Appointment.customInit(
+                        date=date, special=special, group_experiment=model, assistant=assistant
+                    )
 
                     self.session.add(appointment)
 
@@ -639,7 +641,10 @@ class AppointmentView(SecureAdminModelView):
 
     def customCreateModel(self, form):
         return Appointment.customInit(
-            form.date.data, form.special.data, form.assistant.data, form.group_experiment.data
+            date=form.date.data,
+            special=form.special.data,
+            group_experiment=form.group_experiment.data,
+            assistant=form.assistant.data,
         )
 
     def update_model(self, form, model):
diff --git a/advlabdb/models.py b/advlabdb/models.py
index d3edaab..36cd3bf 100644
--- a/advlabdb/models.py
+++ b/advlabdb/models.py
@@ -218,7 +218,7 @@ class GroupExperiment(db.Model):
         groupExperiment = GroupExperiment(semester_experiment=semester_experiment, group=group)
 
         for partStudent in group.part_students:
-            db.session.add(ExperimentMark(part_student=partStudent, group_experiment=groupExperiment))
+            db.session.add(ExperimentMark.customInit(part_student=partStudent, group_experiment=groupExperiment))
 
         return groupExperiment
 
@@ -359,7 +359,7 @@ class Appointment(db.Model):
 
         return assistant
 
-    def customInit(date, special, assistant, group_experiment):
+    def customInit(date, special, group_experiment, assistant):
         assistant = Appointment.checkAndGetAssistant(assistant, group_experiment)
 
         return Appointment(
diff --git a/testDB.py b/testDB.py
index 1b97cb0..5a61ed7 100644
--- a/testDB.py
+++ b/testDB.py
@@ -140,8 +140,8 @@ with app.app_context():
     db.session.add(as1)
     db.session.add(as2)
 
-    ap1 = Appointment.customInit(date=date(2021, 3, 21), special=True, assistant=as1, group_experiment=gx1)
-    ap2 = Appointment.customInit(date=date(2021, 3, 22), special=True, assistant=as2, group_experiment=gx2)
+    ap1 = Appointment.customInit(date=date(2021, 3, 21), special=True, group_experiment=gx1, assistant=as1)
+    ap2 = Appointment.customInit(date=date(2021, 3, 22), special=True, group_experiment=gx2, assistant=as2)
 
     db.session.add(ap1)
     db.session.add(ap2)