cleo/ScoDoc-PE
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

Assiduite : fix date saisie + edit assiduite

Browse Source
This commit is contained in:
Iziram 2023-10-27 10:33:37 +02:00
parent d5149f75db
commit 70e7355fa2
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/api/assiduites.py
View File

@ -873,7 +873,13 @@ def _edit_singular(assiduite_unique, data):
else:
force = scu.is_assiduites_module_forced(dept_id=etud.dept_id)
if force:
external_data = (
external_data
if external_data is not None and isinstance(external_data, dict)
else assiduite_unique.external_data
)
if force and not external_data.get("module", False):
errors.append(
"param 'moduleimpl_id' : le moduleimpl_id ne peut pas être nul"
)

8
app/static/js/assiduites.js
View File

@ -755,9 +755,7 @@ function isConflictSameAsPeriod(conflict, period = undefined) {
* @returns {Date} la date sélectionnée
*/
function getDate() {
const date = new Date(
document.querySelector("#tl_date").getAttribute("value")
);
const date = new Date(document.querySelector("#tl_date").value);
date.setHours(0, 0, 0, 0);
return date;
}
@ -1804,7 +1802,9 @@ function getModuleImpl(assiduite) {
assiduite.external_data != null &&
assiduite.external_data.hasOwnProperty("module")
) {
return assiduite.external_data.module;
return assiduite.external_data.module == "Autre"
? "Tout module"
: assiduite.external_data.module;
} else {
return "Pas de module";
}