From 87cc4c06d67ae178435a9e3ff4c72b5dab48495f Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Fri, 23 Jun 2023 15:35:52 +0200
Subject: [PATCH] Ajout recap. parcours BUT sur page saisie jury

---
 app/but/jury_but_view.py    |  2 +-
 app/scodoc/sco_page_etud.py |  2 +-
 app/static/css/jury_but.css |  6 ++++--
 app/views/notes.py          | 35 ++++++++++++++++++++++++++++-------
 4 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/app/but/jury_but_view.py b/app/but/jury_but_view.py
index 275d93b1e..4af88cae5 100644
--- a/app/but/jury_but_view.py
+++ b/app/but/jury_but_view.py
@@ -423,7 +423,7 @@ def jury_but_semestriel(
             {warning}
         </div>
 
-        <form method="post" id="jury_but">
+        <form method="post" class="jury_but_box" id="jury_but">
         """,
     ]
 
diff --git a/app/scodoc/sco_page_etud.py b/app/scodoc/sco_page_etud.py
index 4b1973768..e2dbd1cbc 100644
--- a/app/scodoc/sco_page_etud.py
+++ b/app/scodoc/sco_page_etud.py
@@ -36,7 +36,7 @@ from flask_login import current_user
 import app.scodoc.sco_utils as scu
 import app.scodoc.notesdb as ndb
 from app import log
-from app.but import cursus_but, jury_but_view
+from app.but import cursus_but
 from app.models.etudiants import Identite, make_etud_args
 from app.models.formsemestre import FormSemestre
 from app.scodoc import html_sco_header
diff --git a/app/static/css/jury_but.css b/app/static/css/jury_but.css
index bf4be05e3..2e3f0f713 100644
--- a/app/static/css/jury_but.css
+++ b/app/static/css/jury_but.css
@@ -23,7 +23,7 @@
     margin-top: 0px;
 }
 
-form#jury_but {
+.jury_but_box {
     margin: 0px 16px 16px 16px;
     background-color: rgb(253, 253, 231);
     border: 2px solid rgb(4, 4, 118);
@@ -35,7 +35,9 @@ form#jury_but {
     min-width: var(--sco-content-min-width);
     max-width: var(--sco-content-max-width);
 }
-
+div.jury_but_box_title {
+    margin-bottom: 10px;
+}
 .but_annee {
     margin-left: 32px;
     display: inline-grid;
diff --git a/app/views/notes.py b/app/views/notes.py
index 1ef706934..abdfdfaf1 100644
--- a/app/views/notes.py
+++ b/app/views/notes.py
@@ -42,12 +42,17 @@ from flask_login import current_user
 from app import db
 from app import models
 from app.auth.models import User
-from app.but import apc_edit_ue
-from app.but import jury_but, jury_but_validation_auto
+from app.but import (
+    apc_edit_ue,
+    cursus_but,
+    jury_edit_manual,
+    jury_but,
+    jury_but_pv,
+    jury_but_validation_auto,
+    jury_but_view,
+)
 from app.but.forms import jury_but_forms
-from app.but import jury_but_pv
-from app.but import jury_but_view
-from app.but import jury_edit_manual
+
 
 from app.comp import jury, res_sem
 from app.comp.res_compat import NotesTableCompat
@@ -2368,7 +2373,10 @@ def formsemestre_validation_but(
             page_title=f"Validation BUT S{formsemestre.semestre_id}",
             formsemestre_id=formsemestre_id,
             etudid=etudid,
-            cssstyles=("css/jury_but.css",),
+            cssstyles=[
+                "css/jury_but.css",
+                "css/cursus_but.css",
+            ],
             javascripts=("js/jury_but.js",),
         ),
         """<div class="jury_but">
@@ -2469,7 +2477,7 @@ def formsemestre_validation_but(
         {warning}
     </div>
 
-    <form method="post" id="jury_but">
+    <form method="post" class="jury_but_box" id="jury_but">
     """
     )
 
@@ -2546,6 +2554,19 @@ def formsemestre_validation_but(
         </div>
         """
         )
+    # Affichage cursus BUT
+    but_cursus = cursus_but.EtudCursusBUT(etud, deca.formsemestre.formation)
+    H += [
+        """<div class="jury_but_box">
+        <div class="jury_but_box_title"><b>Niveaux de compétences enregistrés :</b></div>
+        """,
+        render_template(
+            "but/cursus_etud.j2",
+            cursus=but_cursus,
+            scu=scu,
+        ),
+        "</div>",
+    ]
     H.append(
         render_template(
             "but/documentation_codes_jury.j2",