diff --git a/app/but/bulletin_but.py b/app/but/bulletin_but.py index 699d9138..95e18156 100644 --- a/app/but/bulletin_but.py +++ b/app/but/bulletin_but.py @@ -11,6 +11,11 @@ import datetime from flask import url_for, g from app.scodoc import sco_utils as scu +<<<<<<< HEAD +======= +from app.scodoc.sco_cache import ResultatsSemestreBUTCache +from app.scodoc import sco_abs +>>>>>>> 4c5c20ce7e4ef3d86c704c1e8225d3146eaccb29 from app.scodoc import sco_bulletins_json from app.scodoc import sco_preferences from app.scodoc.sco_codes_parcours import UE_SPORT @@ -178,6 +183,8 @@ class BulletinBUT(ResultatsSemestreBUT): } if not published: return d + + nbabs, nbabsjust = formsemestre.get_abs_count(etud.id) semestre_infos = { "etapes": [str(x.etape_apo) for x in formsemestre.etapes if x.etape_apo], "date_debut": formsemestre.date_debut.isoformat(), @@ -186,9 +193,9 @@ class BulletinBUT(ResultatsSemestreBUT): "inscription": "TODO-MM-JJ", # XXX TODO "numero": formsemestre.semestre_id, "groupes": [], # XXX TODO - "absences": { # XXX TODO - "injustifie": -1, - "total": -1, + "absences": { + "injustifie": nbabsjust, + "total": nbabs, }, } semestre_infos.update(