From 861a7da8a1a33b77db13f73db31e6ada6eae09ef Mon Sep 17 00:00:00 2001 From: "pascal.bouron" Date: Sun, 12 Dec 2021 21:11:18 +0100 Subject: [PATCH] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'app/scodoc/sco=5Fu?= =?UTF-8?q?ndo=5Fnotes.py'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remplacement uid par user_name Ajout colonne prenom (étudiant) pour lever ambiguité lorsqu'il y a des homonymes --- app/scodoc/sco_undo_notes.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/app/scodoc/sco_undo_notes.py b/app/scodoc/sco_undo_notes.py index 870f68d244..8b6fea3f19 100644 --- a/app/scodoc/sco_undo_notes.py +++ b/app/scodoc/sco_undo_notes.py @@ -179,13 +179,14 @@ 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, code_nip, n.*, mod.titre, e.description, e.jour + """SELECT i.nom, i.prenom, code_nip, n.*, mod.titre, e.description, e.jour, u.user_name FROM notes_notes n, notes_evaluation e, notes_moduleimpl mi, - notes_modules mod, identite i + notes_modules mod, identite i, \"user\" u WHERE mi.id = e.moduleimpl_id and mi.module_id = mod.id and e.id = n.evaluation_id and i.id = n.etudid + and u.id = n.uid and mi.formsemestre_id = %(formsemestre_id)s ORDER BY date desc """, @@ -195,8 +196,9 @@ def formsemestre_list_saisies_notes(formsemestre_id, format="html"): "date", "code_nip", "nom", + "prenom", "value", - "uid", + "user_name", "titre", "description", "jour", @@ -204,11 +206,12 @@ def formsemestre_list_saisies_notes(formsemestre_id, format="html"): ) titles = { "code_nip": "NIP", - "nom": "Etudiant", + "nom": "nom", + "prenom": "prenom", "date": "Date", "value": "Note", "comment": "Remarque", - "uid": "Enseignant", + "user_name": "Enseignant", "titre": "Module", "description": "Evaluation", "jour": "Date éval.",