dubacq/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Pull Requests Activity

ListeAbsEtud: add ampm

Browse Source
This commit is contained in:
IDK 2021-05-01 17:44:06 +02:00
parent db781d71e3
commit d8a4184547
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ZAbsences.py
View File

@ -1313,7 +1313,7 @@ class ZAbsences(
if with_evals: if with_evals:
a["exams"] = descr_exams(a) a["exams"] = descr_exams(a)
a["datedmy"] = a["jour"].strftime("%d/%m/%Y") a["datedmy"] = a["jour"].strftime("%d/%m/%Y")
a["matin_o"] = int(a["matin"]) a["ampm"] = int(a["matin"])
a["matin"] = matin(a["matin"]) a["matin"] = matin(a["matin"])
index = a["description"].find(")") index = a["description"].find(")")
if index != -1: if index != -1:
@ -1328,7 +1328,7 @@ class ZAbsences(
a["justlink"] = "<em>justifier</em>" a["justlink"] = "<em>justifier</em>"
a["_justlink_target"] = ( a["_justlink_target"] = (
"doJustifAbsence?etudid=%s&amp;datedebut=%s&amp;datefin=%s&amp;demijournee=%s" "doJustifAbsence?etudid=%s&amp;datedebut=%s&amp;datefin=%s&amp;demijournee=%s"
% (etudid, a["datedmy"], a["datedmy"], a["matin_o"]) % (etudid, a["datedmy"], a["datedmy"], a["ampm"])
) )
# #
titles = { titles = {
@ -1340,6 +1340,8 @@ class ZAbsences(
"motif": "Motif", "motif": "Motif",
} }
columns_ids = ["datedmy", "matin"] columns_ids = ["datedmy", "matin"]
if format in ("json", "xml"):
columns_ids += ["jour", "ampm"]
if with_evals: if with_evals:
columns_ids.append("exams") columns_ids.append("exams")