diff --git a/config/my_dev.cnf b/config/my_dev.cnf index 44014f9..f29bd78 100644 --- a/config/my_dev.cnf +++ b/config/my_dev.cnf @@ -3,5 +3,5 @@ database = django_prod user = django_usr password = YwVHV36ovBTXWugb default-character-set = utf8 -host =33.15.0.2 +host =33.15.0.1 port =3306 diff --git a/studenteval/models.py b/studenteval/models.py index 1dae4c6..2ddee0d 100644 --- a/studenteval/models.py +++ b/studenteval/models.py @@ -119,12 +119,18 @@ class cl_Student_eval(models.Model): if eval.ID == self.ID: to_be_set = True else: - #print(f"check eval {eval} {eval.nEval_Type} ({eval.nEval_Type == 1}) ? {eval.sRef} == {self.sRef} => {eval.sRef == self.sRef} {self}") + print("check eval") + print(eval) + print(self) + if eval.nEval_Type == "1" and eval.sRef == self.sRef: - print(f"Eval mirror found {eval} / {self}") + print(f"Eval mirror found type 1 {eval} / {self}") to_be_set = True - elif eval.nEval_Type == "2" and eval.dtDate == self.dtDate: - print(f"Eval mirror found {eval} / {self}") + elif eval.nEval_Type == "2" and eval.sRef == self.sRef: + print(f"Eval mirror found type 2 {eval} / {self}") + to_be_set = True + if eval.nEval_Type == "3" and eval.sRef == self.sRef: + print(f"Eval mirror found type 3 {eval} / {self}") to_be_set = True if to_be_set: @@ -137,7 +143,7 @@ class cl_Student_eval(models.Model): if self.o_Encadrant_eval is not None and self.o_Auto_eval is not None: self.mirrored = True - #print(f" auto = {self.o_Auto_eval} / encadrant = {self.o_Encadrant_eval}") + print(f" auto = {self.o_Auto_eval} / encadrant = {self.o_Encadrant_eval}") def get_all_evals_for_student(self,sStudent=None):