leonard.montalbano/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request 'Suppression de (%(jour)s) lorsque l'évaluation n'a pas de date' (#192) from pascal.bouron/ScoDoc_Lyon:master into master

Browse Source 
Reviewed-on: https://scodoc.org/git/viennet/ScoDoc/pulls/192
This commit is contained in:
Emmanuel Viennet 2021-12-04 21:09:28 +01:00
commit cd694a956d
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/scodoc/sco_liste_notes.py
View File

@ -439,7 +439,10 @@ def _make_table_notes(
hh = "%s, %s (%d étudiants)" % (E["description"], gr_title, len(etudids)) hh = "%s, %s (%d étudiants)" % (E["description"], gr_title, len(etudids))
filename = scu.make_filename("notes_%s_%s" % (evalname, gr_title_filename)) filename = scu.make_filename("notes_%s_%s" % (evalname, gr_title_filename))
caption = hh caption = hh
pdf_title = "%(description)s (%(jour)s)" % e if len(e["jour"]) > 0:
pdf_title = "%(description)s (%(jour)s)" % e
else:
pdf_title = "%(description)s " % e
html_title = "" html_title = ""
base_url = "evaluation_listenotes?evaluation_id=%s" % E["evaluation_id"] + gl base_url = "evaluation_listenotes?evaluation_id=%s" % E["evaluation_id"] + gl
html_next_section = ( html_next_section = (
@ -626,7 +629,10 @@ def _add_eval_columns(
else: else:
moys[evaluation_id] = "" moys[evaluation_id] = ""
titles[evaluation_id] = "%(description)s (%(jour)s)" % e if len(e["jour"]) > 0:
titles[evaluation_id] = "%(description)s (%(jour)s)" % e
else:
titles[evaluation_id] = "%(description)s " % e
if e["eval_state"]["evalcomplete"]: if e["eval_state"]["evalcomplete"]:
titles["_" + str(evaluation_id) + "_td_attrs"] = 'class="eval_complete"' titles["_" + str(evaluation_id) + "_td_attrs"] = 'class="eval_complete"'