jmplace/DocScoDoc
1
0
Fork 0
forked from ScoDoc/DocScoDoc
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://scodoc.org/git/viennet/ScoDoc into refactor_nt

Browse Source
This commit is contained in:
Emmanuel Viennet 2022-01-26 08:16:50 +01:00
commit 63e17650b6
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/but/bulletin_but.py
View File

@ -11,6 +11,11 @@ import datetime
from flask import url_for, g from flask import url_for, g
from app.scodoc import sco_utils as scu 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_bulletins_json
from app.scodoc import sco_preferences from app.scodoc import sco_preferences
from app.scodoc.sco_codes_parcours import UE_SPORT from app.scodoc.sco_codes_parcours import UE_SPORT
@ -178,6 +183,8 @@ class BulletinBUT(ResultatsSemestreBUT):
} }
if not published: if not published:
return d return d
nbabs, nbabsjust = formsemestre.get_abs_count(etud.id)
semestre_infos = { semestre_infos = {
"etapes": [str(x.etape_apo) for x in formsemestre.etapes if x.etape_apo], "etapes": [str(x.etape_apo) for x in formsemestre.etapes if x.etape_apo],
"date_debut": formsemestre.date_debut.isoformat(), "date_debut": formsemestre.date_debut.isoformat(),
@ -186,9 +193,9 @@ class BulletinBUT(ResultatsSemestreBUT):
"inscription": "TODO-MM-JJ", # XXX TODO "inscription": "TODO-MM-JJ", # XXX TODO
"numero": formsemestre.semestre_id, "numero": formsemestre.semestre_id,
"groupes": [], # XXX TODO "groupes": [], # XXX TODO
"absences": { # XXX TODO "absences": {
"injustifie": -1, "injustifie": nbabsjust,
"total": -1, "total": nbabs,
}, },
} }
semestre_infos.update( semestre_infos.update(