From 9bd05ea2412a96edf750e35ea95ca72af6290d19 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Wed, 10 Apr 2024 18:40:32 +0200 Subject: [PATCH] Modify SCO_URL in all js: no trailing slash. --- app/static/js/edit_partition_form.js | 2 +- app/static/js/edit_ue.js | 2 +- app/static/js/etud_debouche.js | 10 +++++----- app/static/js/etud_info.js | 2 +- app/static/js/groupmgr.js | 6 +++--- app/static/js/groups_view.js | 4 ++-- app/static/js/radar_bulletin.js | 2 +- app/static/js/saisie_notes.js | 2 +- app/static/js/scodoc.js | 2 +- app/static/js/trombino.js | 2 +- app/static/js/validate_previous_ue.js | 4 ++-- .../assiduites/pages/calendrier_assi_etud.j2 | 4 ++-- app/templates/base.j2 | 2 +- app/templates/formsemestre/edt.j2 | 2 +- app/templates/jury/jury_delete_manual.j2 | 16 ++++++++-------- app/templates/sco_page.j2 | 2 +- 16 files changed, 32 insertions(+), 32 deletions(-) diff --git a/app/static/js/edit_partition_form.js b/app/static/js/edit_partition_form.js index c92090177..de0485439 100644 --- a/app/static/js/edit_partition_form.js +++ b/app/static/js/edit_partition_form.js @@ -1,6 +1,6 @@ function _partition_set_attr(partition_id, attr_name, attr_value) { $.post( - SCO_URL + "/partition_set_attr", + SCO_URL + "partition_set_attr", { partition_id: partition_id, attr: attr_name, diff --git a/app/static/js/edit_ue.js b/app/static/js/edit_ue.js index ef4dc60c9..18fe600fa 100644 --- a/app/static/js/edit_ue.js +++ b/app/static/js/edit_ue.js @@ -33,7 +33,7 @@ function update_ue_list() { let ue_code = $("#tf_ue_code")[0].value; let query = SCO_URL + - "/Notes/ue_sharing_code?ue_code=" + + "Notes/ue_sharing_code?ue_code=" + ue_code + "&hide_ue_id=" + ue_id + diff --git a/app/static/js/etud_debouche.js b/app/static/js/etud_debouche.js index d24a2b8da..e5a8f6510 100644 --- a/app/static/js/etud_debouche.js +++ b/app/static/js/etud_debouche.js @@ -16,7 +16,7 @@ function display_itemsuivis(active) { .off("click") .click(function (e) { e.preventDefault(); - $.post(SCO_URL + "/itemsuivi_create", { + $.post(SCO_URL + "itemsuivi_create", { etudid: etudid, fmt: "json", }).done(item_insert_new); @@ -26,7 +26,7 @@ function display_itemsuivis(active) { } // add existing items $.get( - SCO_URL + "/itemsuivi_list_etud", + SCO_URL + "itemsuivi_list_etud", { etudid: etudid, fmt: "json" }, function (L) { for (var i in L) { @@ -95,7 +95,7 @@ function item_nodes(itemsuivi_id, item_date, situation, tags, readonly) { dp.blur(function (e) { var date = this.value; // console.log('selected text: ' + date); - $.post(SCO_URL + "/itemsuivi_set_date", { + $.post(SCO_URL + "itemsuivi_set_date", { item_date: date, itemsuivi_id: itemsuivi_id, }); @@ -103,7 +103,7 @@ function item_nodes(itemsuivi_id, item_date, situation, tags, readonly) { dp.datepicker({ onSelect: function (date, instance) { // console.log('selected: ' + date + 'for itemsuivi_id ' + itemsuivi_id); - $.post(SCO_URL + "/itemsuivi_set_date", { + $.post(SCO_URL + "itemsuivi_set_date", { item_date: date, itemsuivi_id: itemsuivi_id, }); @@ -161,7 +161,7 @@ function Date2DMY(date) { } function itemsuivi_suppress(itemsuivi_id) { - $.post(SCO_URL + "/itemsuivi_suppress", { itemsuivi_id: itemsuivi_id }); + $.post(SCO_URL + "itemsuivi_suppress", { itemsuivi_id: itemsuivi_id }); // Clear items and rebuild: $("ul.listdebouches li.itemsuivi").remove(); display_itemsuivis(0); diff --git a/app/static/js/etud_info.js b/app/static/js/etud_info.js index ef04d0c12..98363e515 100644 --- a/app/static/js/etud_info.js +++ b/app/static/js/etud_info.js @@ -37,7 +37,7 @@ $().ready(function () { ajax: { url: SCO_URL + - "/etud_info_html?etudid=" + + "etud_info_html?etudid=" + get_etudid_from_elem(elems[i]) + qs, type: "GET", diff --git a/app/static/js/groupmgr.js b/app/static/js/groupmgr.js index 659027648..22ac7116a 100644 --- a/app/static/js/groupmgr.js +++ b/app/static/js/groupmgr.js @@ -19,7 +19,7 @@ function loadGroupes() { $("#gmsg")[0].style.display = "block"; var partition_id = document.formGroup.partition_id.value; - $.get(SCO_URL + "/XMLgetGroupsInPartition", { + $.get(SCO_URL + "XMLgetGroupsInPartition", { partition_id: partition_id, }).done(function (data) { var nodes = data.getElementsByTagName("group"); @@ -384,7 +384,7 @@ function handleError(msg) { } function submitGroups() { - var url = SCO_URL + "/setGroups"; + var url = SCO_URL + "setGroups"; // build post request body: groupname \n etudid; ... var groupsLists = ""; var groupsToCreate = ""; @@ -443,7 +443,7 @@ function GotoAnother() { } else document.location = SCO_URL + - "/affect_groups?partition_id=" + + "affect_groups?partition_id=" + document.formGroup.other_partition_id.value; } diff --git a/app/static/js/groups_view.js b/app/static/js/groups_view.js index e555a9eb7..7be2509fa 100644 --- a/app/static/js/groups_view.js +++ b/app/static/js/groups_view.js @@ -5,7 +5,7 @@ $().ready(function () { for (var i = 0; i < spans.length; i++) { var sp = spans[i]; var etudid = sp.id; - $(sp).load(SCO_URL + "/etud_photo_html?etudid=" + etudid); + $(sp).load(SCO_URL + "etud_photo_html?etudid=" + etudid); } }); @@ -194,7 +194,7 @@ $().ready(function () { ajax: { url: SCO_URL + - "/etud_info_html?with_photo=0&etudid=" + + "etud_info_html?with_photo=0&etudid=" + get_etudid_from_elem(elems[i]), }, text: "Loading...", diff --git a/app/static/js/radar_bulletin.js b/app/static/js/radar_bulletin.js index 533b3bf59..91c541478 100644 --- a/app/static/js/radar_bulletin.js +++ b/app/static/js/radar_bulletin.js @@ -34,7 +34,7 @@ function get_notes_and_draw(formsemestre_id, etudid) { */ var query = SCO_URL + - "/Notes/formsemestre_bulletinetud?formsemestre_id=" + + "Notes/formsemestre_bulletinetud?formsemestre_id=" + formsemestre_id + "&etudid=" + etudid + diff --git a/app/static/js/saisie_notes.js b/app/static/js/saisie_notes.js index 0f62b0ae1..3382f0d04 100644 --- a/app/static/js/saisie_notes.js +++ b/app/static/js/saisie_notes.js @@ -42,7 +42,7 @@ async function save_note(elem, v, etudid) { $("#sco_msg").html("en cours...").show(); try { const response = await fetch( - SCO_URL + "/../api/evaluation/" + evaluation_id + "/notes/set", + SCO_URL + "../api/evaluation/" + evaluation_id + "/notes/set", { method: "POST", headers: { diff --git a/app/static/js/scodoc.js b/app/static/js/scodoc.js index bb3aafbf8..cdcfffeb4 100644 --- a/app/static/js/scodoc.js +++ b/app/static/js/scodoc.js @@ -6,7 +6,7 @@ $(function () { delay: 300, // wait 300ms before suggestions minLength: 2, // min nb of chars before suggest position: { collision: "flip" }, // automatic menu position up/down - source: SCO_URL + "/search_etud_by_name", + source: SCO_URL + "search_etud_by_name", select: function (event, ui) { $(".in-expnom").val(ui.item.value); $("#form-chercheetud").submit(); diff --git a/app/static/js/trombino.js b/app/static/js/trombino.js index f6bf989db..a410fc271 100644 --- a/app/static/js/trombino.js +++ b/app/static/js/trombino.js @@ -5,6 +5,6 @@ $().ready(function () { for (var i = 0; i < spans.size(); i++) { var sp = spans[i]; var etudid = sp.id; - $(sp).load(SCO_URL + "/etud_photo_html?etudid=" + etudid); + $(sp).load(SCO_URL + "etud_photo_html?etudid=" + etudid); } }); diff --git a/app/static/js/validate_previous_ue.js b/app/static/js/validate_previous_ue.js index c2fe3c888..3aa112f6b 100644 --- a/app/static/js/validate_previous_ue.js +++ b/app/static/js/validate_previous_ue.js @@ -22,7 +22,7 @@ document.addEventListener("DOMContentLoaded", () => { async function delete_validation(etudid, validation_type, validation_id) { const response = await fetch( - `${SCO_URL}/../api/etudiant/${etudid}/jury/${validation_type}/${validation_id}/delete`, + `${SCO_URL}../api/etudiant/${etudid}/jury/${validation_type}/${validation_id}/delete`, { method: "POST", } @@ -38,7 +38,7 @@ async function delete_validation(etudid, validation_type, validation_id) { function update_ue_list() { var ue_id = $("#tf_ue_id")[0].value; if (ue_id) { - var query = SCO_URL + "/Notes/ue_sharing_code?ue_id=" + ue_id; + var query = SCO_URL + "Notes/ue_sharing_code?ue_id=" + ue_id; $.get(query, "", function (data) { $("#ue_list_code").html(data); }); diff --git a/app/templates/assiduites/pages/calendrier_assi_etud.j2 b/app/templates/assiduites/pages/calendrier_assi_etud.j2 index 8fb637895..99fa059b2 100644 --- a/app/templates/assiduites/pages/calendrier_assi_etud.j2 +++ b/app/templates/assiduites/pages/calendrier_assi_etud.j2 @@ -149,7 +149,7 @@ Calendrier de l'assiduité list-style-type: none; } - + .pageContent { margin-top: 1vh; @@ -335,7 +335,7 @@ Calendrier de l'assiduité document.querySelectorAll('[assi_id]').forEach((el, i) => { el.addEventListener('click', () => { const assi_id = el.getAttribute('assi_id'); - window.open(`${SCO_URL}/Assiduites/tableau_assiduite_actions?type=assiduite&action=details&obj_id=${assi_id}`); + window.open(`${SCO_URL}Assiduites/tableau_assiduite_actions?type=assiduite&action=details&obj_id=${assi_id}`); }) }); diff --git a/app/templates/base.j2 b/app/templates/base.j2 index a75325e52..c936da1ed 100644 --- a/app/templates/base.j2 +++ b/app/templates/base.j2 @@ -102,6 +102,6 @@ {% endblock %} \ No newline at end of file diff --git a/app/templates/formsemestre/edt.j2 b/app/templates/formsemestre/edt.j2 index b0a77f738..bdb657d4e 100644 --- a/app/templates/formsemestre/edt.j2 +++ b/app/templates/formsemestre/edt.j2 @@ -152,7 +152,7 @@ document.addEventListener('DOMContentLoaded', function() { calendar = new Calendar(container, options); - fetch(`${SCO_URL}/../api/formsemestre/{{formsemestre.id}}/edt?{{groups_query_args|safe}}&show_modules_titles={{show_modules_titles}}`) + fetch(`${SCO_URL}../api/formsemestre/{{formsemestre.id}}/edt?{{groups_query_args|safe}}&show_modules_titles={{show_modules_titles}}`) .then(r=>{return r.json()}) .then(events=>{ if (typeof events == 'string') { diff --git a/app/templates/jury/jury_delete_manual.j2 b/app/templates/jury/jury_delete_manual.j2 index 6e993e216..3c53faed1 100644 --- a/app/templates/jury/jury_delete_manual.j2 +++ b/app/templates/jury/jury_delete_manual.j2 @@ -17,8 +17,8 @@ et permet de les effacer une par une.

Attention, il vous appartient de vérifier la cohérence du résultat ! En principe, l'usage de cette page devrait rester exceptionnel. -Aucune annulation n'est ici possible (vous devrez re-saisir les décisions via les -pages de saisie de jury habituelles). +Aucune annulation n'est ici possible (vous devrez re-saisir les décisions via les +pages de saisie de jury habituelles).

{% if sem_vals.first() %}
@@ -27,7 +27,7 @@ pages de saisie de jury habituelles). {% for v in sem_vals %}
  • {{v.html()|safe}}
    -
    • @@ -101,8 +101,8 @@ pages de saisie de jury habituelles). {% endif %} {% if not( - sem_vals.first() or ue_vals.first() or rcue_vals.first() - or annee_but_vals.first() or autorisations.first()) + sem_vals.first() or ue_vals.first() or rcue_vals.first() + or annee_but_vals.first() or autorisations.first()) %}

    aucune décision enregistrée

    @@ -123,7 +123,7 @@ pages de saisie de jury habituelles). {% endblock %}