From 93136ee67930f7d02a57696f1248df889d0a83f5 Mon Sep 17 00:00:00 2001 From: iziram 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 2fd4daf6c..87353a559 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 000000000..abb7fcea5 --- /dev/null +++ b/app/templates/assiduites/pages/signal_assiduites_diff.j2 @@ -0,0 +1,9 @@ +

Signalement différé des assiduités {{gr |safe}}

+

{{sem | safe }}

+ +{{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 94811b137..f03d4f286 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" %}
{% block content %}

Signalement de l'assiduité de {{sco.etud.nomprenom}}

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 fc80e5fcc..f0da36b0e 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" %}
@@ -62,9 +62,9 @@
- {% 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" %}