Skip to content
Snippets Groups Projects
Commit bd44ab39 authored by Emmanuel Viennet's avatar Emmanuel Viennet
Browse files

Ne considère plus DEF comme une décision de jury bloquant les modifs

parent 14700f7f
Branches
Tags
No related merge requests found
......@@ -297,7 +297,7 @@ class NotesTableCompat(ResultatsSemestre):
"""
return bool(
self.get_etud_decisions_ue(etudid)
or self.get_etud_decision_sem(etudid)
or self.get_etud_decision_sem(etudid, ignore_def=True)
or ScolarAutorisationInscription.query.filter_by(
origin_formsemestre_id=self.formsemestre.id, etudid=etudid
).count()
......@@ -333,20 +333,19 @@ class NotesTableCompat(ResultatsSemestre):
return 0.0
return float(sum(d.get("ects", 0) for d in decisions_ues.values()))
def get_etud_decision_sem(self, etudid: int) -> dict:
def get_etud_decision_sem(self, etudid: int, ignore_def: bool = False) -> dict:
"""Decision du jury semestre prise pour cet etudiant, ou None s'il n'y en pas eu.
{ 'code' : None|ATT|..., 'assidu' : 0|1, 'event_date' : , compense_formsemestre_id }
Si état défaillant, force le code a DEF.
Toujours None en BUT.
Si état défaillant, force le code a DEF, sauf si ignore_def=True.
Normalement None en BUT, sauf si DEF.
"""
if self.get_etud_etat(etudid) == DEF:
if (not ignore_def) and self.get_etud_etat(etudid) == DEF:
return {
"code": DEF,
"assidu": False,
"event_date": "",
"compense_formsemestre_id": None,
}
else:
validations = self.get_formsemestre_validations()
return validations.decisions_jury.get(etudid, None)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment