From bbcd6d7b3378a8aa83af63d1104906db50d63b12 Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Sun, 25 Dec 2022 16:40:05 -0300 Subject: [PATCH] =?UTF-8?q?Formulaire=20jury=20BUT:=20v=C3=A9rifie=20sorti?= =?UTF-8?q?e=20sans=20enregistrement=20(JS)=20#425?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/static/js/jury_but.js | 48 ++++++++++----------------------------- sco_version.py | 2 +- 2 files changed, 13 insertions(+), 37 deletions(-) diff --git a/app/static/js/jury_but.js b/app/static/js/jury_but.js index 1cb3e9e4a..df6d5b9e6 100644 --- a/app/static/js/jury_but.js +++ b/app/static/js/jury_but.js @@ -71,53 +71,29 @@ $(function () { } else { document.querySelector("div.prev").innerHTML = ""; } - if (next_idx != -1) { - let elem = document.querySelector("div.next a"); - if (elem) { - elem.href = elem.href.replace("NEXT", etudids[next_idx]); - elem.innerHTML = noms[next_idx]; - } - } else { - document.querySelector("div.next").innerHTML = ""; - } - } else { - // Supprime les liens de navigation - document.querySelector("div.prev").innerHTML = ""; - document.querySelector("div.next").innerHTML = ""; - } }); // ----- Etat du formulaire jury pour éviter sortie sans enregistrer let FORM_STATE = ""; -let IS_SUBMITTING = false; - // Une chaine décrivant l'état du form function get_form_state() { - let codes = []; - // il n'y a que des + document.querySelectorAll("select").forEach(sel => codes.push(sel.value)); + return codes.join(); } -$("document").ready(function () { - FORM_STATE = get_form_state(); - document - .querySelector("form#jury_but") - .addEventListener("submit", jury_form_submit); +$('document').ready(function () { + FORM_STATE = get_form_state(); }); function is_modified() { - return FORM_STATE != get_form_state(); + return FORM_STATE != get_form_state(); } - -function jury_form_submit(event) { - IS_SUBMITTING = true; -} - window.addEventListener("beforeunload", function (e) { - if (!IS_SUBMITTING && is_modified()) { - var confirmationMessage = "Changements non enregistrés !"; - (e || window.event).returnValue = confirmationMessage; - return confirmationMessage; - } + if (is_modified()) { + var confirmationMessage = 'Changements non enregistrés !'; + (e || window.event).returnValue = confirmationMessage; + return confirmationMessage; + } }); diff --git a/sco_version.py b/sco_version.py index d2690ccd1..b6df7af71 100644 --- a/sco_version.py +++ b/sco_version.py @@ -1,7 +1,7 @@ # -*- mode: python -*- # -*- coding: utf-8 -*- -SCOVERSION = "9.4.7" +SCOVERSION = "9.4.20" SCONAME = "ScoDoc"