Update opolka/ScoDoc from ScoDoc/ScoDoc #2

Merged
opolka merged 1272 commits from ScoDoc/ScoDoc:master into master 2024-05-27 09:11:04 +02:00
Showing only changes of commit 04d1fbe272 - Show all commits

View File

@ -197,13 +197,15 @@ def formsemestre_poursuite_report(formsemestre_id, fmt="html"):
info = etud_get_poursuite_info(sem, etud) info = etud_get_poursuite_info(sem, etud)
idd = _flatten_info(info) idd = _flatten_info(info)
# On recupere la totalite des UEs dans ids # On recupere la totalite des UEs dans ids
for id in idd: for key in idd:
if id not in ids: if key not in ids:
ids += [id] ids += [key]
info["etudid"] = etud["etudid"]
infos.append(info) infos.append(info)
# #
column_ids = ( column_ids = (
("civilite_str", "nom", "prenom", "annee", "date_naissance") (("etudid",) if fmt.startswith("xls") else ())
+ ("civilite_str", "nom", "prenom", "annee", "date_naissance")
+ tuple(ids) + tuple(ids)
+ ("debouche",) + ("debouche",)
) )