From 917070b169b166a7220aac755f80b15e27753ba0 Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Tue, 21 Feb 2023 02:43:26 +0100
Subject: [PATCH] =?UTF-8?q?Mise=20=C3=A0=20jour=20des=20menus.=20Feuille?=
 =?UTF-8?q?=20pr=C3=A9pa=20jury=20seulement=20pour=20non=20BUT.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/scodoc/sco_formsemestre_status.py | 18 ++++++------------
 app/scodoc/sco_pv_forms.py            |  9 +++++----
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/app/scodoc/sco_formsemestre_status.py b/app/scodoc/sco_formsemestre_status.py
index f1077b4f4..d3ac77400 100644
--- a/app/scodoc/sco_formsemestre_status.py
+++ b/app/scodoc/sco_formsemestre_status.py
@@ -390,13 +390,6 @@ def formsemestre_status_menubar(formsemestre: FormSemestre) -> str:
             "endpoint": "notes.evaluations_recap",
             "args": {"formsemestre_id": formsemestre_id},
         },
-        {
-            "title": "Saisie des notes",
-            "endpoint": "notes.formsemestre_status",
-            "args": {"formsemestre_id": formsemestre_id},
-            "enabled": True,
-            "helpmsg": "Tableau de bord du semestre",
-        },
         {
             "title": "Classeur PDF des bulletins",
             "endpoint": "notes.formsemestre_bulletins_pdf_choice",
@@ -426,11 +419,6 @@ def formsemestre_status_menubar(formsemestre: FormSemestre) -> str:
             "endpoint": "notes.formsemestre_pvjury",
             "args": {"formsemestre_id": formsemestre_id},
         },
-        {
-            "title": "Générer feuille préparation Jury",
-            "endpoint": "notes.feuille_preparation_jury",
-            "args": {"formsemestre_id": formsemestre_id},
-        },
         {
             "title": "Saisie des décisions du jury",
             "endpoint": "notes.formsemestre_recapcomplet",
@@ -440,6 +428,12 @@ def formsemestre_status_menubar(formsemestre: FormSemestre) -> str:
             },
             "enabled": formsemestre.can_edit_jury(),
         },
+        {
+            "title": "Générer feuille préparation Jury (non BUT)",
+            "endpoint": "notes.feuille_preparation_jury",
+            "args": {"formsemestre_id": formsemestre_id},
+            "enabled": not formsemestre.formation.is_apc(),
+        },
         {
             "title": "Éditer les PV et archiver les résultats",
             "endpoint": "notes.formsemestre_archive",
diff --git a/app/scodoc/sco_pv_forms.py b/app/scodoc/sco_pv_forms.py
index c5b256e4d..46cf7d614 100644
--- a/app/scodoc/sco_pv_forms.py
+++ b/app/scodoc/sco_pv_forms.py
@@ -206,10 +206,11 @@ def pvjury_table(
     return lines, titles, columns_ids
 
 
-# XXX TODO cette page a vocation a disparaitre,
-# remplacée par formsemestre_recapcomplet en mode jury (déjà le cas pour les BUT)
-def formsemestre_pvjury(formsemestre_id, format="html", publish=True):  # XXX
-    """Page récapitulant les décisions de jury"""
+def formsemestre_pvjury(formsemestre_id, format="html", publish=True):
+    """Page récapitulant les décisions de jury
+    En classique: table spécifique avec les deux semestres pour le DUT
+    En APC/BUT: renvoie vers table recap, en mode jury.
+    """
     formsemestre = FormSemestre.query.get_or_404(formsemestre_id)
     is_apc = formsemestre.formation.is_apc()
     if format == "html" and is_apc: