1
0
forked from ScoDoc/ScoDoc

Fix: balises pdf descr_demission, date_demission, descr_defaillance, date_defaillance

This commit is contained in:
Emmanuel Viennet 2024-07-03 23:01:10 +02:00
parent 7e85f7b192
commit 053a332198

View File

@ -760,17 +760,19 @@ def etud_descr_situation_semestre(
infos["descr_decisions_niveaux"] = infos["descr_decisions_rcue"] = "" infos["descr_decisions_niveaux"] = infos["descr_decisions_rcue"] = ""
infos["descr_decision_annee"] = "" infos["descr_decision_annee"] = ""
infos["descr_demission"] = f"Démission le {date_dem}." if date_dem else ""
infos["date_demission"] = date_dem if date_dem else ""
if date_dem: if date_dem:
infos["descr_demission"] = f"Démission le {date_dem}."
infos["date_demission"] = date_dem
infos["decision_jury"] = infos["descr_decision_jury"] = "Démission" infos["decision_jury"] = infos["descr_decision_jury"] = "Démission"
infos["situation"] = ". ".join( infos["situation"] = ". ".join(
[x for x in [infos["descr_inscription"], infos["descr_demission"]] if x] [x for x in [infos["descr_inscription"], infos["descr_demission"]] if x]
) )
return infos, None # ne donne pas les dec. de jury pour les demissionnaires return infos, None # ne donne pas les dec. de jury pour les demissionnaires
infos["descr_defaillance"] = f"Défaillant{ne}" if date_def else ""
infos["date_defaillance"] = date_def or ""
if date_def: if date_def:
infos["descr_defaillance"] = f"Défaillant{ne}"
infos["date_defaillance"] = date_def
infos["descr_decision_jury"] = f"Défaillant{ne}" infos["descr_decision_jury"] = f"Défaillant{ne}"
dpv = sco_pv_dict.dict_pvjury(formsemestre.id, etudids=[etudid]) dpv = sco_pv_dict.dict_pvjury(formsemestre.id, etudids=[etudid])