jmplace/DocScoDoc
1
0
Fork 0
forked from ScoDoc/DocScoDoc
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Emmanuel Viennet 2021-12-04 21:31:56 +01:00
commit d79f376b24
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/scodoc/sco_liste_notes.py
View File

@ -481,7 +481,10 @@ def _make_table_notes(
hh = "%s, %s (%d étudiants)" % (E["description"], gr_title, len(etudid_etats)) hh = "%s, %s (%d étudiants)" % (E["description"], gr_title, len(etudid_etats))
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 = (
@ -685,7 +688,10 @@ def _add_eval_columns(
else: else:
row_moys[evaluation_id] = "" row_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"'

6
tools/etc/scodoc-updater.timer
View File

@ -7,12 +7,12 @@
# #
[Unit] [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] [Timer]
OnCalendar=Sun *-*-* 02:30:00 OnCalendar=*-*-* 02:30:00
# Add random delay, to avoid overloading ScoDoc upgrade server # Add random delay, to avoid overloading ScoDoc upgrade server
RandomizedDelaySec=30min RandomizedDelaySec=40min
[Install] [Install]
WantedBy=timers.target WantedBy=timers.target