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

Pas de décision de sem. affichée en BUT: ficheEtud et bul. json

Browse Source
This commit is contained in:
Emmanuel Viennet 2022-06-30 20:43:09 +02:00
parent 8310d20a77
commit 372a6e6ed6
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/scodoc/sco_formsemestre_validation.py
View File

@ -596,10 +596,12 @@ def formsemestre_recap_parcours_table(
title="Bulletin de notes">{formsemestre.titre_annee()}{parcours_name}</a></td> title="Bulletin de notes">{formsemestre.titre_annee()}{parcours_name}</a></td>
""" """
) )
if decision_sem: if nt.is_apc:
H.append('<td class="rcp_but">BUT</td>')
elif decision_sem:
H.append('<td class="rcp_dec">%s</td>' % decision_sem["code"]) H.append('<td class="rcp_dec">%s</td>' % decision_sem["code"])
else: else:
H.append('<td colspan="%d"><em>en cours</em></td>') H.append("<td><em>en cours</em></td>")
H.append('<td class="rcp_nonass">%s</td>' % ass) # abs H.append('<td class="rcp_nonass">%s</td>' % ass) # abs
# acronymes UEs auxquelles l'étudiant est inscrit (ou capitalisé) # acronymes UEs auxquelles l'étudiant est inscrit (ou capitalisé)
ues = nt.get_ues_stat_dict(filter_sport=True) ues = nt.get_ues_stat_dict(filter_sport=True)

5
app/scodoc/sco_pvjury.py
View File

@ -274,7 +274,10 @@ def dict_pvjury(
_codes.add(ue["ue_code"]) _codes.add(ue["ue_code"])
d["decisions_ue_descr"] = ", ".join([ue["acronyme"] for ue in ue_uniq]) d["decisions_ue_descr"] = ", ".join([ue["acronyme"] for ue in ue_uniq])
d["decision_sem_descr"] = _descr_decision_sem(d["etat"], d["decision_sem"]) if nt.is_apc:
d["decision_sem_descr"] = "" # pas de validation de semestre en BUT
else:
d["decision_sem_descr"] = _descr_decision_sem(d["etat"], d["decision_sem"])
d["autorisations"] = sco_parcours_dut.formsemestre_get_autorisation_inscription( d["autorisations"] = sco_parcours_dut.formsemestre_get_autorisation_inscription(
etudid, formsemestre_id etudid, formsemestre_id

3
app/static/css/scodoc.css
View File

@ -2980,7 +2980,8 @@ td.rcp_dec {
; ;
} }
td.rcp_nonass { td.rcp_nonass,
td.rcp_but {
color: red; color: red;
} }

2
app/views/notes.py
View File

@ -295,7 +295,7 @@ def formsemestre_bulletinetud(
format = format or "html" format = format or "html"
if not isinstance(formsemestre_id, int): if not isinstance(formsemestre_id, int):
abort(404, description="formsemestre_id must be an integer !") raise ScoInvalidIdType("formsemestre_id must be an integer !")
formsemestre = FormSemestre.query.get_or_404(formsemestre_id) formsemestre = FormSemestre.query.get_or_404(formsemestre_id)
if etudid: if etudid:
etud = models.Identite.query.get_or_404(etudid) etud = models.Identite.query.get_or_404(etudid)