From 372a6e6ed62faf29353e0a65cdd39e7b9d06e29d Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Thu, 30 Jun 2022 20:43:09 +0200
Subject: [PATCH] =?UTF-8?q?Pas=20de=20d=C3=A9cision=20de=20sem.=20affich?=
 =?UTF-8?q?=C3=A9e=20en=20BUT:=20ficheEtud=20et=20bul.=20json?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/scodoc/sco_formsemestre_validation.py | 6 ++++--
 app/scodoc/sco_pvjury.py                  | 5 ++++-
 app/static/css/scodoc.css                 | 3 ++-
 app/views/notes.py                        | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

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}</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"])
         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
         # 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)