diff --git a/app/scodoc/sco_saisie_notes.py b/app/scodoc/sco_saisie_notes.py index 7ea4b735..4583adce 100644 --- a/app/scodoc/sco_saisie_notes.py +++ b/app/scodoc/sco_saisie_notes.py @@ -1049,7 +1049,19 @@ def saisie_notes(evaluation_id, group_ids=[]): alone=True, ) ) - H.append("""""") + H.append("""""") + H.append("""""") # Le formulaire de saisie des notes: destination = url_for( diff --git a/app/static/js/saisie_notes.js b/app/static/js/saisie_notes.js index 747d09fe..4dc782c9 100644 --- a/app/static/js/saisie_notes.js +++ b/app/static/js/saisie_notes.js @@ -5,6 +5,7 @@ $().ready(function () { $("#formnotes .note").bind("blur", valid_note); $("#formnotes input").bind("paste", paste_text); + $(".btn_masquer_DEM").bind("click", masquer_DEM); }); @@ -92,6 +93,7 @@ function paste_text(e) { var data = clipb.getData('Text'); var list = data.split(/\r\n|\r|\n|\t| /g); var currentInput = event.currentTarget; + var masquerDEM = document.querySelector("body").classList.contains("masquer_DEM"); for (var i = 0; i < list.length; i++) { currentInput.value = list[i]; @@ -99,7 +101,15 @@ function paste_text(e) { evt.initEvent("blur", false, true); currentInput.dispatchEvent(evt); var sibbling = currentInput.parentElement.parentElement.nextElementSibling; - while (sibbling && sibbling.style.display == "none") { + while ( + sibbling && + ( + sibbling.style.display == "none" || + ( + masquerDEM && sibbling.classList.contains("etud_dem") + ) + ) + ) { sibbling = sibbling.nextElementSibling; } if (sibbling) { @@ -112,3 +122,7 @@ function paste_text(e) { } } } + +function masquer_DEM(){ + document.querySelector("body").classList.toggle("masquer_DEM"); +}