Jury BUT: si formsemestre extérieur, propose toujours ADM

This commit is contained in:
Emmanuel Viennet 2022-09-29 22:09:19 +02:00
parent 4580159c91
commit 6b29a205b6
3 changed files with 20 additions and 1 deletions

View File

@ -362,6 +362,13 @@ class DecisionsProposeesAnnee(DecisionsProposees):
+ f""" et {self.nb_rcues_under_8} + f""" et {self.nb_rcues_under_8}
niveau{'x' if self.nb_rcues_under_8 > 1 else ''} < 8""" niveau{'x' if self.nb_rcues_under_8 > 1 else ''} < 8"""
) )
# Si l'un des semestres est extérieur, propose ADM
if (
self.formsemestre_impair.modalite == "EXT"
or self.formsemestre_pair.modalite == "EXT"
):
self.codes.insert(0, sco_codes.ADM)
# #
def infos(self) -> str: def infos(self) -> str:
@ -798,6 +805,12 @@ class DecisionsProposeesRCUE(DecisionsProposees):
self.codes.insert(0, sco_codes.ADM) self.codes.insert(0, sco_codes.ADM)
else: else:
self.codes.insert(0, sco_codes.AJ) self.codes.insert(0, sco_codes.AJ)
# Si au moins l'un des semestres est extérieur, propose ADM au cas où
if (
dec_prop_annee.formsemestre_impair.modalite == "EXT"
or dec_prop_annee.formsemestre_pair.modalite == "EXT"
):
self.codes.insert(0, sco_codes.ADM)
def record(self, code: str, no_overwrite=False): def record(self, code: str, no_overwrite=False):
"""Enregistre le code""" """Enregistre le code"""
@ -943,7 +956,9 @@ class DecisionsProposeesUE(DecisionsProposees):
"""Calcul des .codes attribuables et de l'explanation associée""" """Calcul des .codes attribuables et de l'explanation associée"""
if self.inscription_etat != scu.INSCRIT: if self.inscription_etat != scu.INSCRIT:
return return
if self.moy_ue > (sco_codes.ParcoursBUT.BARRE_MOY - sco_codes.NOTES_TOLERANCE): if (
self.moy_ue > (sco_codes.ParcoursBUT.BARRE_MOY - sco_codes.NOTES_TOLERANCE)
) or self.formsemestre.modalite == "EXT":
self.codes.insert(0, sco_codes.ADM) self.codes.insert(0, sco_codes.ADM)
self.explanation = (f"Moyenne >= {sco_codes.ParcoursBUT.BARRE_MOY}/20",) self.explanation = (f"Moyenne >= {sco_codes.ParcoursBUT.BARRE_MOY}/20",)
elif self.rcue and self.rcue.est_compensable(): elif self.rcue and self.rcue.est_compensable():

View File

@ -242,6 +242,8 @@ def formsemestre_ext_edit_ue_validations(formsemestre_id, etudid):
ues = formsemestre.formation.ues.filter(UniteEns.type != UE_SPORT).order_by( ues = formsemestre.formation.ues.filter(UniteEns.type != UE_SPORT).order_by(
UniteEns.semestre_idx, UniteEns.numero UniteEns.semestre_idx, UniteEns.numero
) )
if formsemestre.formation.is_apc():
ues = ues.filter_by(semestre_idx=formsemestre.semestre_id)
descr = _ue_form_description(formsemestre, etud, ues, scu.get_request_args()) descr = _ue_form_description(formsemestre, etud, ues, scu.get_request_args())
initvalues = {} initvalues = {}
if request.method == "GET": if request.method == "GET":

View File

@ -46,5 +46,7 @@
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>
{% else %}
<div><p class="greenboldtext">(module actuellement non utilisé dans les semestres)</p></div>
{%endif%} {%endif%}