1
0
forked from ScoDoc/ScoDoc

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

Reviewed-on: https://scodoc.org/git/ScoDoc/ScoDoc/pulls/287
This commit is contained in:
Emmanuel Viennet 2022-01-20 23:05:21 +01:00
commit 18fe212714

View File

@ -181,7 +181,7 @@ def formsemestre_list_saisies_notes(formsemestre_id, format="html"):
""" """
sem = sco_formsemestre.get_formsemestre(formsemestre_id, raise_soft_exc=True) sem = sco_formsemestre.get_formsemestre(formsemestre_id, raise_soft_exc=True)
r = ndb.SimpleDictFetch( 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 evaluation_id
FROM notes_notes n, notes_evaluation e, notes_moduleimpl mi, FROM notes_notes n, notes_evaluation e, notes_moduleimpl mi,
notes_modules mod, identite i, "user" u notes_modules mod, identite i, "user" u
WHERE mi.id = e.moduleimpl_id WHERE mi.id = e.moduleimpl_id
@ -202,6 +202,7 @@ def formsemestre_list_saisies_notes(formsemestre_id, format="html"):
"value", "value",
"user_name", "user_name",
"titre", "titre",
"evaluation_id",
"description", "description",
"jour", "jour",
"comment", "comment",
@ -214,6 +215,7 @@ def formsemestre_list_saisies_notes(formsemestre_id, format="html"):
"value": "Note", "value": "Note",
"comment": "Remarque", "comment": "Remarque",
"user_name": "Enseignant", "user_name": "Enseignant",
"evaluation_id": "evaluation_id",
"titre": "Module", "titre": "Module",
"description": "Evaluation", "description": "Evaluation",
"jour": "Date éval.", "jour": "Date éval.",