diff --git a/app/scodoc/sco_bulletins.py b/app/scodoc/sco_bulletins.py index a08a8125..3dbb9e0e 100644 --- a/app/scodoc/sco_bulletins.py +++ b/app/scodoc/sco_bulletins.py @@ -760,17 +760,19 @@ def etud_descr_situation_semestre( infos["descr_decisions_niveaux"] = infos["descr_decisions_rcue"] = "" 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: - infos["descr_demission"] = f"Démission le {date_dem}." - infos["date_demission"] = date_dem infos["decision_jury"] = infos["descr_decision_jury"] = "Démission" infos["situation"] = ". ".join( [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 + + infos["descr_defaillance"] = f"Défaillant{ne}" if date_def else "" + infos["date_defaillance"] = date_def or "" if date_def: - infos["descr_defaillance"] = f"Défaillant{ne}" - infos["date_defaillance"] = date_def infos["descr_decision_jury"] = f"Défaillant{ne}" dpv = sco_pv_dict.dict_pvjury(formsemestre.id, etudids=[etudid])