From 9bf505ff11e82b10ad6fc305bcb171a0a2109efc Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Sun, 19 Feb 2023 19:26:57 +0100
Subject: [PATCH] Table jury BUT: boutons 'Competences' et 'RCUEs'

---
 app/scodoc/sco_pv_dict.py                |  7 ++++++-
 app/scodoc/sco_pv_lettres_inviduelles.py | 25 ++++++++++++------------
 app/static/js/table_recap.js             | 16 ++++++++++++++-
 3 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/app/scodoc/sco_pv_dict.py b/app/scodoc/sco_pv_dict.py
index 1075a2ce3..0dcc421ff 100644
--- a/app/scodoc/sco_pv_dict.py
+++ b/app/scodoc/sco_pv_dict.py
@@ -308,7 +308,12 @@ def _descr_decision_sem(etat, decision_sem):
     else:
         if decision_sem:
             cod = decision_sem["code"]
-            decision = codes_cursus.CODES_EXPL.get(cod, "")  # + ' (%s)' % cod
+            decision = (
+                # exception pour AJ afin de ne pas mentionner le BUT
+                codes_cursus.CODES_EXPL.get(cod, "")
+                if cod != "AJ"
+                else "Ajourné"
+            )
         else:
             decision = ""
     return decision
diff --git a/app/scodoc/sco_pv_lettres_inviduelles.py b/app/scodoc/sco_pv_lettres_inviduelles.py
index 42f5d4136..7a4f2f50a 100644
--- a/app/scodoc/sco_pv_lettres_inviduelles.py
+++ b/app/scodoc/sco_pv_lettres_inviduelles.py
@@ -183,9 +183,10 @@ def pdf_lettre_individuelle(sem, decision, etud: Identite, params, signature=Non
     #
     formsemestre_id = sem["formsemestre_id"]
     formsemestre = FormSemestre.query.get(formsemestre_id)
-    Se: SituationEtudCursus = decision["Se"]
-    t, s = jury_titres(
-        formsemestre, Se.parcours_validated() or not Se.semestre_non_terminal
+    situation_etud: SituationEtudCursus = decision["Se"]
+    titre_jury, titre_jury_court = jury_titres(
+        formsemestre,
+        situation_etud.parcours_validated() or not situation_etud.semestre_non_terminal,
     )
     objects = []
     style = reportlab.lib.styles.ParagraphStyle({})
@@ -196,8 +197,8 @@ def pdf_lettre_individuelle(sem, decision, etud: Identite, params, signature=Non
 
     params["semestre_id"] = formsemestre.semestre_id
     params["decision_sem_descr"] = decision["decision_sem_descr"]
-    params["type_jury"] = t  # type de jury (passage ou delivrance)
-    params["type_jury_abbrv"] = s  # idem, abbrégé
+    params["type_jury"] = titre_jury  # type de jury (passage ou delivrance)
+    params["type_jury_abbrv"] = titre_jury_court  # idem, abbrégé
     params["decisions_ue_descr"] = decision["decisions_ue_descr"]
     if decision["decisions_ue_nb"] > 1:
         params["decisions_ue_descr_plural"] = "s"
@@ -237,23 +238,23 @@ def pdf_lettre_individuelle(sem, decision, etud: Identite, params, signature=Non
     else:
         params["observation_txt"] = ""
     # Autorisations de passage
-    if decision["autorisations"] and not Se.parcours_validated():
+    if decision["autorisations"] and not situation_etud.parcours_validated():
         if len(decision["autorisations"]) > 1:
-            s = "s"
+            titre_jury_court = "s"
         else:
-            s = ""
+            titre_jury_court = ""
         params[
             "autorisations_txt"
         ] = """Vous êtes autorisé%s à continuer dans le%s semestre%s : <b>%s</b>""" % (
             etud.e,
-            s,
-            s,
+            titre_jury_court,
+            titre_jury_court,
             decision["autorisations_descr"],
         )
     else:
         params["autorisations_txt"] = ""
 
-    if decision["decision_sem"] and Se.parcours_validated():
+    if decision["decision_sem"] and situation_etud.parcours_validated():
         params["diplome_txt"] = (
             """Vous avez donc obtenu le diplôme : <b>%(titre_formation)s</b>""" % params
         )
@@ -279,7 +280,7 @@ def pdf_lettre_individuelle(sem, decision, etud: Identite, params, signature=Non
     # Signature:
     # nota: si semestre terminal, signature par directeur IUT, sinon, signature par
     # chef de département.
-    if Se.semestre_non_terminal:
+    if situation_etud.semestre_non_terminal:
         sig = (
             sco_preferences.get_preference(
                 "PV_LETTER_PASSAGE_SIGNATURE", formsemestre_id
diff --git a/app/static/js/table_recap.js b/app/static/js/table_recap.js
index 40392eba6..56d43e3d9 100644
--- a/app/static/js/table_recap.js
+++ b/app/static/js/table_recap.js
@@ -116,12 +116,26 @@ $(function () {
         ]; // fin des boutons communs à toutes les tables recap
 
         if ($('table.table_recap').hasClass("jury")) {
-            // table jury: avec ou sans codes enregistrés
+            // Table JURY: 
+            // avec ou sans codes enregistrés
             buttons.push(
                 {
                     text: '<span data-group="recorded_code">Codes jury</span>',
                     action: toggle_col_but_visibility,
                 });
+            if ($('table.table_recap').hasClass("apc")) {
+                // Boutons spécifiques à la table JURY BUT
+                buttons.push(
+                    {
+                        text: '<span data-group="cursus_but">Compétences</span>',
+                        action: toggle_col_but_visibility,
+                    });
+                buttons.push(
+                    {
+                        text: '<span data-group="col_rcue">RCUEs</span>',
+                        action: toggle_col_but_visibility,
+                    });
+            }
         } else {
             // BOUTONS SPECIFIQUES A LA TABLE RECAP NON JURY
             buttons.push(