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 +22 -13
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 295fb679ed - Show all commits

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

@ -191,8 +191,9 @@ function sync_get(path, success, errors) {
*/ */
async function async_get(path, success, errors) { async function async_get(path, success, errors) {
console.log("async_get " + path); console.log("async_get " + path);
let response;
try { try {
const response = await fetch(path); response = await fetch(path);
if (response.ok) { if (response.ok) {
const data = await response.json(); const data = await response.json();
success(data); success(data);
@ -203,6 +204,8 @@ async function async_get(path, success, errors) {
console.error(error); console.error(error);
if (errors) errors(error); if (errors) errors(error);
} }
return response;
} }
/** /**
@ -233,8 +236,9 @@ function sync_post(path, data, success, errors) {
*/ */
async function async_post(path, data, success, errors) { async function async_post(path, data, success, errors) {
console.log("async_post " + path); console.log("async_post " + path);
let response;
try { try {
const response = await fetch(path, { response = await fetch(path, {
method: "POST", method: "POST",
headers: { headers: {
"Content-Type": "application/json", "Content-Type": "application/json",
@ -252,6 +256,8 @@ async function async_post(path, data, success, errors) {
console.error(error); console.error(error);
if (errors) errors(error); if (errors) errors(error);
} }
return response;
} }
// <<== Gestion des actions de masse ==>> // <<== Gestion des actions de masse ==>>

25
app/templates/assiduites/widgets/differee.j2
View File

@ -954,24 +954,27 @@
editList.push(edit); editList.push(edit);
}) })
const values = { "create": {}, "edit": {} };
$.when( Promise.all(
asyncCreateAssiduiteGroup(createList, (data) => { [asyncCreateAssiduiteGroup(createList, (data) => {
values.create = data;
}), }),
asyncEditAssiduiteGroup(editList, (data) => { asyncEditAssiduiteGroup(editList, (data) => {
values.edit = data;
}) })]
).done((c, e) => { ).then(() => {
const c = values.create;
const e = values.edit;
let error; let error;
Object.keys(c[0].success).forEach((k) => { Object.keys(c.success).forEach((k) => {
const assiduite = createList[Number.parseInt(k)]; const assiduite = createList[Number.parseInt(k)];
assiduite["assiduite_id"] = c[0].success[k].message.assiduite_id; assiduite["assiduite_id"] = c.success[k].message.assiduite_id;
assiduites[assiduite.etudid].push(assiduite); assiduites[assiduite.etudid].push(assiduite);
}) })
if (c[0].errors.length > 0) { if (c.errors.length > 0) {
error = c[0].errors[Object.keys(c[0].errors)[0]]; error = c.errors[Object.keys(c.errors)[0]];
if (error.message.indexOf("Module") != -1) { if (error.message.indexOf("Module") != -1) {
const html = ` const html = `
<h3>Aucun module n'a été spécifié (préférence du semestre concerné)</h3> <h3>Aucun module n'a été spécifié (préférence du semestre concerné)</h3>
@ -982,7 +985,7 @@
toCreate.length = 0 toCreate.length = 0
} }
} }
Object.keys(e[0].success).forEach((k) => { Object.keys(e.success).forEach((k) => {
const { etudid, assiduite_id, moduleimpl_id, etat } = editList[Number.parseInt(k)] const { etudid, assiduite_id, moduleimpl_id, etat } = editList[Number.parseInt(k)]
assiduites[etudid].map((a) => { assiduites[etudid].map((a) => {
if (a.assiduite_id == assiduite_id) { if (a.assiduite_id == assiduite_id) {