From 1796279d8a1f1c75b48a2508c7efd555876081ac Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Wed, 27 Jul 2022 16:11:20 +0200 Subject: [PATCH] partition_editor: routes API --- app/templates/scolar/partition_editor.html | 44 +++++++++++----------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/app/templates/scolar/partition_editor.html b/app/templates/scolar/partition_editor.html index f8aba70d..c27d3994 100644 --- a/app/templates/scolar/partition_editor.html +++ b/app/templates/scolar/partition_editor.html @@ -42,8 +42,8 @@ let params = (new URL(document.location)).searchParams; let formsemestre_id = params.get('formsemestre_id'); - let partitions = await fetchData("/ScoDoc/api/formsemestre/" + formsemestre_id + "/partitions"); - let etudiants = await fetchData("/ScoDoc/api/formsemestre/" + formsemestre_id + "/resultats"); + let partitions = await fetchData("/ScoDoc/{{formsemestre.departement.acronym}}/api/formsemestre/" + formsemestre_id + "/partitions"); + let etudiants = await fetchData("/ScoDoc/{{formsemestre.departement.acronym}}/api/formsemestre/" + formsemestre_id + "/resultats"); etudiants.sort((a, b) => { return a.nom_short.localeCompare(b.nom_short) @@ -86,15 +86,15 @@
${(() => { - let output = ""; - Object.entries(partition.groups).forEach(([idGroupe, titreGroupe]) => { - /***************/ - outputMasques += `
||${titreGroupe.name}✏️❌
`; - /***************/ - output += templateGroupe_zoneGroupes(idGroupe, titreGroupe.name); - }) - return output; - })()} + let output = ""; + Object.entries(partition.groups).forEach(([idGroupe, titreGroupe]) => { + /***************/ + outputMasques += `
||${titreGroupe.name}✏️❌
`; + /***************/ + output += templateGroupe_zoneGroupes(idGroupe, titreGroupe.name); + }) + return output; + })()} `; outputMasques += `
+
@@ -289,9 +289,9 @@ /* Save */ this.classList.add("saving"); if (idGroupe == "aucun") { - var url = `/ScoDoc/api/partition/${idPartition}/remove_etudiant/${etudid}`; + var url = `/ScoDoc/{{formsemestre.departement.acronym}}/api/partition/${idPartition}/remove_etudiant/${etudid}`; } else { - var url = `/ScoDoc/api/group/${idGroupe}/set_etudiant/${etudid}` + var url = `/ScoDoc/{{formsemestre.departement.acronym}}/api/group/${idGroupe}/set_etudiant/${etudid}` } fetch(url, { method: "POST" }) .then(r => { return r.json() }) @@ -320,12 +320,12 @@ var name = "Nouvelle " + date.getSeconds(); let params = (new URL(document.location)).searchParams; let formsemestre_id = params.get('formsemestre_id'); - var url = "/ScoDoc/api/formsemestre/" + formsemestre_id + "/partition/create"; + var url = "/ScoDoc/{{formsemestre.departement.acronym}}/api/formsemestre/" + formsemestre_id + "/partition/create"; var payload = { partition_name: name }; } else { // Groupe var name = "Nouveau " + date.getSeconds(); - var url = `/ScoDoc/api/partition/${this.parentElement.dataset.idpartition}/group/create`; + var url = `/ScoDoc/{{formsemestre.departement.acronym}}/api/partition/${this.parentElement.dataset.idpartition}/group/create`; var payload = { group_name: name }; } var div = document.createElement("div"); @@ -382,7 +382,7 @@ let etudiant = { etudid: etudid, nom_disp: e.previousElementSibling.dataset.nom, - prenom:e.previousElementSibling.dataset.prenom + prenom: e.previousElementSibling.dataset.prenom } outputGroupes += templateEtudiant_zoneGroupes(etudiant); //////////////////////// @@ -463,14 +463,14 @@ // Save if (obj.parentElement.dataset.idpartition) { - var url = `/ScoDoc/api/partition/${obj.parentElement.dataset.idpartition}/edit`; + var url = `/ScoDoc/{{formsemestre.departement.acronym}}/api/partition/${obj.parentElement.dataset.idpartition}/edit`; var payload = { partition_name: obj.innerText } document.querySelector(`.masques [data-idpartition="${obj.parentElement.dataset.idpartition}"][data-idgroupe="aucun"]`).innerText = "Non affectés - " + obj.innerText; document.querySelectorAll(`#zoneChoix .etudiants [data-idpartition="${obj.parentElement.dataset.idpartition}"]>div`).forEach(e => { e.innerText = obj.innerText }); document.querySelector(`#zoneGroupes [data-idpartition="${obj.parentElement.dataset.idpartition}"]>h3`).innerText = obj.innerText; } else { - var url = `/ScoDoc/api/group/${obj.parentElement.dataset.idgroupe}/edit`; + var url = `/ScoDoc/{{formsemestre.departement.acronym}}/api/group/${obj.parentElement.dataset.idgroupe}/edit`; var payload = { group_name: obj.innerText } document.querySelectorAll(`#zoneChoix .etudiants [value="${obj.parentElement.dataset.idgroupe}"]+span`).forEach(e => { e.innerText = obj.innerText }); @@ -527,7 +527,7 @@ /* Suppression des éléments dans la page */ if (this.dataset.idpartition) { document.querySelectorAll(`[data-idpartition="${this.dataset.idpartition}"]`).forEach(e => { e.remove() }) - var url = "/ScoDoc/api/partition/" + this.dataset.idpartition + "/delete"; + var url = "/ScoDoc/{{formsemestre.departement.acronym}}/api/partition/" + this.dataset.idpartition + "/delete"; } else { document.querySelectorAll(`[value="${this.dataset.idgroupe}"]`).forEach(e => { if (e.checked == true) { @@ -536,7 +536,7 @@ e.parentElement.remove() }) document.querySelectorAll(`[data-idgroupe="${this.dataset.idgroupe}"]`).forEach(e => { e.remove() }) - var url = "/ScoDoc/api/group/" + this.dataset.idgroupe + "/delete"; + var url = "/ScoDoc/{{formsemestre.departement.acronym}}/api/group/" + this.dataset.idgroupe + "/delete"; } //Save @@ -601,7 +601,7 @@ if (this.dataset.idpartition) { let params = (new URL(document.location)).searchParams; let formsemestre_id = params.get('formsemestre_id'); - var url = `/ScoDoc/api/formsemestre/${formsemestre_id}/partitions/order`; + var url = `/ScoDoc/{{formsemestre.departement.acronym}}/api/formsemestre/${formsemestre_id}/partitions/order`; document.querySelectorAll(`#zoneChoix .masques>div`).forEach(parent => { positions.forEach(position => { @@ -619,7 +619,7 @@ }) }) } else { - var url = `/ScoDoc/api/partition/${this.parentElement.dataset.idpartition}/groups/order`; + var url = `/ScoDoc/{{formsemestre.departement.acronym}}/api/partition/${this.parentElement.dataset.idpartition}/groups/order`; document.querySelectorAll(`#zoneChoix .etudiants .partition[data-idpartition="${this.parentElement.dataset.idpartition}"]`).forEach(partition => { positions.forEach(position => {