From d7acff9d35b645889f1ecd4d219c1d65e563088f Mon Sep 17 00:00:00 2001
From: Iziram <matthias.hartmann@iziram.fr>
Date: Thu, 23 May 2024 09:07:50 +0200
Subject: [PATCH] =?UTF-8?q?Assiduit=C3=A9=20:=20reorganisation=20lien=20as?=
 =?UTF-8?q?si=20page=20sem=20+=20bulle=20avertissement=20saisie=20diff?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/scodoc/sco_formsemestre_status.py | 49 ++++++++++++++++-----------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/app/scodoc/sco_formsemestre_status.py b/app/scodoc/sco_formsemestre_status.py
index 4dce9f241..0d7686ec8 100755
--- a/app/scodoc/sco_formsemestre_status.py
+++ b/app/scodoc/sco_formsemestre_status.py
@@ -822,16 +822,7 @@ def _make_listes_sem(formsemestre: FormSemestre) -> str:
                         </div>
                     </div>
                     <div class="sem-groups-assi">
-                        <div>
-                            <a class="stdlink" href="{
-                                url_for("assiduites.visu_assi_group",
-                                    scodoc_dept=g.scodoc_dept,
-                                    date_debut=formsemestre.date_debut.isoformat(),
-                                    date_fin=formsemestre.date_fin.isoformat(),
-                                    group_ids=group.id,
-                                    )}">
-                                Bilan</a>
-                        </div>
+                        
                     """
                 )
                 if can_edit_abs:
@@ -848,15 +839,6 @@ def _make_listes_sem(formsemestre: FormSemestre) -> str:
                         Saisir l'assiduité</a>
                         </div>
                         <div>
-                        <a class="stdlink" href="{
-                            url_for("assiduites.signal_assiduites_diff",
-                                scodoc_dept=g.scodoc_dept,
-                                formsemestre_id=formsemestre.id,
-                                group_ids=group.id,
-                        )}">
-                        Saisie différée</a>
-                        </div>
-                        <div>
                         <a class="stdlink" href="{
                             url_for("assiduites.bilan_dept",
                                 scodoc_dept=g.scodoc_dept,
@@ -867,6 +849,35 @@ def _make_listes_sem(formsemestre: FormSemestre) -> str:
                         </div>
                     """
                     )
+                H.append(
+                    f"""
+                        <div>
+                            <a class="stdlink" href="{
+                                url_for("assiduites.visu_assi_group",
+                                    scodoc_dept=g.scodoc_dept,
+                                    date_debut=formsemestre.date_debut.isoformat(),
+                                    date_fin=formsemestre.date_fin.isoformat(),
+                                    group_ids=group.id,
+                                    )}">
+                                Bilan</a>
+                        </div>
+                    """
+                )
+
+                if can_edit_abs:
+                    H.append(
+                        f"""
+                        <div>
+                        <a class="stdlink" href="{
+                            url_for("assiduites.signal_assiduites_diff",
+                                scodoc_dept=g.scodoc_dept,
+                                formsemestre_id=formsemestre.id,
+                                group_ids=group.id,
+                        )}" title="Page en cours de fusion et sera prochainement supprimée. Veuillez utiliser la page `Saisir l'assiduité`">
+                        (Saisie différée)</a>
+                        </div>  
+                        """
+                    )
 
                 H.append("</div>")  # /sem-groups-assi
         if partition_is_empty: