forked from ScoDoc/DocScoDoc
Merge branch 'master' of https://scodoc.org/git/viennet/ScoDoc
This commit is contained in:
commit
65575e3562
@ -764,12 +764,13 @@ def _list_notes_evals(context, evals, etudid):
|
||||
"""
|
||||
L = []
|
||||
for e in evals:
|
||||
if e["etat"]["evalcomplete"]:
|
||||
if e["etat"]["evalcomplete"] or e["publish_incomplete"]:
|
||||
NotesDB = context._notes_getall(e["evaluation_id"])
|
||||
if NotesDB.has_key(etudid):
|
||||
val = NotesDB[etudid]["value"]
|
||||
else:
|
||||
val = None
|
||||
# Note manquante mais prise en compte immédiate: affiche ATT
|
||||
val = NOTES_ATTENTE
|
||||
val_fmt = fmt_note(val, keep_numeric=True)
|
||||
L.append(val_fmt)
|
||||
return L
|
||||
@ -779,8 +780,8 @@ def _list_notes_evals_titles(context, codemodule, evals):
|
||||
"""Liste des titres des evals completes"""
|
||||
L = []
|
||||
for e in evals:
|
||||
if e["etat"]["evalcomplete"]:
|
||||
L.append(codemodule + "-" + DateISOtoDMY(e["jour"]))
|
||||
if e["etat"]["evalcomplete"] or e["publish_incomplete"]:
|
||||
L.append(codemodule + "-" + str(e["numero"]) + "-" + e["jour"].isoformat())
|
||||
return L
|
||||
|
||||
|
||||
@ -788,7 +789,7 @@ def _list_notes_evals_stats(context, evals, key):
|
||||
"""Liste des stats (moy, ou rien!) des evals completes"""
|
||||
L = []
|
||||
for e in evals:
|
||||
if e["etat"]["evalcomplete"]:
|
||||
if e["etat"]["evalcomplete"] or e["publish_incomplete"]:
|
||||
if key == "moy":
|
||||
val = e["etat"]["moy_num"]
|
||||
L.append(fmt_note(val, keep_numeric=True))
|
||||
|
Loading…
Reference in New Issue
Block a user