Merge pull request 'Mise à jour de 'app/scodoc/sco_undo_notes.py'' (#208) from pascal.bouron/ScoDoc_Lyon:master into master

Reviewed-on: https://scodoc.org/git/ScoDoc/ScoDoc/pulls/208

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.",