diff --git a/app/scodoc/sco_formsemestre_validation.py b/app/scodoc/sco_formsemestre_validation.py
index 907b01b5f..2af209c2a 100644
--- a/app/scodoc/sco_formsemestre_validation.py
+++ b/app/scodoc/sco_formsemestre_validation.py
@@ -596,10 +596,12 @@ def formsemestre_recap_parcours_table(
title="Bulletin de notes">{formsemestre.titre_annee()}{parcours_name}
"""
)
- if decision_sem:
+ if nt.is_apc:
+ H.append('
BUT | ')
+ elif decision_sem:
H.append('%s | ' % decision_sem["code"])
else:
- H.append('en cours | ')
+ H.append("en cours | ")
H.append('%s | ' % ass) # abs
# acronymes UEs auxquelles l'étudiant est inscrit (ou capitalisé)
ues = nt.get_ues_stat_dict(filter_sport=True)
diff --git a/app/scodoc/sco_pvjury.py b/app/scodoc/sco_pvjury.py
index 17f4c2d52..3cba7a933 100644
--- a/app/scodoc/sco_pvjury.py
+++ b/app/scodoc/sco_pvjury.py
@@ -274,7 +274,10 @@ def dict_pvjury(
_codes.add(ue["ue_code"])
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(
etudid, formsemestre_id
diff --git a/app/static/css/scodoc.css b/app/static/css/scodoc.css
index 32564303c..c4db0a261 100644
--- a/app/static/css/scodoc.css
+++ b/app/static/css/scodoc.css
@@ -2980,7 +2980,8 @@ td.rcp_dec {
;
}
-td.rcp_nonass {
+td.rcp_nonass,
+td.rcp_but {
color: red;
}
diff --git a/app/views/notes.py b/app/views/notes.py
index 883a7c7be..b89b24438 100644
--- a/app/views/notes.py
+++ b/app/views/notes.py
@@ -295,7 +295,7 @@ def formsemestre_bulletinetud(
format = format or "html"
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)
if etudid:
etud = models.Identite.query.get_or_404(etudid)