1 files changed, 175 insertions, 228 deletions

diff --git a/js/grades.js b/js/grades.js
index ec5bbe8..b77ffd2 100644
--- a/js/grades.js
+++ b/js/grades.js
@@ -1,6 +1,6 @@
-const API_ENDPOINT = "https://gimb.tk/test.php";
+// const API_ENDPOINT = "https://gimb.tk/test.php"; // deprecated
 let checkbox_state = false;
-
+var grades;
 async function checkLogin() {
     localforage.getItem("logged_in").then((value) => {
         // This code runs once the value has been loaded
@@ -24,178 +24,135 @@ function setLoading(state) {
 }
 
 async function loadGrades(force_refresh = false) {
-    setLoading(true);
-
-    let promises_to_run = [
-        localforage.getItem("username").then((value) => {
-            username = value;
-        }),
-        localforage.getItem("password").then((value) => {
-            password = value;
-        }),
-        localforage.getItem("grades").then((value) => {
-            grades = value;
-        })
-    ];
-
-    await Promise.all(promises_to_run);
-
-    // If we don't have a list of grades, fetch it
-    if (grades === null || grades === [] || force_refresh) {
-
-        $.ajax({
-            url: API_ENDPOINT,
-            crossDomain: true,
-
-            data: {
-                "u": username,
-                "p": password,
-                "m": "fetchocene"
-            },
-            dataType: "json",
-
-            cache: false,
-            type: "GET",
-
-            success: (data) => {
-                // If data is null, the request failed
-                if (data === null) {
-										UIAlert(S("requestFailed"), "loadGrades(): data === null; request failed");
-                    setLoading(false);
-                } else {
-                    // Save grades & populate view
-                    localforage.setItem("grades", data).then((value) => {
-                        grades = value;
-                        displayGrades();
-                        setLoading(false);
-                    });
-                }
-            },
-
-            error: () => {
-								UIAlert(S("noInternetConnection"), "loadGrades(): $ajax-error");
-                setLoading(false);
-            }
-
-        });
-
-    } else {
-        displayGrades();
-        setLoading(false);
-    }
+	setLoading(true);
+	let promises_to_run = [
+		localforage.getItem("username").then((value) => {
+			username = value;
+		}),
+		localforage.getItem("password").then((value) => {
+			password = value;
+		}),
+		localforage.getItem("grades").then((value) => {
+			grades = value;
+		})
+	];
+	await Promise.all(promises_to_run);
+	// If we don't have a list of grades, fetch it
+	if (grades === null || grades === [] || force_refresh) {
+		try {
+			let gsecInstance = new gsec();
+			await	gsecInstance.login(username, password);
+			gsecInstance.fetchGrades().then( (value) => {
+				grades = value;
+				localforage.setItem("grades", value).then((value) => {
+					displayGrades();
+					setLoading(false);
+				});
+				setLoading(false);
+			}).catch( (err) => {
+				gsecErrorHandlerUI(err);
+				setLoading(false);
+			});
+		} catch (err) {
+			gsecErrorHandlerUI(err);
+			setLoading(false);
+		}
+	} else {
+		displayGrades();
+		setLoading(false);
+	}
 }
 
 function displayGrades() {
-    let grades_by_subject = {};
-    grades.forEach((grade, index) => {
-        if (!(grade["predmet"] in grades_by_subject)) {
-            grades_by_subject[grade["predmet"]] = [];
-        }
-        let grade_object = {
-            date: grade["datum"],
-            teacher: grade["profesor"],
-            subject: grade["predmet"],
-            title: grade["naslov"],
-            type: grade["vrsta"],
-            term: grade["rok"],
-            grade: grade["ocena"],
-            temporary: grade["zacasna"],
-            index: index
-        }
-        grades_by_subject[grade["predmet"]].push(grade_object);
-    });
-
-    let root_element = document.getElementById("grades-collapsible");
-
-    Object.keys(grades_by_subject).forEach((subject) => {
-        // Create root element for a subject entry
-        let subject_entry = document.createElement("li");
-        // Create subject collapsible header
-        let subject_header = document.createElement("div");
-        subject_header.classList.add("collapsible-header");
-        subject_header.classList.add("collapsible-header-root");
-        // Create header text element
-        let subject_header_text = document.createElement("span");
-        subject_header_text.innerText = subject;
-
-        // Create collection for displaying individuals grades
-        let subject_body = document.createElement("div");
-        subject_body.className = "collapsible-body";
-        let subject_body_root = document.createElement("ul");
-        subject_body_root.className = "collection";
-
-        // Setup variables for calculating average
-        let grade_sum = 0;
-        let grade_tot = 0;
-
-        grades_by_subject[subject].forEach((grade) => {
-            // Create element for individual grade
-            let grade_node = document.createElement("li");
-            grade_node.className = "collection-item";
-            grade_node.classList.add("collection-item")
-            grade_node.classList.add("grade-node");
-            grade_node.dataset["index"] = grade["index"];
-            let grade_node_div = document.createElement("div");
-
-            // Node for date and subject text
-            let grade_text = document.createElement("span");
-            // Node for the actual number
-            let grade_number = document.createElement("div");
-            grade_number.className = "secondary-content";
-
-            // Apply different style, if the grade is temporary
-            if (grade["temporary"]) {
-                // Styling for text
-                let grade_text_italic = document.createElement("i");
-                grade_text_italic.innerText = grade["date"] + " - " + grade["title"];
-                grade_text.appendChild(grade_text_italic);
-
-                // Styling for number
-                let grade_number_italic = document.createElement("i");
-                grade_number_italic.innerText = grade["grade"].toString();
-                grade_number.appendChild(grade_number_italic);
-            } else {
-                // Text
-                grade_text.innerText = grade["date"] + " - " + grade["title"];
-                // Number
-                grade_number.innerText = grade["grade"].toString();
-            }
-
-            grade_node_div.appendChild(grade_text);
-            grade_node_div.appendChild(grade_number);
-
-            grade_node.appendChild(grade_node_div);
-
-
-            // Count the grade only if it's not temporary or explicitly enabled
-            if (!grade["temporary"] || !checkbox_state) {
-                grade_sum += grade["grade"];
-                grade_tot += 1;
-            }
-
-            subject_body_root.appendChild(grade_node);
-
-        });
-
-        let grade_average = (grade_tot === 0) ? "N/A" : (Math.round(((grade_sum / grade_tot) + Number.EPSILON) * 100) / 100);
-        let subject_header_average = document.createElement("div");
-        subject_header_average.className = "collapsible-header-right";
-        subject_header_average.innerText = grade_average.toString();
-
-        subject_header.appendChild(subject_header_text);
-        subject_header.appendChild(subject_header_average);
-
-        subject_body.append(subject_body_root);
-
-        subject_entry.append(subject_header);
-        subject_entry.append(subject_body);
-
-        root_element.append(subject_entry);
-    });
-
-    $("#grades-collapsible").append(root_element);
-
-    refreshClickHandlers();
+	let grades_by_subject = {};
+	grades.forEach((grade, index) => {
+		if (!(grade["subject"] in grades_by_subject)) {
+			grades_by_subject[grade["subject"]] = [];
+		}
+		let grade_object = {
+			date: dateString.longFormatted(grade["date"]),
+			teacher: grade["teacher"],
+			subject: grade["subject"],
+			title: grade["name"][0],
+			type: grade["name"][1],
+			term: grade["name"][2],
+			grade: grade["grade"],
+			temporary: grade["temporary"],
+			index: index
+		}
+		grades_by_subject[grade["subject"]].push(grade_object);
+	});
+	let root_element = document.getElementById("grades-collapsible");
+	Object.keys(grades_by_subject).forEach((subject) => {
+		// Create root element for a subject entry
+		let subject_entry = document.createElement("li");
+		// Create subject collapsible header
+		let subject_header = document.createElement("div");
+		subject_header.classList.add("collapsible-header");
+		subject_header.classList.add("collapsible-header-root");
+		// Create header text element
+		let subject_header_text = document.createElement("span");
+		subject_header_text.innerText = subject;
+		// Create collection for displaying individuals grades
+		let subject_body = document.createElement("div");
+		subject_body.className = "collapsible-body";
+		let subject_body_root = document.createElement("ul");
+		subject_body_root.className = "collection";
+		// Setup variables for calculating average
+		let grade_sum = 0;
+		let grade_tot = 0;
+		grades_by_subject[subject].forEach((grade) => {
+			// Create element for individual grade
+			let grade_node = document.createElement("li");
+			grade_node.className = "collection-item";
+			grade_node.classList.add("collection-item")
+			grade_node.classList.add("grade-node");
+			grade_node.dataset["index"] = grade["index"];
+			let grade_node_div = document.createElement("div");
+			// Node for date and subject text
+			let grade_text = document.createElement("span");
+			// Node for the actual number
+			let grade_number = document.createElement("div");
+			grade_number.className = "secondary-content";
+			// Apply different style, if the grade is temporary
+			if (grade["temporary"]) {
+				// Styling for text
+				let grade_text_italic = document.createElement("i");
+				grade_text_italic.innerText = grade["date"] + " - " + grade["title"];
+				grade_text.appendChild(grade_text_italic);
+				// Styling for number
+				let grade_number_italic = document.createElement("i");
+				grade_number_italic.innerText = grade["grade"].toString();
+				grade_number.appendChild(grade_number_italic);
+			} else {
+				// Text
+				grade_text.innerText = grade["date"] + " - " + grade["title"];
+				// Number
+				grade_number.innerText = grade["grade"].toString();
+			}
+			grade_node_div.appendChild(grade_text);
+			grade_node_div.appendChild(grade_number);
+			grade_node.appendChild(grade_node_div);
+			// Count the grade only if it's not temporary or explicitly enabled
+			if (!grade["temporary"] || !checkbox_state) {
+				grade_sum += grade["grade"];
+				grade_tot += 1;
+			}
+			subject_body_root.appendChild(grade_node);
+		});
+		let grade_average = (grade_tot === 0) ? "N/A" : (Math.round(((grade_sum / grade_tot) + Number.EPSILON) * 100) / 100);
+		let subject_header_average = document.createElement("div");
+		subject_header_average.className = "collapsible-header-right";
+		subject_header_average.innerText = grade_average.toString();
+		subject_header.appendChild(subject_header_text);
+		subject_header.appendChild(subject_header_average);
+		subject_body.append(subject_body_root);
+		subject_entry.append(subject_header);
+		subject_entry.append(subject_body);
+		root_element.append(subject_entry);
+	});
+	$("#grades-collapsible").append(root_element);
+	refreshClickHandlers();
 }
 
 function clearGrades() {
@@ -211,65 +168,55 @@ function refreshGrades(force) {
 }
 
 function refreshClickHandlers() {
-    $("#grades-collapsible").find(".collection-item.grade-node").click(function () {
-        let grade_obj = grades[parseInt(this.dataset["index"])];
-        document.getElementById("grade-header").innerText = grade_obj["predmet"] + ": " + grade_obj["ocena"];
-        document.getElementById("grade-date").innerText = grade_obj["datum"];
-        document.getElementById("grade-title").innerText = grade_obj["naslov"];
-        document.getElementById("grade-type").innerText = "Type: " + grade_obj["vrsta"];
-
-        let term_element = document.getElementById("grade-term");
-        if (grade_obj["rok"] !== "") {
-            term_element.innerText = S("term") + ": " + grade_obj["rok"];
-            term_element.style["display"] = "";
-        } else {
-            term_element.style["display"] = "none";
-        }
-
-        document.getElementById("grade-teacher").innerText = S("teacher") + ": " + grade_obj["profesor"];
-
-        let temporary_object = document.getElementById("grade-temporary");
-        let temporary_object_root = document.getElementById("grade-temporary-root");
-        if (grade_obj["zacasna"]) {
-            temporary_object.innerText = "(" + S("temporary") + ")";
-            temporary_object_root.style["display"] = "";
-        } else {
-            temporary_object_root.style["display"] = "none";
-        }
-
-        const modal = document.querySelectorAll('.side-modal')[0];
-        M.Sidenav.getInstance(modal).open();
-    });
+	$("#grades-collapsible").find(".collection-item.grade-node").click(function () {
+		let grade_obj = grades[parseInt(this.dataset["index"])];
+		document.getElementById("grade-header").innerText = grade_obj["subject"] + ": " + grade_obj["grade"];
+		document.getElementById("grade-date").innerText = dateString.longFormatted(grade_obj["date"]);
+		document.getElementById("grade-title").innerText = grade_obj["name"][0];
+		document.getElementById("grade-type").innerText = S("type") + ": " + grade_obj["name"][1];
+		let term_element = document.getElementById("grade-term");
+		if (grade_obj["name"][2] !== "") {
+			term_element.innerText = S("term") + ": " + grade_obj["name"][2];
+			term_element.style["display"] = "";
+		} else {
+			term_element.style["display"] = "none";
+		}
+		document.getElementById("grade-teacher").innerText = S("teacher") + ": " + grade_obj["teacher"];
+		let temporary_object = document.getElementById("grade-temporary");
+		let temporary_object_root = document.getElementById("grade-temporary-root");
+		if (grade_obj["temporary"]) {
+			temporary_object.innerText = "(" + S("temporary") + ")";
+			temporary_object_root.style["display"] = "";
+		} else {
+			temporary_object_root.style["display"] = "none";
+		}
+		const modal = document.querySelectorAll('.side-modal')[0];
+		M.Sidenav.getInstance(modal).open();
+	});
 }
 
 // Initialization code
 document.addEventListener("DOMContentLoaded", async () => {
-    checkLogin();
-    await loadGrades();
-
-    let coll_elem = document.querySelectorAll('.collapsible');
-    let coll_instance = M.Collapsible.init(coll_elem, {});
-
-    // Setup refresh handler
-    $("#refresh-icon").click(function () {
-        refreshGrades(true);
-    });
-
-    // Setup checkbox handler
-    $("#permanent-grades-checkbox").change(function () {
-        checkbox_state = this.checked;
-        refreshGrades(false);
-    });
-
-    let elems = document.querySelectorAll('.modal');
-    let instances = M.Modal.init(elems, {});
-
-    // Setup side menu
-    const menus = document.querySelectorAll('.side-menu');
-    M.Sidenav.init(menus, { edge: 'right', draggable: true });
-
-    // Setup side modal
-    const modals = document.querySelectorAll('.side-modal');
-    M.Sidenav.init(modals, { edge: 'left', draggable: false });
-    await loadGrades();
+	checkLogin();
+	let coll_elem = document.querySelectorAll('.collapsible');
+	let coll_instance = M.Collapsible.init(coll_elem, {});
+	// Setup refresh handler
+	$("#refresh-icon").click(function () {
+		refreshGrades(true);
+	});
+	// Setup checkbox handler
+	$("#permanent-grades-checkbox").change(function () {
+		checkbox_state = this.checked;
+		refreshGrades(false);
+	});
+	let elems = document.querySelectorAll('.modal');
+	let instances = M.Modal.init(elems, {});
+	// Setup side menu
+	const menus = document.querySelectorAll('.side-menu');
+	M.Sidenav.init(menus, { edge: 'right', draggable: true });
+	// Setup side modal
+	const modals = document.querySelectorAll('.side-modal');
+	M.Sidenav.init(modals, { edge: 'left', draggable: false });
+	await clearGrades();
+	await loadGrades();
 });