summaryrefslogtreecommitdiffstats
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rw-r--r--js/gradings.js73
-rw-r--r--js/initialize.js2
2 files changed, 38 insertions, 37 deletions
diff --git a/js/gradings.js b/js/gradings.js
index 8902a5d..0b8b53b 100644
--- a/js/gradings.js
+++ b/js/gradings.js
@@ -91,51 +91,52 @@ async function loadGradings(force_refresh = false) {
})
];
- await Promise.all(promises_to_run);
+ Promise.all(promises_to_run).then(() => {
- if (gradings === null || force_refresh) {
- $.ajax({
- url: API_ENDPOINT,
- crossDomain: true,
+ if (gradings === null || gradings === [] || gradings === -1 || force_refresh) {
+ $.ajax({
+ url: API_ENDPOINT,
+ crossDomain: true,
- data: {
- "u": username,
- "p": password,
- "m": "fetchocenjevanja"
- },
- dataType: "json",
+ data: {
+ "u": username,
+ "p": password,
+ "m": "fetchocenjevanja"
+ },
+ dataType: "json",
- cache: false,
- type: "GET",
+ cache: false,
+ type: "GET",
- success: (data) => {
+ success: (data) => {
- // If data is null, the credentials were incorrect
- if (data === null) {
- M.toast({ html: "Request failed!" });
- setLoading(false);
- } else {
- // Save gradings & populate calendar
- localforage.setItem("gradings", data).then((value) => {
- gradings = value;
- displayData();
+ // If data is null, the credentials were incorrect
+ if (data === null) {
+ M.toast({ html: "Request failed!" });
setLoading(false);
- });
+ } else {
+ // Save gradings & populate calendar
+ localforage.setItem("gradings", data).then((value) => {
+ gradings = value;
+ displayData();
+ setLoading(false);
+ });
+ }
+
+ },
+
+ error: () => {
+ M.toast({ html: "No internet connection!" });
+ setLoading(false);
}
- },
-
- error: () => {
- M.toast({ html: "No internet connection!" });
- setLoading(false);
- }
-
- })
+ })
- } else {
- displayData();
- setLoading(false);
- }
+ } else {
+ displayData();
+ setLoading(false);
+ }
+ });
}
diff --git a/js/initialize.js b/js/initialize.js
index bfad5fc..39ed505 100644
--- a/js/initialize.js
+++ b/js/initialize.js
@@ -28,7 +28,7 @@ localforage.getItem("logged_in")
} else if (value === false) {
window.location.replace("/login.html");
} else {
- window.location.replace("/pages/teachers.html");
+ window.location.replace("/pages/timetable.html");
}
}
).catch(