Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
SCODOC_R6A06
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Paul Milleville
SCODOC_R6A06
Commits
60998d2e
Commit
60998d2e
authored
1 year ago
by
Emmanuel Viennet
Browse files
Options
Downloads
Patches
Plain Diff
Assiduite: bg bouton delete + dialog confirm
parent
6834c190
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
app/static/css/assiduites.css
+6
-4
6 additions, 4 deletions
app/static/css/assiduites.css
app/static/js/assiduites.js
+10
-3
10 additions, 3 deletions
app/static/js/assiduites.js
app/templates/assiduites/pages/bilan_dept.j2
+1
-1
1 addition, 1 deletion
app/templates/assiduites/pages/bilan_dept.j2
with
17 additions
and
8 deletions
app/static/css/assiduites.css
+
6
−
4
View file @
60998d2e
...
...
@@ -302,7 +302,6 @@
.rbtn
{
-webkit-appearance
:
none
;
appearance
:
none
;
cursor
:
pointer
;
}
...
...
@@ -327,9 +326,12 @@
background-image
:
url
(..
/
icons
/
absent
.
svg
);
}
.rbtn.aucun
::before
{
background-image
:
url
(..
/
icons
/
delete
.
svg
);
background-color
:
var
(
--color-defaut-dark
);
.rbtn.aucun
{
background-image
:
url
(
"../icons/delete.svg"
);
background-size
:
calc
(
100%
-
8px
)
calc
(
100%
-
8px
);
/* Adjust size to create "margin" */
background-position
:
center
;
background-repeat
:
no-repeat
;
}
.rbtn.retard
::before
{
...
...
This diff is collapsed.
Click to expand it.
app/static/js/assiduites.js
+
10
−
3
View file @
60998d2e
...
...
@@ -53,7 +53,7 @@ async function async_get(path, success, errors) {
* @param {CallableFunction} errors fonction à effectuer en cas d'échec
*/
async
function
async_post
(
path
,
data
,
success
,
errors
)
{
console
.
log
(
"
async_post
"
+
path
);
//
console.log("async_post " + path);
let
response
;
try
{
response
=
await
fetch
(
path
,
{
...
...
@@ -643,6 +643,9 @@ function mettreToutLeMonde(etat, el = null) {
// Suppression des assiduités
if
(
etat
==
"
vide
"
)
{
if
(
!
confirm
(
"
Effacer tout les évènements correspondant à cette plage ?
"
))
{
return
;
// annulation
}
const
assiduites_id
=
lignesEtuds
.
filter
((
e
)
=>
e
.
getAttribute
(
"
type
"
)
==
"
edition
"
)
.
map
((
e
)
=>
Number
(
e
.
getAttribute
(
"
assiduite_id
"
)));
...
...
@@ -759,6 +762,7 @@ function envoiToastEtudiant(etat, etud) {
pushToast
(
generateToast
(
span
,
getToastColorFromEtat
(
etat
.
toUpperCase
()),
5
));
}
// TODO commenter toutes les fonctions js
function
envoiToastTous
(
etat
,
count
)
{
const
span
=
document
.
createElement
(
"
span
"
);
let
etatAffiche
=
etat
;
...
...
@@ -817,9 +821,12 @@ function dateCouranteEstTravaillee() {
if
(
!
estJourTravail
(
date
,
nonWorkDays
))
{
const
nouvelleDate
=
retourJourTravail
(
date
);
$
(
"
#date
"
).
datepicker
(
"
setDate
"
,
nouvelleDate
);
let
msg
=
"
Le jour sélectionné
"
;
if
((
new
Date
()).
format
(
"
YYYY-MM-DD
"
)
==
date
.
format
(
"
YYYY-MM-DD
"
))
{
msg
=
"
Aujourd'hui
"
;
}
const
att
=
document
.
createTextNode
(
`
Le jour sélectionné
(
${
Date
.
toFRA
(
`
${
msg
}
(
${
Date
.
toFRA
(
date
.
format
(
"
YYYY-MM-DD
"
)
)}
) n'est pas un jour travaillé.`
);
...
...
This diff is collapsed.
Click to expand it.
app/templates/assiduites/pages/bilan_dept.j2
+
1
−
1
View file @
60998d2e
...
...
@@ -12,7 +12,7 @@
<h1>Traitement de l'assiduité</h1>
<p class="help">
Pour saisir l'assiduité ou consulter les états,
il est recommandé de
passer par
Pour saisir l'assiduité ou consulter les états, passer par
le semestre concerné (saisie par jour ou saisie différée).
</p>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment