Merge pull request #313 from sas-fossdev/fix-percentages-and-cumulati…

…ve-calculation Fix percentages not showing and cumulative GPA double including finished semester
sas-fossdev · Dec 19, 2021 · 3fde949 · 3fde949
2 parents 78b066c + 3e56d4d
commit 3fde949
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/src/js/components/CumulativeGPA.vue b/src/js/components/CumulativeGPA.vue
@@ -170,16 +170,18 @@ export default {
                                     semester.innerHTML = data2;
                                     element_list = semester.getElementsByClassName("box-round")[0].getElementsByTagName("table")[0];
                                     element_list = element_list.getElementsByTagName("tbody")[0].getElementsByTagName("tr");
-                                    for (let t = 2; t < element_list.length; t++) {
+                                    for (let t = 0; t < element_list.length; t++) {
                                         if (element_list[t].innerText.trim() === ("S2")) {
-                                            most_recent_term = "S2";
                                             all_courses.push(courses);
                                             if (i === 0) {
+                                                most_recent_term = "S2";
                                                 current_term_grades.push(courses);
                                             }
                                             courses = [];
                                         } else if (element_list[t].innerText.trim() === ("S1")) {
-                                            most_recent_term = "S1";
+                                            if (i === 0) {
+                                                most_recent_term = "S1";
+                                            }
                                         }
                                         if (element_list[t].getElementsByTagName("th").length > 0) {
                                             continue;

diff --git a/src/js/helpers.js b/src/js/helpers.js
@@ -150,7 +150,7 @@ function extractFinalPercent (html) {
         let current_string = html.match(/(?=document\.write).*/g)[1];
         current_string = /\[.*\]/g.exec(current_string)[0].slice(1, -1);
         const temp = current_string.split(";");
-        number = Math.max(isNaN(temp[temp.length - 2]) || temp[temp.length - 2] ? parseFloat(temp[temp.length - 2]) : -Infinity, isNaN(temp[temp.length - 1]) || temp[temp.length - 1] ? parseFloat(temp[temp.length - 1]) : -Infinity);
+        number = Math.max(isNaN(parseFloat(temp[temp.length - 2])) ? -Infinity : parseFloat(temp[temp.length - 2]), isNaN(parseFloat(temp[temp.length - 1])) ? -Infinity : parseFloat(temp[temp.length - 1]));
     } catch (e) {
         return;
     }
@@ -244,13 +244,12 @@ function assignmentsFromNode (node) {
 
 /**
  * Return Assignment instances for the given class page.
- * @param {String} student_id student id for the current user
- * @param {String} sectino_id section id for the course being requested
- * @param {String} start_date start date in YYYY-MM-DD format
- * @param {String} end_date end date in YYYY-MM-DD format
+ * @param {String} studentId student id for the current user
+ * @param {String} sectionId section id for the course being requested
+ * @param {String} currentSemester currentSemester the current semester (either S1 or S2)
  * @returns {Assignment[]} Assignments in this course
  */
-function assignmentsFromAPI (studentId, sectionId, startDate, endDate) {
+function assignmentsFromAPI (studentId, sectionId, currentSemester) {
     const assignmentList = [];
     try {
         fetch('https://powerschool.sas.edu.sg/ws/xte/assignment/lookup', {
@@ -261,8 +260,7 @@ function assignmentsFromAPI (studentId, sectionId, startDate, endDate) {
             body: JSON.stringify({
                 "student_ids": [studentId],
                 "section_ids": [sectionId],
-                "start_date": startDate,
-                "end_date": endDate,
+                "store_codes": [currentSemester],
             }),
             credentials: "same-origin",
         }).then(response => response.json()).then(response => {

diff --git a/src/js/saspowerschoolff.js b/src/js/saspowerschoolff.js
@@ -348,12 +348,14 @@ async function getCourses (second_semester, sem1_col, sem2_col) {
                             const page = document.implementation.createHTMLDocument();
                             page.documentElement.innerHTML = response;
                             const sectionId = page.querySelector("div[data-pss-student-assignment-scores]").getAttribute("data-sectionid");
-                            let startDate = currentUrl.searchParams.get("begdate");
-                            startDate = startDate.split("/")[2] + "-" + startDate.split("/")[0] + "-" + startDate.split("/")[1];
-                            let endDate = currentUrl.searchParams.get("enddate");
-                            endDate = endDate.split("/")[2] + "-" + endDate.split("/")[0] + "-" + endDate.split("/")[1];
                             const studentId = page.querySelector("div .xteContentWrapper").getAttribute("data-ng-init").split("\n")[0].split("= '")[1].replace("';", "").substring(3);
-                            const assignment_list = assignmentsFromAPI(studentId, sectionId, startDate, endDate);
+                            let currentSemester;
+                            if (second_semester) {
+                                currentSemester = "S2";
+                            } else {
+                                currentSemester = "S1";
+                            }
+                            const assignment_list = assignmentsFromAPI(studentId, sectionId, currentSemester);
                             courses.push(new Course(temp.trim(), currentUrlString, $course.text(), finalPercent, assignment_list));
                             if (gradeToGPA($course.text()) !== -1) {
                                 new (Vue.extend(ClassGrade))({