jmplace/DocScoDoc
1
0
Fork 0
forked from ScoDoc/DocScoDoc
Code Issues Pull Requests Projects Releases Wiki Activity

affiche nom ens. sur table list ops

Browse Source
This commit is contained in:
Emmanuel Viennet 2021-12-12 21:48:26 +01:00
parent 4a5509694f
commit cf939587b1
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/scodoc/sco_undo_notes.py
View File

@ -133,11 +133,13 @@ def list_operations(evaluation_id):
Ops = [] Ops = []
for uid in NotesDates.keys(): for uid in NotesDates.keys():
user_name = "{prenomnom} ({user_name})".format(**sco_users.user_info(uid))
for (t0, _), notes in NotesDates[uid].items(): for (t0, _), notes in NotesDates[uid].items():
Op = NotesOperation( Op = NotesOperation(
evaluation_id=evaluation_id, evaluation_id=evaluation_id,
date=t0, date=t0,
uid=uid, uid=uid,
user_name=user_name,
notes=NotesDates[uid][t0], notes=NotesDates[uid][t0],
current_notes_by_etud=current_notes_by_etud, current_notes_by_etud=current_notes_by_etud,
) )
@ -154,10 +156,10 @@ def evaluation_list_operations(evaluation_id):
Ops = list_operations(evaluation_id) Ops = list_operations(evaluation_id)
columns_ids = ("datestr", "uid", "nb_notes", "comment") columns_ids = ("datestr", "user_name", "nb_notes", "comment")
titles = { titles = {
"datestr": "Date", "datestr": "Date",
"uid": "Enseignant", "user_name": "Enseignant",
"nb_notes": "Nb de notes", "nb_notes": "Nb de notes",
"comment": "Commentaire", "comment": "Commentaire",
} }
@ -181,7 +183,7 @@ def formsemestre_list_saisies_notes(formsemestre_id, format="html"):
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
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
and mi.module_id = mod.id and mi.module_id = mod.id
and e.id = n.evaluation_id and e.id = n.evaluation_id