From cc8c0f11aba2715f82fe87df34e5d7c5b431077b Mon Sep 17 00:00:00 2001 From: "pascal.bouron" Date: Thu, 20 Jan 2022 22:10:00 +0100 Subject: [PATCH 1/2] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'app/scodoc/sco?= =?UTF-8?q?=5Fundo=5Fnotes.py'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ajout idEval dans tableau "Lister toutes les Evals" --- app/scodoc/sco_undo_notes.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/scodoc/sco_undo_notes.py b/app/scodoc/sco_undo_notes.py index 56684e39..b3483046 100644 --- a/app/scodoc/sco_undo_notes.py +++ b/app/scodoc/sco_undo_notes.py @@ -181,7 +181,7 @@ def formsemestre_list_saisies_notes(formsemestre_id, format="html"): """ sem = sco_formsemestre.get_formsemestre(formsemestre_id, raise_soft_exc=True) r = ndb.SimpleDictFetch( - """SELECT i.nom, i.prenom, code_nip, n.*, mod.titre, e.description, e.jour, u.user_name + """SELECT i.nom, i.prenom, code_nip, n.*, mod.titre, e.description, e.jour, u.user_name, e.id as ideval FROM notes_notes n, notes_evaluation e, notes_moduleimpl mi, notes_modules mod, identite i, "user" u WHERE mi.id = e.moduleimpl_id @@ -202,6 +202,7 @@ def formsemestre_list_saisies_notes(formsemestre_id, format="html"): "value", "user_name", "titre", + "ideval", "description", "jour", "comment", @@ -215,6 +216,7 @@ def formsemestre_list_saisies_notes(formsemestre_id, format="html"): "comment": "Remarque", "user_name": "Enseignant", "titre": "Module", + "ideval": "idEval", "description": "Evaluation", "jour": "Date éval.", } -- 2.40.1 From 320def17c018a5704182bbae901465c10d2059ee Mon Sep 17 00:00:00 2001 From: "pascal.bouron" Date: Thu, 20 Jan 2022 22:17:40 +0100 Subject: [PATCH 2/2] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'app/scodoc/sco?= =?UTF-8?q?=5Fundo=5Fnotes.py'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ajout de la colonne evaluation_id dans "Lister toutes les saisies" --- app/scodoc/sco_undo_notes.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/scodoc/sco_undo_notes.py b/app/scodoc/sco_undo_notes.py index b3483046..49e6d802 100644 --- a/app/scodoc/sco_undo_notes.py +++ b/app/scodoc/sco_undo_notes.py @@ -181,7 +181,7 @@ def formsemestre_list_saisies_notes(formsemestre_id, format="html"): """ sem = sco_formsemestre.get_formsemestre(formsemestre_id, raise_soft_exc=True) r = ndb.SimpleDictFetch( - """SELECT i.nom, i.prenom, code_nip, n.*, mod.titre, e.description, e.jour, u.user_name, e.id as ideval + """SELECT i.nom, i.prenom, code_nip, n.*, mod.titre, e.description, e.jour, u.user_name, e.id as evaluation_id FROM notes_notes n, notes_evaluation e, notes_moduleimpl mi, notes_modules mod, identite i, "user" u WHERE mi.id = e.moduleimpl_id @@ -202,7 +202,7 @@ def formsemestre_list_saisies_notes(formsemestre_id, format="html"): "value", "user_name", "titre", - "ideval", + "evaluation_id", "description", "jour", "comment", @@ -216,7 +216,7 @@ def formsemestre_list_saisies_notes(formsemestre_id, format="html"): "comment": "Remarque", "user_name": "Enseignant", "titre": "Module", - "ideval": "idEval", + "evaluation_id": "evaluation_id", "description": "Evaluation", "jour": "Date éval.", } -- 2.40.1