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 +16 -4
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 54906c1bde - Show all commits

6
app/static/css/assiduites.css
View File

@ -1,15 +1,17 @@
:root { :root {
--color-present: #6bdb83; --color-present: #6bdb83;
--color-absent: #e62a11; --color-absent: #e62a11;
--color-absent-clair: #F25D4A;
--color-retard: #f0c865; --color-retard: #f0c865;
--color-justi: #7059FF; --color-justi: #7059FF;
--color-justi-clair: #6885E3;
--color-justi-invalide: #a84476; --color-justi-invalide: #a84476;
--color-nonwork: #badfff; --color-nonwork: #badfff;
--color-absent-justi: #e65ab7; --color-absent-justi: #e65ab7;
--color-retard-justi: #ffef7a; --color-retard-justi: #ffef7a;
--color-error: #FF0000; --color-error: #e62a11;
--color-warning: #eec660; --color-warning: #eec660;
--color-information: #658ef0; --color-information: #658ef0;
@ -21,7 +23,7 @@
--color-defaut: #FFF; --color-defaut: #FFF;
--color-defaut-dark: #444; --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); --motif-justi: repeating-linear-gradient(135deg, transparent, transparent 4px, var(--color-justi) 4px, var(--color-justi) 8px);

1
app/templates/assiduites/widgets/tableau_assi.j2
View File

@ -88,6 +88,7 @@
td.textContent = getModuleImpl(assiduite); td.textContent = getModuleImpl(assiduite);
} else if (k.indexOf('est_just') != -1) { } else if (k.indexOf('est_just') != -1) {
td.textContent = assiduite[k] ? "Oui" : "Non" td.textContent = assiduite[k] ? "Oui" : "Non"
if (assiduite[k]) row.classList.add("est_just")
} else if (k.indexOf('etudid') != -1) { } else if (k.indexOf('etudid') != -1) {
const e = getEtudiant(assiduite.etudid); const e = getEtudiant(assiduite.etudid);

13
app/templates/assiduites/widgets/tableau_base.j2
View File

@ -456,6 +456,7 @@
td { td {
border: 1px solid #dddddd; border: 1px solid #dddddd;
padding: 8px; padding: 8px;
color: var(--color-default-text);
} }
th { th {
@ -498,17 +499,25 @@
.l-absent, .l-absent,
.l-invalid { .l-invalid {
background-color: var(--color-absent); background-color: var(--color-absent-clair);
} }
.l-valid { .l-valid {
background-color: var(--color-primary); background-color: var(--color-justi-clair);
} }
.l-retard { .l-retard {
background-color: var(--color-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 */ /* Ajoutez des styles pour le conteneur de pagination et les boutons */
.pagination-container { .pagination-container {
display: flex; display: flex;