opolka/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Activity

Update opolka/ScoDoc from ScoDoc/ScoDoc #2

Merged
opolka merged 1272 commits from ScoDoc/ScoDoc:master into master 2024-05-27 09:11:04 +02:00
Conversation 0 Commits 1272 Files Changed 656 +10 -3
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b3ba3002ea - Show all commits

13
app/templates/assiduites/pages/calendrier.j2
View File

@ -169,7 +169,7 @@
right: 0; right: 0;
background-color: var(--color-justi-invalide) !important; background-color: var(--color-justi-invalide) !important;
} }
.color.attente::before { .color.attente::before, .color.modifie::before {
content: ""; content: "";
position: absolute; position: absolute;
width: 25%; width: 25%;
@ -475,6 +475,10 @@
let est_just = "" let est_just = ""
if (dayJustificatifs.some((j) => j.etat.toLowerCase() === "valide")) { if (dayJustificatifs.some((j) => j.etat.toLowerCase() === "valide")) {
est_just = "est_just"; 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")) { } else if (dayJustificatifs.some((j) => j.etat.toLowerCase() !== "valide")) {
est_just = "invalide"; est_just = "invalide";
} }
@ -535,6 +539,8 @@
est_just = ["est_just"]; est_just = ["est_just"];
} else if (justificatifsMatin.some((j) => j.etat.toLowerCase() === "attente")) { } else if (justificatifsMatin.some((j) => j.etat.toLowerCase() === "attente")) {
est_just = ["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")) { else if (justificatifsMatin.some((j) => j.etat.toLowerCase() !== "valide")) {
est_just = ["invalide"]; est_just = ["invalide"];
@ -579,8 +585,9 @@
est_just = ["est_just"]; est_just = ["est_just"];
} else if (justificatifsAprem.some((j) => j.etat.toLowerCase() === "attente")) { } else if (justificatifsAprem.some((j) => j.etat.toLowerCase() === "attente")) {
est_just = ["attente"]; est_just = ["attente"];
} } else if (justificatifsAprem.some((j) => j.etat.toLowerCase() === "modifie")) {
else if (justificatifsAprem.some((j) => j.etat.toLowerCase() !== "valide")) { est_just = ["modifie"];
} else if (justificatifsAprem.some((j) => j.etat.toLowerCase() !== "valide")) {
est_just = ["invalide"]; est_just = ["invalide"];
} }