jmplace
/
ScoDoc-Lille
forked from ScoDoc/ScoDoc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'main96' of https://scodoc.org/git/iziram/ScoDoc

This commit is contained in:
Emmanuel Viennet 2023-11-20 21:00:58 +01:00
parent 77388e2d87 7672c3e3c5
commit 30934f72b4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/templates/assiduites/widgets/conflict.j2
View File

@ -270,14 +270,14 @@
) { ) {
const assiduite_avant = { const assiduite_avant = {
etat: this.selectedAssiduite.etat, etat: this.selectedAssiduite.etat,
date_debut: assiduite_debut.toFakeIso()(), date_debut: assiduite_debut.toFakeIso(),
date_fin: separtorDate.toFakeIso()(), date_fin: separtorDate.toFakeIso(),
}; };
const assiduite_apres = { const assiduite_apres = {
etat: this.selectedAssiduite.etat, etat: this.selectedAssiduite.etat,
date_debut: separtorDate.toFakeIso()(), date_debut: separtorDate.toFakeIso(),
date_fin: assiduite_fin.toFakeIso()(), date_fin: assiduite_fin.toFakeIso(),
}; };
if (this.selectedAssiduite.moduleimpl_id) { if (this.selectedAssiduite.moduleimpl_id) {