From ce4115eeef274e603c93cbc7e93a729a88db3ffb Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Fri, 12 Nov 2021 11:30:59 +0100 Subject: [PATCH 1/2] closes #178 (colonne NIP dans liste saisie notes) --- 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 1f410c704..9a13d988f 100644 --- a/app/scodoc/sco_undo_notes.py +++ b/app/scodoc/sco_undo_notes.py @@ -178,7 +178,7 @@ def formsemestre_list_saisies_notes(formsemestre_id, format="html"): """ sem = sco_formsemestre.get_formsemestre(formsemestre_id) r = ndb.SimpleDictFetch( - """SELECT i.nom, n.*, mod.titre, e.description, e.jour + """SELECT i.nom, i.id as etudid, n.*, mod.titre, e.description, e.jour FROM notes_notes n, notes_evaluation e, notes_moduleimpl mi, notes_modules mod, identite i WHERE mi.id = e.moduleimpl_id @@ -192,6 +192,7 @@ def formsemestre_list_saisies_notes(formsemestre_id, format="html"): ) columns_ids = ( "date", + "code_nip", "nom", "value", "uid", @@ -201,6 +202,7 @@ def formsemestre_list_saisies_notes(formsemestre_id, format="html"): "comment", ) titles = { + "code_nip": "NIP", "nom": "Etudiant", "date": "Date", "value": "Note", From 47d728376cad018dfbc714fc7a07faa2723b496b Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Fri, 12 Nov 2021 11:31:50 +0100 Subject: [PATCH 2/2] code cosmetic --- app/scodoc/sco_groups.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/app/scodoc/sco_groups.py b/app/scodoc/sco_groups.py index 136529865..4d84f2a2b 100644 --- a/app/scodoc/sco_groups.py +++ b/app/scodoc/sco_groups.py @@ -377,11 +377,18 @@ def formsemestre_get_etud_groupnames(formsemestre_id, attr="group_name"): { etudid : { partition_id : group_name }} (attr=group_name or group_id) """ infos = ndb.SimpleDictFetch( - """SELECT i.etudid AS etudid, p.id AS partition_id, - gd.group_name, gd.id AS group_id - FROM notes_formsemestre_inscription i, partition p, - group_descr gd, group_membership gm - WHERE i.formsemestre_id=%(formsemestre_id)s + """SELECT + i.etudid AS etudid, + p.id AS partition_id, + gd.group_name, + gd.id AS group_id + FROM + notes_formsemestre_inscription i, + partition p, + group_descr gd, + group_membership gm + WHERE + i.formsemestre_id=%(formsemestre_id)s and i.formsemestre_id = p.formsemestre_id and p.id = gd.partition_id and gm.etudid = i.etudid