Skip to content

Commit 5c39d86

Browse files
Suhas Hariharangary-kim
authored andcommitted
Made changes to use fetch api instead of ajax, also using DOM instead of text parsing
Signed-off-by: Suhas Hariharan <[email protected]>
1 parent 9c0cce1 commit 5c39d86

File tree

1 file changed

+23
-22
lines changed

1 file changed

+23
-22
lines changed

src/js/saspowerschoolff.js

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -99,30 +99,30 @@ function main_page () {
9999
});
100100
}
101101
if (second_semester) {
102-
$.ajax({
102+
fetch("https://powerschool.sas.edu.sg/guardian/termgrades.html")
103+
.then((response) => {
104+
return response.text();
105+
})
106+
.then((data) => {
107+
const el = document.createElement("html");
108+
let element_list = [];
109+
el.innerHTML = data;
110+
element_list = el.getElementsByClassName("box-round")[0].getElementsByTagName("table")[0];
111+
element_list = element_list.getElementsByTagName("tbody")[0].getElementsByTagName("tr");
112+
if (element_list.length > 2) {
113+
for (let i = 2; i < element_list.length; i++) {
114+
const $prev_course = element_list[i];
115+
courses_first_semester.push({
116+
name: $prev_course.getElementsByTagName("td")[0].textContent.trim(),
117+
grade: $prev_course.getElementsByTagName("td")[1].textContent.trim(),
118+
link: $prev_course.getElementsByTagName("td")[2].getElementsByTagName("a")[0].href,
119+
fp: -1,
103120

104-
url: "https://powerschool.sas.edu.sg/guardian/termgrades.html",
105-
106-
}).done(function (data) {
107-
const el = document.createElement("html");
108-
let element_list = [];
109-
el.innerHTML = data;
110-
element_list = el.getElementsByClassName("box-round")[0].getElementsByTagName("table")[0];
111-
element_list = element_list.getElementsByTagName("tbody")[0].getElementsByTagName("tr");
112-
if (element_list.length > 2) {
113-
for (let i = 2; i < element_list.length; i++) {
114-
const $prev_course = element_list[i];
115-
courses_first_semester.push({
116-
name: $prev_course.getElementsByTagName("td")[0].textContent.trim(),
117-
grade: $prev_course.getElementsByTagName("td")[1].textContent.trim(),
118-
link: $prev_course.getElementsByTagName("td")[2].innerHTML.trim().split('href="')[1].split("&amp")[0],
119-
fp: -1,
120-
121-
});
121+
});
122+
}
123+
$("table[border='0'][cellpadding='3'][cellspacing='1'][width='100%']").prepend(`<tr><td align="center">Last Semester GPA (S1): ${calculate_gpa(courses_first_semester)}</td></tr>`);
122124
}
123-
$("table[border='0'][cellpadding='3'][cellspacing='1'][width='100%']").prepend(`<tr><td align="center">Last Semester GPA (S1): ${calculate_gpa(courses_first_semester)}</td></tr>`);
124-
}
125-
});
125+
});
126126
}
127127
for (let i = 0; i < $grade_rows.length; i++) {
128128
let $course;
@@ -193,6 +193,7 @@ function fill_percent ($fill_location, url_link, percents, pos_in_arr) {
193193
if (!percent_main_page) {
194194
return;
195195
}
196+
196197
$.ajax({
197198
url: url_link,
198199
}).done(function (data) {

0 commit comments

Comments
 (0)