From 58ab0d4c8a33919740a35d1223f31c12d783f599 Mon Sep 17 00:00:00 2001 From: rstular Date: Mon, 1 Jun 2020 20:14:59 +0200 Subject: gsec bug fix - regex may return null --- assets/js/gsec.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'assets/js') diff --git a/assets/js/gsec.js b/assets/js/gsec.js index 19e190f..5632949 100644 --- a/assets/js/gsec.js +++ b/assets/js/gsec.js @@ -273,8 +273,10 @@ class gsec { } rowSpan.remove(); // magic - var subject = SUBJECT_REGEX.exec(subFields[1].innerHTML)[1].trim(); - var desc = DESC_REGEX.exec(subFields[1].innerHTML)[1]; + var subject = SUBJECT_REGEX.exec(subFields[1].innerHTML) + subject = subject == null ? "" : subject[1].trim(); + var desc = DESC_REGEX.exec(subFields[1].innerHTML); + desc = desc == null ? "" : desc[1]; gradings.push({ "date": dateObj, @@ -529,7 +531,7 @@ class gsec { "__EVENTARGUMENT": "Select$" + selectId }; - this.postback(GSE_URL+"Page_Gim/Uporabnik/Sporocila.aspx", dataToBeSent, null, true).then((response) => { + this.postback(GSE_URL + "Page_Gim/Uporabnik/Sporocila.aspx", dataToBeSent, null, true).then((response) => { let parser = new DOMParser(); let parsed = parser.parseFromString(response.data, "text/html"); let subject = parsed.getElementsByClassName("msgSubjectS")[0].innerHTML.trim(); -- cgit v1.2.3 From 4c43b6c615e18ec3f59c9b886775e6603a0f119f Mon Sep 17 00:00:00 2001 From: rstular Date: Mon, 1 Jun 2020 20:27:31 +0200 Subject: gsec bug fix (subject must not be null), UI fix --- assets/js/gradings.js | 18 ++++++++++++++---- assets/js/gsec.js | 13 +++++++++---- 2 files changed, 23 insertions(+), 8 deletions(-) (limited to 'assets/js') diff --git a/assets/js/gradings.js b/assets/js/gradings.js index b5bf7b5..a852337 100644 --- a/assets/js/gradings.js +++ b/assets/js/gradings.js @@ -143,7 +143,7 @@ function gradingClickHandler(eventClickInfo) { const modal = document.querySelectorAll(".side-modal")[0]; M.Sidenav.getInstance(modal).open(); } -/* + function setupPickers() { // Setup pickers, todo (adding an event), to be stored in messages var date_object = new Date(); @@ -155,10 +155,9 @@ function gradingClickHandler(eventClickInfo) { setDefaultDate: true, firstDay: 1 } - let instances = M.Datepicker.init(elems, options); instances = M.Datepicker.init(elems, options); } -*/ + document.addEventListener("DOMContentLoaded", () => { checkLogin(); @@ -175,7 +174,18 @@ document.addEventListener("DOMContentLoaded", () => { height: "parent" }); calendar_obj.render(); - // setupPickers(); // todo (adding an event), to be stored in messages + + // Modal for adding gradings + setupPickers(); // todo (adding an event), to be stored in messages + // Setup modals + const modal_elems = document.querySelectorAll('.modal'); + const modal_options = { + onOpenStart: () => { $("#fab-new").hide() }, + onCloseEnd: () => { $("#fab-new").show() }, + dismissible: false + }; + M.Modal.init(modal_elems, modal_options); + loadGradings(true); // Setup refresh handler $("#refresh-icon").click(() => { diff --git a/assets/js/gsec.js b/assets/js/gsec.js index 5632949..96ea624 100644 --- a/assets/js/gsec.js +++ b/assets/js/gsec.js @@ -273,8 +273,13 @@ class gsec { } rowSpan.remove(); // magic - var subject = SUBJECT_REGEX.exec(subFields[1].innerHTML) - subject = subject == null ? "" : subject[1].trim(); + + var subject = SUBJECT_REGEX.exec(subFields[1].innerHTML); + if (subject == null) { + continue; + } + subject = subject[1].trim(); + var desc = DESC_REGEX.exec(subFields[1].innerHTML); desc = desc == null ? "" : desc[1]; @@ -614,9 +619,9 @@ class gsec { } var tume = messageElement.getElementsByClassName("msgSubDate")[0].innerHTML.split(" ")[1]; - if(tume == null || tume.length < 1) { + if (tume == null || tume.length === 0) { tume = messageElement.getElementsByClassName("msgSubDate")[0].innerHTML; - } + } var dateStringToParse = `${date[2]}-${date[1]}-${date[0]} ${tume}`; var dateObj = new Date(Date.parse(dateStringToParse)); // "tume"! var person = messageElement.getElementsByClassName("msgDir")[0].innerHTML; -- cgit v1.2.3 From d766f5af2b59ede34479dcce54b368c3bf816d2b Mon Sep 17 00:00:00 2001 From: rstular Date: Tue, 2 Jun 2020 16:07:57 +0200 Subject: Preparing to merge --- assets/js/gradings.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'assets/js') diff --git a/assets/js/gradings.js b/assets/js/gradings.js index a852337..f884bf2 100644 --- a/assets/js/gradings.js +++ b/assets/js/gradings.js @@ -176,15 +176,15 @@ document.addEventListener("DOMContentLoaded", () => { calendar_obj.render(); // Modal for adding gradings - setupPickers(); // todo (adding an event), to be stored in messages - // Setup modals - const modal_elems = document.querySelectorAll('.modal'); - const modal_options = { - onOpenStart: () => { $("#fab-new").hide() }, - onCloseEnd: () => { $("#fab-new").show() }, - dismissible: false - }; - M.Modal.init(modal_elems, modal_options); + // setupPickers(); // todo (adding an event), to be stored in messages + // // Setup modals + // const modal_elems = document.querySelectorAll('.modal'); + // const modal_options = { + // onOpenStart: () => { $("#fab-new").hide() }, + // onCloseEnd: () => { $("#fab-new").show() }, + // dismissible: false + // }; + // M.Modal.init(modal_elems, modal_options); loadGradings(true); // Setup refresh handler -- cgit v1.2.3