From b3ba3002ea3ab278c2d7ab3a9bcef3b0c908a929 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Sat, 23 Dec 2023 14:04:46 +0100 Subject: [PATCH] =?UTF-8?q?calendrier=5Fassi=5Fetud:=20affichage=20justif?= =?UTF-8?q?=20=C3=A0=20l'=C3=A9tat=20'modifie'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/templates/assiduites/pages/calendrier.j2 | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/app/templates/assiduites/pages/calendrier.j2 b/app/templates/assiduites/pages/calendrier.j2 index 6058bfa5d..cd8feb583 100644 --- a/app/templates/assiduites/pages/calendrier.j2 +++ b/app/templates/assiduites/pages/calendrier.j2 @@ -169,7 +169,7 @@ right: 0; background-color: var(--color-justi-invalide) !important; } - .color.attente::before { + .color.attente::before, .color.modifie::before { content: ""; position: absolute; width: 25%; @@ -475,6 +475,10 @@ let est_just = "" if (dayJustificatifs.some((j) => j.etat.toLowerCase() === "valide")) { est_just = "est_just"; + } else if (dayJustificatifs.some((j) => j.etat.toLowerCase() === "attente")) { + est_just = "attente"; + } else if (dayJustificatifs.some((j) => j.etat.toLowerCase() === "modifie")) { + est_just = "modifie"; } else if (dayJustificatifs.some((j) => j.etat.toLowerCase() !== "valide")) { est_just = "invalide"; } @@ -535,6 +539,8 @@ est_just = ["est_just"]; } else if (justificatifsMatin.some((j) => j.etat.toLowerCase() === "attente")) { est_just = ["attente"]; + } else if (justificatifsMatin.some((j) => j.etat.toLowerCase() === "modifie")) { + est_just = ["modifie"]; } else if (justificatifsMatin.some((j) => j.etat.toLowerCase() !== "valide")) { est_just = ["invalide"]; @@ -579,8 +585,9 @@ est_just = ["est_just"]; } else if (justificatifsAprem.some((j) => j.etat.toLowerCase() === "attente")) { est_just = ["attente"]; - } - else if (justificatifsAprem.some((j) => j.etat.toLowerCase() !== "valide")) { + } else if (justificatifsAprem.some((j) => j.etat.toLowerCase() === "modifie")) { + est_just = ["modifie"]; + } else if (justificatifsAprem.some((j) => j.etat.toLowerCase() !== "valide")) { est_just = ["invalide"]; }