cleo/ScoDoc-PE
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://scodoc.org/git/viennet/ScoDoc

Browse Source
This commit is contained in:
viennet 2020-12-23 17:22:14 +01:00
commit 65575e3562
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sco_recapcomplet.py
View File

@ -764,12 +764,13 @@ def _list_notes_evals(context, evals, etudid):
""" """
L = [] L = []
for e in evals: for e in evals:
if e["etat"]["evalcomplete"]: if e["etat"]["evalcomplete"] or e["publish_incomplete"]:
NotesDB = context._notes_getall(e["evaluation_id"]) NotesDB = context._notes_getall(e["evaluation_id"])
if NotesDB.has_key(etudid): if NotesDB.has_key(etudid):
val = NotesDB[etudid]["value"] val = NotesDB[etudid]["value"]
else: else:
val = None # Note manquante mais prise en compte immédiate: affiche ATT
val = NOTES_ATTENTE
val_fmt = fmt_note(val, keep_numeric=True) val_fmt = fmt_note(val, keep_numeric=True)
L.append(val_fmt) L.append(val_fmt)
return L return L
@ -779,8 +780,8 @@ def _list_notes_evals_titles(context, codemodule, evals):
"""Liste des titres des evals completes""" """Liste des titres des evals completes"""
L = [] L = []
for e in evals: for e in evals:
if e["etat"]["evalcomplete"]: if e["etat"]["evalcomplete"] or e["publish_incomplete"]:
L.append(codemodule + "-" + DateISOtoDMY(e["jour"])) L.append(codemodule + "-" + str(e["numero"]) + "-" + e["jour"].isoformat())
return L return L
@ -788,7 +789,7 @@ def _list_notes_evals_stats(context, evals, key):
"""Liste des stats (moy, ou rien!) des evals completes""" """Liste des stats (moy, ou rien!) des evals completes"""
L = [] L = []
for e in evals: for e in evals:
if e["etat"]["evalcomplete"]: if e["etat"]["evalcomplete"] or e["publish_incomplete"]:
if key == "moy": if key == "moy":
val = e["etat"]["moy_num"] val = e["etat"]["moy_num"]
L.append(fmt_note(val, keep_numeric=True)) L.append(fmt_note(val, keep_numeric=True))