From a4e25ed95b896f39aadec6123543dae1bc80e8fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=20Luka=20=C5=A0ijanec?= Date: Sat, 21 Mar 2020 00:58:21 +0100 Subject: teachers.js, absences.js: uporabljajo gsec.js; gsec.js: spremembe apija --- js/absences.js | 230 +++++++++++++++++++++++++++------------------------------ 1 file changed, 109 insertions(+), 121 deletions(-) (limited to 'js/absences.js') diff --git a/js/absences.js b/js/absences.js index 163b3f0..0540f1f 100644 --- a/js/absences.js +++ b/js/absences.js @@ -1,6 +1,6 @@ -const API_ENDPOINT = "https://gimb.tk/test.php"; +// const API_ENDPOINT = "https://gimb.tk/test.php"; // deprecated // const API_ENDPOINT = "http://localhost:5000/test.php"; - +var absences; async function checkLogin() { localforage.getItem("logged_in").then(function (value) { // This code runs once the value has been loaded @@ -24,128 +24,116 @@ function setLoading(state) { } async function loadAbsences(force_refresh = false) { - setLoading(true); - - // Load required data - let promises_to_run = [ - localforage.getItem("username").then(function (value) { - username = value; - }), - localforage.getItem("password").then(function (value) { - password = value; - }), - localforage.getItem("absences").then(function (value) { - absences = value; - }) - ]; - - await Promise.all(promises_to_run); - - // If we don't have a list of absences, query it - if (absences === null || force_refresh) { - $.ajax({ - url: API_ENDPOINT, - crossDomain: true, - - data: { - "u": username, - "p": password, - "m": "fetchizostanki", - "a": $("#datepicker-from").val(), - "b": $("#datepicker-to").val() - }, - dataType: "json", - - cache: false, - type: "GET", - - success: function (data) { - // If data is null, the credentials were incorrect - if (data === null) { - UIAlert(D("noAbsences"), "loadAbsences(): $.ajax data === null"); - setLoading(false); - } else { - // Save absences & populate UI - localforage.setItem("absences", data).then(function (value) { - absences = value; - displayData(); - setLoading(false); - }); - } - }, - - error: function () { - UIAlert(D("noInternetConnection"), "loadAbsences(): $.ajax.error"); - setLoading(false); - } - - }) - } else { - displayData(); - setLoading(false); - } - + setLoading(true); + // Load required data + let promises_to_run = [ + localforage.getItem("username").then(function (value) { + username = value; + }), + localforage.getItem("password").then(function (value) { + password = value; + }), + localforage.getItem("absences").then(function (value) { + absences = value; + }) + ]; + await Promise.all(promises_to_run); + // If we don't have a list of absences, query it + if (absences === null || force_refresh) { + try { + let gsecInstance = new gsec(); + await gsecInstance.login(username, password); + let date = {}; + date.from = $("#datepicker-from").val().split("."); + date.till = $("#datepicker-to").val().split("."); + Object.keys(date).map((key, index) => { + date[key] = new Date(Date.parse(date[key].reverse().join("-"))); + }); + gsecInstance.fetchAbsences().then( (value) => { + value.sort(function(a,b){ + // Turn your strings into dates, and then subtract them + // to get a value that is either negative, positive, or zero. + return new Date(b.date) - new Date(a.date); + }); + var fromKey = value.findIndex((processedElement, processedIndex) => { + if(processedElement.date.getTime() >= date.from.getTime()) { + return true; + } + }); + var tillKey = value.reverse().findIndex((pE, pI) => { + if(pE.date.getTime() <= date.till.getTime()) { + return true; + } + }); + value.length = tillKey+1; // tillKey in + value.splice(0, fromKey); // fromKey hočemo obdržati + absences = value; + localforage.setItem("absences", value).then((value) => { + displayData(); + setLoading(false); + }); + setLoading(false); + }).catch( (err) => { + gsecErrorHandlerUI(err); + setLoading(false); + }); + } catch (err) { + gsecErrorHandlerUI(err); + setLoading(false); + } + } else { + displayData(); + setLoading(false); + } } function displayData() { - absences.forEach(element => { - let li = document.createElement("li"); - - let date_string = element["datum"]["dan"] + ". " + element["datum"]["mesec"] + ". " + element["datum"]["leto"]; - - let header = document.createElement("div"); - header.className = "collapsible-header"; - header.innerText = date_string; - - let body = document.createElement("div"); - body.className = "collapsible-body"; - - let body_table = document.createElement("table"); - body_table.className = "highlight"; - let body_table_tbody = document.createElement("tbody"); - - element["predmeti"].forEach(lesson => { - let subject_row = document.createElement("tr"); - - let subject_lesson_icon = document.createElement("td"); - - let subject_lesson_text = document.createElement("td"); - subject_lesson_text.innerText = S("lesson") + " " + lesson["ura"]; - - let subject_lesson_icon_i = document.createElement("i"); - subject_lesson_icon_i.className = "material-icons"; - switch (lesson["opraviceno"]["status"]) { - case 0: - subject_lesson_icon_i.innerText = "schedule"; - break; - case 1: - subject_lesson_icon_i.innerText = "check_circle_outline"; - break; - case 2: - subject_lesson_icon_i.innerText = "error_outline"; - break; - case 3: - subject_lesson_icon_i.innerText = "not_interested"; - break; - } - subject_lesson_icon.appendChild(subject_lesson_icon_i); - - let subject_name = document.createElement("td"); - subject_name.innerText = lesson["ime"]; - - subject_row.appendChild(subject_lesson_icon); - subject_row.appendChild(subject_lesson_text); - subject_row.appendChild(subject_name); - body_table_tbody.appendChild(subject_row); - }); - body_table.appendChild(body_table_tbody); - body.appendChild(body_table); - - li.appendChild(header); - li.appendChild(body); - - $("#absences-col").append(li); - }); + absences.forEach(absence => { + let li = document.createElement("li"); + let date_string = dateString.longFormatted(absence["date"]); // javascript sucks - zakaj ob vsej svoji "preprostosti" ne morm met Date za key objecta!?!?'!!11~ + let header = document.createElement("div"); + header.className = "collapsible-header"; + header.innerText = date_string; + let body = document.createElement("div"); + body.className = "collapsible-body"; + let body_table = document.createElement("table"); + body_table.className = "highlight"; + let body_table_tbody = document.createElement("tbody"); + Object.keys(absence.subjects).forEach(lesson => { + let subject_row = document.createElement("tr"); + let subject_lesson_icon = document.createElement("td"); + let subject_lesson_text = document.createElement("td"); + subject_lesson_text.innerText = S("lesson") + " " + lesson; + let subject_lesson_icon_i = document.createElement("i"); + subject_lesson_icon_i.className = "material-icons"; + switch (absence["subjects"][lesson]["status"]) { + case 0: + subject_lesson_icon_i.innerText = "schedule"; + break; + case 1: + subject_lesson_icon_i.innerText = "check_circle_outline"; + break; + case 2: + subject_lesson_icon_i.innerText = "error_outline"; + break; + case 3: + subject_lesson_icon_i.innerText = "not_interested"; + break; + } + subject_lesson_icon.appendChild(subject_lesson_icon_i); + let subject_name = document.createElement("td"); + subject_name.innerText = S(gseAbsenceTypes[absence["subjects"][lesson]["status"]]) + " : " + absence["subjects"][lesson]["subject"]; + subject_row.appendChild(subject_lesson_icon); + subject_row.appendChild(subject_lesson_text); + subject_row.appendChild(subject_name); + body_table_tbody.appendChild(subject_row); + }); + body_table.appendChild(body_table_tbody); + body.appendChild(body_table); + li.appendChild(header); + li.appendChild(body); + $("#absences-col").append(li); + }); } function clearAbsences() { -- cgit v1.2.3