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 +11 -5
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 70e7355fa2 - Show all commits

8
app/api/assiduites.py
View File

@ -873,7 +873,13 @@ def _edit_singular(assiduite_unique, data):
else: else:
force = scu.is_assiduites_module_forced(dept_id=etud.dept_id) 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( errors.append(
"param 'moduleimpl_id' : le moduleimpl_id ne peut pas être nul" "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 * @returns {Date} la date sélectionnée
*/ */
function getDate() { function getDate() {
const date = new Date( const date = new Date(document.querySelector("#tl_date").value);
document.querySelector("#tl_date").getAttribute("value")
);
date.setHours(0, 0, 0, 0); date.setHours(0, 0, 0, 0);
return date; return date;
} }
@ -1804,7 +1802,9 @@ function getModuleImpl(assiduite) {
assiduite.external_data != null && assiduite.external_data != null &&
assiduite.external_data.hasOwnProperty("module") assiduite.external_data.hasOwnProperty("module")
) { ) {
return assiduite.external_data.module; return assiduite.external_data.module == "Autre"
? "Tout module"
: assiduite.external_data.module;
} else { } else {
return "Pas de module"; return "Pas de module";
} }