From 540a956faeb0488ab430bca7f9de77ca1202170e Mon Sep 17 00:00:00 2001 From: BOURON PASCAL Date: Fri, 3 Dec 2021 21:17:30 +0100 Subject: [PATCH 1/2] =?UTF-8?q?Suppression=20de=20(%(jour)s)=20lorsque=20l?= =?UTF-8?q?'=C3=A9valuation=20n'a=20pas=20de=20date?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scodoc/sco_liste_notes.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/scodoc/sco_liste_notes.py b/app/scodoc/sco_liste_notes.py index 627e91851..d023dc849 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,7 +629,10 @@ 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"' From 3aa115e7a2b2d37cf8a5e7fe3373b2e41a1bc754 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Sat, 4 Dec 2021 21:18:00 +0100 Subject: [PATCH 2/2] 9.0.68 --- sco_version.py | 2 +- tools/etc/scodoc-updater.timer | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sco_version.py b/sco_version.py index 6d9473734..d68021f90 100644 --- a/sco_version.py +++ b/sco_version.py @@ -1,7 +1,7 @@ # -*- mode: python -*- # -*- coding: utf-8 -*- -SCOVERSION = "9.0.67" +SCOVERSION = "9.0.68" SCONAME = "ScoDoc" diff --git a/tools/etc/scodoc-updater.timer b/tools/etc/scodoc-updater.timer index 3a7cddff6..4ba66d784 100644 --- a/tools/etc/scodoc-updater.timer +++ b/tools/etc/scodoc-updater.timer @@ -7,12 +7,12 @@ # [Unit] -Description=Upgrade ScoDoc and Linux each week on Saturday night (sunday, 2:30 am) +Description=Upgrade ScoDoc and Linux each night (2:30 am + random delay) [Timer] -OnCalendar=Sun *-*-* 02:30:00 +OnCalendar=*-*-* 02:30:00 # Add random delay, to avoid overloading ScoDoc upgrade server -RandomizedDelaySec=30min +RandomizedDelaySec=40min [Install] WantedBy=timers.target