diff --git a/app/scodoc/sco_abs_views.py b/app/scodoc/sco_abs_views.py index 98faeb519..2ec443936 100644 --- a/app/scodoc/sco_abs_views.py +++ b/app/scodoc/sco_abs_views.py @@ -112,9 +112,9 @@ def doSignaleAbsence( nbadded += 1 # if estjust: - J = "" + just_str = "" else: - J = "NON " + just_str = "NON " indication_module = "" if moduleimpl_id and moduleimpl_id != "NULL": mod = sco_moduleimpl.moduleimpl_list(moduleimpl_id=moduleimpl_id)[0] @@ -137,31 +137,35 @@ def doSignaleAbsence( ] if dates: H.append( - """
Ajout de %d absences %sjustifiées du %s au %s %s
""" - % (nbadded, J, datedebut, datefin, indication_module) + f"""Ajout de {nbadded} absences {just_str}justifiées + du {datedebut} au {datefin} {indication_module} +
+ """ ) else: H.append( - """Aucune date ouvrable entre le %s et le %s !
""" - % (datedebut, datefin) + f"""Aucune date ouvrable + entre le {datedebut} et le {datefin} ! +
+ """ ) H.append( f"""- | Matin | Après-midi |
---|---|---|
+ | Matin | +Après-midi | +
- %(nomprenom)s | """ - % etud - ) # """ + f""" | |
+ {etud["nomprenom"]} + | ++ """ + ) if nbabsam != 0: if nbabsjustam: H.append("Just.") @@ -1084,10 +1092,14 @@ def EtatAbsencesDate(group_ids=[], date=None): # list of groups to display H.append("") H.append(" | |
%d abs, %d just. | %d abs, %d just. | |
+ | {t_nbabsam} abs, {t_nbabsjustam} just. | +{t_nbabspm} abs, {t_nbabsjustpm} just. | +
Aucune absence !
") else: diff --git a/sco_version.py b/sco_version.py index 82c30e9ae..3c7e89b89 100644 --- a/sco_version.py +++ b/sco_version.py @@ -1,7 +1,7 @@ # -*- mode: python -*- # -*- coding: utf-8 -*- -SCOVERSION = "9.3.52" +SCOVERSION = "9.3.53" SCONAME = "ScoDoc"