From 54906c1bde6f2233171fa1aecdacaef7073435b0 Mon Sep 17 00:00:00 2001 From: Iziram Date: Wed, 22 Nov 2023 09:13:00 +0100 Subject: [PATCH] =?UTF-8?q?Assiduites=20:=20mises=20=C3=A0=20jour=20couleu?= =?UTF-8?q?rs=20listes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/static/css/assiduites.css | 6 ++++-- app/templates/assiduites/widgets/tableau_assi.j2 | 1 + app/templates/assiduites/widgets/tableau_base.j2 | 13 +++++++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/app/static/css/assiduites.css b/app/static/css/assiduites.css index fe429ecfcb..ed5daa259f 100644 --- a/app/static/css/assiduites.css +++ b/app/static/css/assiduites.css @@ -1,15 +1,17 @@ :root { --color-present: #6bdb83; --color-absent: #e62a11; + --color-absent-clair: #F25D4A; --color-retard: #f0c865; --color-justi: #7059FF; + --color-justi-clair: #6885E3; --color-justi-invalide: #a84476; --color-nonwork: #badfff; --color-absent-justi: #e65ab7; --color-retard-justi: #ffef7a; - --color-error: #FF0000; + --color-error: #e62a11; --color-warning: #eec660; --color-information: #658ef0; @@ -21,7 +23,7 @@ --color-defaut: #FFF; --color-defaut-dark: #444; - + --color-default-text: #1F1F1F; --motif-justi: repeating-linear-gradient(135deg, transparent, transparent 4px, var(--color-justi) 4px, var(--color-justi) 8px); diff --git a/app/templates/assiduites/widgets/tableau_assi.j2 b/app/templates/assiduites/widgets/tableau_assi.j2 index 1b72ebbf11..92e6aef81a 100644 --- a/app/templates/assiduites/widgets/tableau_assi.j2 +++ b/app/templates/assiduites/widgets/tableau_assi.j2 @@ -88,6 +88,7 @@ td.textContent = getModuleImpl(assiduite); } else if (k.indexOf('est_just') != -1) { td.textContent = assiduite[k] ? "Oui" : "Non" + if (assiduite[k]) row.classList.add("est_just") } else if (k.indexOf('etudid') != -1) { const e = getEtudiant(assiduite.etudid); diff --git a/app/templates/assiduites/widgets/tableau_base.j2 b/app/templates/assiduites/widgets/tableau_base.j2 index 2eb5e34e52..71580a14e7 100644 --- a/app/templates/assiduites/widgets/tableau_base.j2 +++ b/app/templates/assiduites/widgets/tableau_base.j2 @@ -456,6 +456,7 @@ td { border: 1px solid #dddddd; padding: 8px; + color: var(--color-default-text); } th { @@ -498,17 +499,25 @@ .l-absent, .l-invalid { - background-color: var(--color-absent); + background-color: var(--color-absent-clair); } .l-valid { - background-color: var(--color-primary); + background-color: var(--color-justi-clair); } .l-retard { background-color: var(--color-retard); } + .l-absent.est_just { + background-color: var(--color-absent-justi); + } + + .l-retard.est_just { + background-color: var(--color-retard-justi); + } + /* Ajoutez des styles pour le conteneur de pagination et les boutons */ .pagination-container { display: flex;