From 320f7b3b0f78fc4d66a6a0db7cf0399237f33cb5 Mon Sep 17 00:00:00 2001 From: "pascal.bouron" Date: Thu, 2 Dec 2021 22:29:12 +0100 Subject: [PATCH 1/2] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'app/scodoc/sco?= =?UTF-8?q?=5Fliste=5Fnotes.py'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Modification de l'entete de colonne pour les évaluations sans date , pour éviter les parenthèses vides, du type : Devoir Surveillé ( ) --- app/scodoc/sco_liste_notes.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/scodoc/sco_liste_notes.py b/app/scodoc/sco_liste_notes.py index 627e9185..d7a15341 100644 --- a/app/scodoc/sco_liste_notes.py +++ b/app/scodoc/sco_liste_notes.py @@ -439,7 +439,10 @@ def _make_table_notes( hh = "%s, %s (%d étudiants)" % (E["description"], gr_title, len(etudids)) filename = scu.make_filename("notes_%s_%s" % (evalname, gr_title_filename)) 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 = "" base_url = "evaluation_listenotes?evaluation_id=%s" % E["evaluation_id"] + gl html_next_section = ( @@ -626,8 +629,11 @@ def _add_eval_columns( else: 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"]: titles["_" + str(evaluation_id) + "_td_attrs"] = 'class="eval_complete"' elif e["eval_state"]["evalattente"]: -- 2.40.1 From dd097a09e9ffd73f27a36aa4003eee8bdf0f3fe6 Mon Sep 17 00:00:00 2001 From: "pascal.bouron" Date: Thu, 2 Dec 2021 22:32:59 +0100 Subject: [PATCH 2/2] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'app/scodoc/sco?= =?UTF-8?q?=5Fliste=5Fnotes.py'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scodoc/sco_liste_notes.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/scodoc/sco_liste_notes.py b/app/scodoc/sco_liste_notes.py index d7a15341..d6df33fd 100644 --- a/app/scodoc/sco_liste_notes.py +++ b/app/scodoc/sco_liste_notes.py @@ -439,9 +439,9 @@ def _make_table_notes( hh = "%s, %s (%d étudiants)" % (E["description"], gr_title, len(etudids)) filename = scu.make_filename("notes_%s_%s" % (evalname, gr_title_filename)) caption = hh - if len(e["jour"]) > 0 : + if len(e["jour"]) > 0: pdf_title = "%(description)s (%(jour)s)" % e - else : + else: pdf_title = "%(description)s " % e html_title = "" base_url = "evaluation_listenotes?evaluation_id=%s" % E["evaluation_id"] + gl -- 2.40.1