From 93136ee67930f7d02a57696f1248df889d0a83f5 Mon Sep 17 00:00:00 2001
From: iziram <matthias.hartmann@iziram.fr>
Date: Tue, 20 Jun 2023 08:33:49 +0200
Subject: [PATCH] =?UTF-8?q?Assiduites=20:=20r=C3=A9organisation=20template?=
 =?UTF-8?q?s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{ => pages}/config_assiduites.j2          |  0
 .../{ => pages}/etat_absence_date.j2          |  0
 .../{ => pages}/liste_assiduites.j2           |  2 +-
 .../pages/signal_assiduites_diff.j2           |  9 ++++++++
 .../{ => pages}/signal_assiduites_etud.j2     |  8 +++----
 .../{ => pages}/signal_assiduites_group.j2    |  8 +++----
 .../assiduites/signal_assiduites_diff.j2      |  9 --------
 .../assiduites/{ => widgets}/alert.j2         |  0
 .../assiduites/{ => widgets}/conflict.j2      |  0
 .../assiduites/{ => widgets}/differee.j2      |  0
 .../assiduites/{ => widgets}/minitimeline.j2  |  0
 .../moduleimpl_dynamic_selector.j2            |  0
 .../{ => widgets}/moduleimpl_selector.j2      |  0
 .../assiduites/{ => widgets}/prompt.j2        |  0
 .../assiduites/{ => widgets}/timeline.j2      |  0
 .../assiduites/{ => widgets}/toast.j2         |  0
 app/views/assiduites.py                       | 22 ++++++++++---------
 ...75e87f_modèles_assiduites_justificatifs.py |  4 ++--
 18 files changed, 32 insertions(+), 30 deletions(-)
 rename app/templates/assiduites/{ => pages}/config_assiduites.j2 (100%)
 rename app/templates/assiduites/{ => pages}/etat_absence_date.j2 (100%)
 rename app/templates/assiduites/{ => pages}/liste_assiduites.j2 (99%)
 create mode 100644 app/templates/assiduites/pages/signal_assiduites_diff.j2
 rename app/templates/assiduites/{ => pages}/signal_assiduites_etud.j2 (94%)
 rename app/templates/assiduites/{ => pages}/signal_assiduites_group.j2 (94%)
 delete mode 100644 app/templates/assiduites/signal_assiduites_diff.j2
 rename app/templates/assiduites/{ => widgets}/alert.j2 (100%)
 rename app/templates/assiduites/{ => widgets}/conflict.j2 (100%)
 rename app/templates/assiduites/{ => widgets}/differee.j2 (100%)
 rename app/templates/assiduites/{ => widgets}/minitimeline.j2 (100%)
 rename app/templates/assiduites/{ => widgets}/moduleimpl_dynamic_selector.j2 (100%)
 rename app/templates/assiduites/{ => widgets}/moduleimpl_selector.j2 (100%)
 rename app/templates/assiduites/{ => widgets}/prompt.j2 (100%)
 rename app/templates/assiduites/{ => widgets}/timeline.j2 (100%)
 rename app/templates/assiduites/{ => widgets}/toast.j2 (100%)

diff --git a/app/templates/assiduites/config_assiduites.j2 b/app/templates/assiduites/pages/config_assiduites.j2
similarity index 100%
rename from app/templates/assiduites/config_assiduites.j2
rename to app/templates/assiduites/pages/config_assiduites.j2
diff --git a/app/templates/assiduites/etat_absence_date.j2 b/app/templates/assiduites/pages/etat_absence_date.j2
similarity index 100%
rename from app/templates/assiduites/etat_absence_date.j2
rename to app/templates/assiduites/pages/etat_absence_date.j2
diff --git a/app/templates/assiduites/liste_assiduites.j2 b/app/templates/assiduites/pages/liste_assiduites.j2
similarity index 99%
rename from app/templates/assiduites/liste_assiduites.j2
rename to app/templates/assiduites/pages/liste_assiduites.j2
index 2fd4daf6c0..87353a5592 100644
--- a/app/templates/assiduites/liste_assiduites.j2
+++ b/app/templates/assiduites/pages/liste_assiduites.j2
@@ -1,4 +1,4 @@
-{% include "assiduites/alert.j2" %}
+{% include "assiduites/widgets/alert.j2" %}
 {% include "assiduites/prompt.j2" %}
 {% block app_content %}
 
diff --git a/app/templates/assiduites/pages/signal_assiduites_diff.j2 b/app/templates/assiduites/pages/signal_assiduites_diff.j2
new file mode 100644
index 0000000000..abb7fcea5a
--- /dev/null
+++ b/app/templates/assiduites/pages/signal_assiduites_diff.j2
@@ -0,0 +1,9 @@
+<h2>Signalement différé des assiduités {{gr |safe}}</h2>
+<h3>{{sem | safe }}</h3>
+
+{{diff | safe}}
+
+{% include "assiduites/widgets/alert.j2" %}
+{% include "assiduites/widgets/prompt.j2" %}
+{% include "assiduites/widgets/conflict.j2" %}
+{% include "assiduites/widgets/toast.j2" %}
\ No newline at end of file
diff --git a/app/templates/assiduites/signal_assiduites_etud.j2 b/app/templates/assiduites/pages/signal_assiduites_etud.j2
similarity index 94%
rename from app/templates/assiduites/signal_assiduites_etud.j2
rename to app/templates/assiduites/pages/signal_assiduites_etud.j2
index 94811b1371..f03d4f2860 100644
--- a/app/templates/assiduites/signal_assiduites_etud.j2
+++ b/app/templates/assiduites/pages/signal_assiduites_etud.j2
@@ -1,8 +1,8 @@
 {# -*- mode: jinja-html -*- #}
-{% include "assiduites/toast.j2" %}
-{% include "assiduites/alert.j2" %}
-{% include "assiduites/prompt.j2" %}
-{% include "assiduites/conflict.j2" %}
+{% include "assiduites/widgets/toast.j2" %}
+{% include "assiduites/widgets/alert.j2" %}
+{% include "assiduites/widgets/prompt.j2" %}
+{% include "assiduites/widgets/conflict.j2" %}
 <div id="page-assiduite-content">
     {% block content %}
     <h2>Signalement de l'assiduité de <span class="rouge">{{sco.etud.nomprenom}}</span></h2>
diff --git a/app/templates/assiduites/signal_assiduites_group.j2 b/app/templates/assiduites/pages/signal_assiduites_group.j2
similarity index 94%
rename from app/templates/assiduites/signal_assiduites_group.j2
rename to app/templates/assiduites/pages/signal_assiduites_group.j2
index fc80e5fccf..f0da36b0ef 100644
--- a/app/templates/assiduites/signal_assiduites_group.j2
+++ b/app/templates/assiduites/pages/signal_assiduites_group.j2
@@ -1,4 +1,4 @@
-{% include "assiduites/toast.j2" %}
+{% include "assiduites/widgets/toast.j2" %}
 <section id="content">
 
     <div class="no-display">
@@ -62,9 +62,9 @@
         <div class="loader"></div>
     </div>
 
-    {% include "assiduites/alert.j2" %}
-    {% include "assiduites/prompt.j2" %}
-    {% include "assiduites/conflict.j2" %}
+    {% include "assiduites/widgets/alert.j2" %}
+    {% include "assiduites/widgets/prompt.j2" %}
+    {% include "assiduites/widgets/conflict.j2" %}
 
     <script>
 
diff --git a/app/templates/assiduites/signal_assiduites_diff.j2 b/app/templates/assiduites/signal_assiduites_diff.j2
deleted file mode 100644
index 9735aa8a03..0000000000
--- a/app/templates/assiduites/signal_assiduites_diff.j2
+++ /dev/null
@@ -1,9 +0,0 @@
-<h2>Signalement différé des assiduités {{gr |safe}}</h2>
-<h3>{{sem | safe }}</h3>
-
-{{diff | safe}}
-
-{% include "assiduites/alert.j2" %}
-{% include "assiduites/prompt.j2" %}
-{% include "assiduites/conflict.j2" %}
-{% include "assiduites/toast.j2" %}
\ No newline at end of file
diff --git a/app/templates/assiduites/alert.j2 b/app/templates/assiduites/widgets/alert.j2
similarity index 100%
rename from app/templates/assiduites/alert.j2
rename to app/templates/assiduites/widgets/alert.j2
diff --git a/app/templates/assiduites/conflict.j2 b/app/templates/assiduites/widgets/conflict.j2
similarity index 100%
rename from app/templates/assiduites/conflict.j2
rename to app/templates/assiduites/widgets/conflict.j2
diff --git a/app/templates/assiduites/differee.j2 b/app/templates/assiduites/widgets/differee.j2
similarity index 100%
rename from app/templates/assiduites/differee.j2
rename to app/templates/assiduites/widgets/differee.j2
diff --git a/app/templates/assiduites/minitimeline.j2 b/app/templates/assiduites/widgets/minitimeline.j2
similarity index 100%
rename from app/templates/assiduites/minitimeline.j2
rename to app/templates/assiduites/widgets/minitimeline.j2
diff --git a/app/templates/assiduites/moduleimpl_dynamic_selector.j2 b/app/templates/assiduites/widgets/moduleimpl_dynamic_selector.j2
similarity index 100%
rename from app/templates/assiduites/moduleimpl_dynamic_selector.j2
rename to app/templates/assiduites/widgets/moduleimpl_dynamic_selector.j2
diff --git a/app/templates/assiduites/moduleimpl_selector.j2 b/app/templates/assiduites/widgets/moduleimpl_selector.j2
similarity index 100%
rename from app/templates/assiduites/moduleimpl_selector.j2
rename to app/templates/assiduites/widgets/moduleimpl_selector.j2
diff --git a/app/templates/assiduites/prompt.j2 b/app/templates/assiduites/widgets/prompt.j2
similarity index 100%
rename from app/templates/assiduites/prompt.j2
rename to app/templates/assiduites/widgets/prompt.j2
diff --git a/app/templates/assiduites/timeline.j2 b/app/templates/assiduites/widgets/timeline.j2
similarity index 100%
rename from app/templates/assiduites/timeline.j2
rename to app/templates/assiduites/widgets/timeline.j2
diff --git a/app/templates/assiduites/toast.j2 b/app/templates/assiduites/widgets/toast.j2
similarity index 100%
rename from app/templates/assiduites/toast.j2
rename to app/templates/assiduites/widgets/toast.j2
diff --git a/app/views/assiduites.py b/app/views/assiduites.py
index 9c1d1f0691..e312f7f713 100644
--- a/app/views/assiduites.py
+++ b/app/views/assiduites.py
@@ -207,7 +207,7 @@ def signal_assiduites_etud():
         header,
         _mini_timeline(),
         render_template(
-            "assiduites/signal_assiduites_etud.j2",
+            "assiduites/pages/signal_assiduites_etud.j2",
             sco=ScoData(etud),
             date=datetime.date.today().isoformat(),
             morning=morning,
@@ -262,7 +262,7 @@ def liste_assiduites_etud():
     return HTMLBuilder(
         header,
         render_template(
-            "assiduites/liste_assiduites.j2",
+            "assiduites/pages/liste_assiduites.j2",
             sco=ScoData(etud),
             date=datetime.date.today().isoformat(),
         ),
@@ -394,7 +394,7 @@ def signal_assiduites_group():
         header,
         _mini_timeline(),
         render_template(
-            "assiduites/signal_assiduites_group.j2",
+            "assiduites/pages/signal_assiduites_group.j2",
             gr_tit=gr_tit,
             sem=sem["titre_num"],
             date=date,
@@ -480,7 +480,9 @@ def get_etat_abs_date():
     return HTMLBuilder(
         header,
         render_template(
-            "assiduites/etat_absence_date.j2", etudiants=etudiants, eval=evaluation
+            "assiduites/pages/etat_absence_date.j2",
+            etudiants=etudiants,
+            eval=evaluation,
         ),
         html_sco_header.sco_footer(),
     ).build()
@@ -568,7 +570,7 @@ def signal_assiduites_diff():
     return HTMLBuilder(
         header,
         render_template(
-            "assiduites/signal_assiduites_diff.j2",
+            "assiduites/pages/signal_assiduites_diff.j2",
             diff=_differee(
                 etudiants=etudiants,
                 moduleimpl_select=_module_selector(formsemestre),
@@ -604,7 +606,7 @@ def _differee(
     )
 
     return render_template(
-        "assiduites/differee.j2",
+        "assiduites/widgets/differee.j2",
         etudiants=etudiants,
         etat_def=etat_def,
         forcer_module=forcer_module,
@@ -647,17 +649,17 @@ def _module_selector(
         modules.append({"moduleimpl_id": modimpl["moduleimpl_id"], "name": modname})
 
     return render_template(
-        "assiduites/moduleimpl_selector.j2", selected=selected, modules=modules
+        "assiduites/widgets/moduleimpl_selector.j2", selected=selected, modules=modules
     )
 
 
 def _dynamic_module_selector():
-    return render_template("assiduites/moduleimpl_dynamic_selector.j2")
+    return render_template("assiduites/widgets/moduleimpl_dynamic_selector.j2")
 
 
 def _timeline(formsemestre_id=None) -> HTMLElement:
     return render_template(
-        "assiduites/timeline.j2",
+        "assiduites/widgets/timeline.j2",
         t_start=get_time("assi_morning_time", "08:00:00"),
         t_end=get_time("assi_afternoon_time", "18:00:00"),
         tick_time=ScoDocSiteConfig.get("assi_tick_time", 15),
@@ -669,7 +671,7 @@ def _timeline(formsemestre_id=None) -> HTMLElement:
 
 def _mini_timeline() -> HTMLElement:
     return render_template(
-        "assiduites/minitimeline.j2",
+        "assiduites/widgets/minitimeline.j2",
         t_start=get_time("assi_morning_time", "08:00:00"),
         t_end=get_time("assi_afternoon_time", "18:00:00"),
     )
diff --git a/migrations/versions/dbcf2175e87f_modèles_assiduites_justificatifs.py b/migrations/versions/dbcf2175e87f_modèles_assiduites_justificatifs.py
index 7a102b4550..08514497d4 100755
--- a/migrations/versions/dbcf2175e87f_modèles_assiduites_justificatifs.py
+++ b/migrations/versions/dbcf2175e87f_modèles_assiduites_justificatifs.py
@@ -1,7 +1,7 @@
 """modèles assiduites justificatifs
 
 Revision ID: dbcf2175e87f
-Revises: d84bc592584e
+Revises: c701224fa255
 Create Date: 2023-02-01 14:21:06.989190
 
 """
@@ -11,7 +11,7 @@ import sqlalchemy as sa
 
 # revision identifiers, used by Alembic.
 revision = "dbcf2175e87f"
-down_revision = "d84bc592584e"
+down_revision = "c701224fa255"
 branch_labels = None
 depends_on = None