From f275286b712232d220980737e733a7c99a897f0a Mon Sep 17 00:00:00 2001
From: Iziram <matthias.hartmann@iziram.fr>
Date: Wed, 29 May 2024 16:29:34 +0200
Subject: [PATCH] =?UTF-8?q?Assiduit=C3=A9=20:=20liens=20saisie=20hebdo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/scodoc/sco_formsemestre_status.py | 23 ++++++++++++++++++++++-
 app/scodoc/sco_groups_view.py         | 12 ++++++------
 app/scodoc/sco_moduleimpl_status.py   | 22 +++++++++++++++++++---
 3 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/app/scodoc/sco_formsemestre_status.py b/app/scodoc/sco_formsemestre_status.py
index 0d7686ec8..02a0738a1 100755
--- a/app/scodoc/sco_formsemestre_status.py
+++ b/app/scodoc/sco_formsemestre_status.py
@@ -838,6 +838,27 @@ def _make_listes_sem(formsemestre: FormSemestre) -> str:
                         )}">
                         Saisir l'assiduité</a>
                         </div>
+                        """
+                    )
+                # YYYY-Www (ISO 8601) :
+                current_week: str = datetime.datetime.now().strftime("%G-W%V")
+                H.append(
+                    f"""
+                    <div>
+                    <a class="stdlink" href="{
+                        url_for("assiduites.signal_assiduites_hebdo",
+                            scodoc_dept=g.scodoc_dept,
+                            formsemestre_id=formsemestre.id,
+                            group_ids=group.id,
+                            week=current_week,
+                    )}">
+                    Saisir l'assiduité (Hebdo)</a>
+                    </div>
+                    """
+                )
+                if can_edit_abs:
+                    H.append(
+                        f"""
                         <div>
                         <a class="stdlink" href="{
                             url_for("assiduites.bilan_dept",
@@ -847,7 +868,7 @@ def _make_listes_sem(formsemestre: FormSemestre) -> str:
                         )}">
                         Justificatifs en attente</a>
                         </div>
-                    """
+                        """
                     )
                 H.append(
                     f"""
diff --git a/app/scodoc/sco_groups_view.py b/app/scodoc/sco_groups_view.py
index 0ebed4727..80454b435 100644
--- a/app/scodoc/sco_groups_view.py
+++ b/app/scodoc/sco_groups_view.py
@@ -26,7 +26,7 @@
 ##############################################################################
 
 """Affichage étudiants d'un ou plusieurs groupes
-   sous forme: de liste html (table exportable), de trombinoscope (exportable en pdf)
+sous forme: de liste html (table exportable), de trombinoscope (exportable en pdf)
 """
 
 # Re-ecriture en 2014 (re-organisation de l'interface, modernisation du code)
@@ -585,8 +585,8 @@ def groups_table(
         etud_info["_nom_disp_order"] = etud_sort_key(etud_info)
         etud_info["_prenom_target"] = fiche_url
 
-        etud_info["_nom_disp_td_attrs"] = 'id="%s" class="etudinfo"' % (
-            etud_info["etudid"]
+        etud_info["_nom_disp_td_attrs"] = (
+            'id="%s" class="etudinfo"' % (etud_info["etudid"])
         )
         etud_info["bourse_str"] = "oui" if etud_info["boursier"] else "non"
         if etud_info["etat"] == "D":
@@ -998,12 +998,12 @@ def form_choix_saisie_semaine(groups_infos):
         return ""
     query_args = parse_qs(request.query_string)
     moduleimpl_id = query_args.get("moduleimpl_id", [None])[0]
-    semaine = datetime.date.today().isocalendar().week
+    semaine = datetime.datetime.now().strftime("%G-W%V")
     return f"""
     <button onclick="window.location='{url_for(
-        "assiduites.signal_assiduites_diff",
+        "assiduites.signal_assiduites_hebdo",
         group_ids=",".join(map(str,groups_infos.group_ids)),
-        semaine=semaine,
+        week=semaine,
         scodoc_dept=g.scodoc_dept,
         formsemestre_id=groups_infos.formsemestre_id,
         moduleimpl_id=moduleimpl_id
diff --git a/app/scodoc/sco_moduleimpl_status.py b/app/scodoc/sco_moduleimpl_status.py
index 328bb606d..50a60e38b 100644
--- a/app/scodoc/sco_moduleimpl_status.py
+++ b/app/scodoc/sco_moduleimpl_status.py
@@ -323,7 +323,23 @@ def moduleimpl_status(moduleimpl_id=None, partition_id=None):
                 }&formsemestre_id={formsemestre.id}
                 &moduleimpl_id={moduleimpl_id}
                 "
-        >Saisie Absences journée</a></span>
+        >Saisie Absences</a></span>
+        """
+        )
+        current_week: str = datetime.datetime.now().strftime("%G-W%V")
+        H.append(
+            f"""
+                <span class="moduleimpl_abs_link"><a class="stdlink" href="{
+                    url_for("assiduites.signal_assiduites_hebdo",
+                            scodoc_dept=g.scodoc_dept,
+                            formsemestre_id=formsemestre.id,
+                            group_ids=group_id,
+                            week=current_week,
+                            moduleimpl_id=moduleimpl_id
+                    )
+                }
+                "
+        >Saisie Absences (Hebdo)</a></span>
         """
         )
         H.append(
@@ -335,8 +351,8 @@ def moduleimpl_status(moduleimpl_id=None, partition_id=None):
                     group_ids=group_id,
                     formsemestre_id=formsemestre.id,
                     moduleimpl_id="" if moduleimpl_id is None else moduleimpl_id
-            )}"
-        >Saisie Absences Différée</a></span>
+            )}" title="Page en cours de fusion et sera prochainement supprimée. Veuillez utiliser la page `Saisie Absences`"
+        >(Saisie Absences Différée)</a></span>
         """
         )