cleo/ScoDoc-PE
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

UE capitalisées bul. BUT

Browse Source
This commit is contained in:
Emmanuel Viennet 2022-09-08 15:10:39 +02:00
parent 9a9278bf6e
commit 63f6382397
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/but/bulletin_but.py
View File

@ -157,10 +157,12 @@ class BulletinBUT:
if sco_codes_parcours.code_ue_validant(ue_capitalisee.code):
ue = UniteEns.query.get(ue_capitalisee.ue_id) # XXX cacher ?
# déjà capitalisé ? montre la meilleure
if (ue.acronyme in d) and (
(ue_capitalisee.moy_ue or 0.0) < (d[ue.acronyme]["moyenne"] or 0.0)
):
continue # skip this duplicate UE
if ue.acronyme in d:
moy_cap = d[ue.acronyme]["moyenne_num"] or 0.0
if (not isinstance(moy_cap, float)) or (
(ue_capitalisee.moy_ue or 0.0) < moy_cap
):
continue # skip this duplicate UE
d[ue.acronyme] = {
"id": ue.id,
@ -169,7 +171,8 @@ class BulletinBUT:
"numero": ue.numero,
"type": ue.type,
"color": ue.color,
"moyenne": fmt_note(ue_capitalisee.moy_ue),
"moyenne": fmt_note(ue_capitalisee.moy_ue), # arrondi en str
"moyenne_num": fmt_note(ue_capitalisee.moy_ue, keep_numeric=True),
"is_external": ue_capitalisee.is_external,
"date_capitalisation": ue_capitalisee.event_date,
"formsemestre_id": ue_capitalisee.formsemestre_id,