From 0adcbb7c0b1052836628647b8d786a56f77a2df6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9o=20BARAS=20=28IUT1=20Grenoble=29?=
 <cleo.baras@univ-grenoble-alpes.fr>
Date: Tue, 6 Feb 2024 17:53:38 +0100
Subject: [PATCH] =?UTF-8?q?Ajoute=20diff=C3=A9rentes=20infos=20=C3=A0=20la?=
 =?UTF-8?q?=20page=20du=20site=20Web=20consacr=C3=A9=20aux=20PE=20(dont=20?=
 =?UTF-8?q?tentative=20de=20progress=20bar)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/pe/pe_view.py                     | 13 ++++++++++
 app/templates/pe/pe_view_sem_recap.j2 | 37 +++++++++++++++++++++++----
 2 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/app/pe/pe_view.py b/app/pe/pe_view.py
index 8279ff611..986627fa9 100644
--- a/app/pe/pe_view.py
+++ b/app/pe/pe_view.py
@@ -70,14 +70,19 @@ def pe_view_sem_recap(formsemestre_id: int):
     # L'année du diplome
     annee_diplome = pe_comp.get_annee_diplome_semestre(formsemestre)
 
+    # Cosemestres diplomants
+    cosemestres = pe_comp.get_cosemestres_diplomants(annee_diplome)
+
     if request.method == "GET":
         return render_template(
             "pe/pe_view_sem_recap.j2",
             annee_diplome=annee_diplome,
             formsemestre=formsemestre,
             sco=ScoData(formsemestre=formsemestre),
+            cosemestres=cosemestres,
         )
 
+    # request.method == "POST"
     jury = pe_jury.JuryPE(annee_diplome)
     if not jury.diplomes_ids:
         flash("aucun étudiant à considérer !")
@@ -97,3 +102,11 @@ def pe_view_sem_recap(formsemestre_id: int):
         download_name=scu.sanitize_filename(jury.nom_export_zip + ".zip"),
         as_attachment=True,
     )
+
+    return render_template(
+        "pe/pe_view_sem_recap.j2",
+        annee_diplome=annee_diplome,
+        formsemestre=formsemestre,
+        sco=ScoData(formsemestre=formsemestre),
+        cosemestres=cosemestres,
+    )
diff --git a/app/templates/pe/pe_view_sem_recap.j2 b/app/templates/pe/pe_view_sem_recap.j2
index 49884d8d1..53a8506b3 100644
--- a/app/templates/pe/pe_view_sem_recap.j2
+++ b/app/templates/pe/pe_view_sem_recap.j2
@@ -30,7 +30,7 @@
     <p>
     Cette fonction génère un ensemble de feuilles de calcul (xlsx)
     permettant d'éditer des avis de poursuites d'études pour les étudiants
-    de BUT diplômés en {{annee_diplome}}.
+        de BUT diplômés.
     <br>
     De nombreux aspects sont paramétrables:
     <a href="https://scodoc.org/AvisPoursuiteEtudes"
@@ -40,9 +40,36 @@
     </p>
 </div>
 
-<form method="post">
-    <input type="submit" value="Générer les documents"/>
-    <input type="hidden" name="formsemestre_id" value="{{formsemestre.id}}">
-</form>
+    <h3>Avis de poursuites d'études de la promo {{ annee_diplome }}</h3>
 
+    <div class="help">
+    Seront (a minima) pris en compte les étudiants des semestres suivants :
+
+    <ul>
+        {% for fid in cosemestres %}
+        <li>
+            {{ cosemestres[fid].titre_annee() }}
+        </li>
+        {%  endfor %}
+    </ul>
+    </div>
+
+    <div>
+    <progress id="pe_progress" style="visibility: hidden"></progress>
+    <br>
+    <button onclick="submitPEGeneration()">Générer les documents de la promo {{ annee_diplome }}</button>
+    </div>
+
+    <form method="post" id="pe_generation" style="visibility: hidden">
+        <input type="submit"
+               onclick="submitPEGeneration()" value=""/>
+        <input type="hidden" name="formsemestre_id" value="{{formsemestre.id}}">
+    </form>
+
+    <script>
+    function submitPEGeneration() {
+        // document.getElementById("pe_progress").style.visibility = 'visible';
+        document.getElementById("pe_generation").submit(); //attach an id to your form
+    }
+    </script>
 {% endblock app_content %}
\ No newline at end of file