fix issue with cumulative GPA calculation and changing weights of new assignments

Signed-off-by: Anvay Mathur <[email protected]>

Author: megagames-me

src/content_script/scores/index.ts

@@ -70,12 +70,12 @@ function waitForElm(selector: string): Promise<Element | null> {
   });
 }
 
-console.log(document.getElementById("pes-fp"));
+// console.log(document.getElementById("pes-fp"));
 if (document.getElementById("pes-fp") || document.getElementById("pes-st")) {
   document.getElementById("pes-fp")?.remove();
   document.getElementById("pes-st")?.remove();
 }
-console.log(document.getElementById("pes-fp"));
+// console.log(document.getElementById("pes-fp"));
 let gradeManagerO = new GradeManager([], []);
 
 const doScoreTools = async () => {
@@ -86,7 +86,8 @@ const doScoreTools = async () => {
   for (let i = 0; i < rowEles.length; i++) {
     let rowEle = rowEles[i];
     if (rowEle.querySelector("td.codeCol > div.tt-excluded") != null) {
-      console.log(rowEle); continue;
+      // console.log(rowEle); 
+      continue;
     };
 
     let gradeEle = rowEle.querySelector("td.ng-binding.ng-scope");
@@ -108,7 +109,8 @@ const doScoreTools = async () => {
         }
       }
       if (!validGrade) {
-        console.log(rowEle); continue;
+        // console.log(rowEle); 
+        continue;
       }
       let category = gradeManager.getCategoryByName(categoryEle.textContent.trim());
       if (!category) {
@@ -158,7 +160,7 @@ const doScoreTools = async () => {
   }
 
 
-  console.log(gradeManager);
+  // console.log(gradeManager);
   gradeManagerO = gradeManager;
   new ScoreTools({
     target: target as Element,

src/content_script/termgrades/index.ts

@@ -176,21 +176,24 @@ Promise.allSettled(fetches).then(async (res) => {
     homeClasses.push(new Class(name, { s1: s1Grade as Grade, s2: s2Grade as Grade }, null, "Now"));
   }
 
-  let allSame = true;
+  let same = 0;
   for (let homeClass of homeClasses) {
-    if (!arr.find(c => c.name === homeClass.name)) {
-      allSame = false;
+    let idx = arr.findIndex(c => c.name === homeClass.name);
+    if (idx !== -1) {
+      arr[idx].grade = homeClass.grade;
+    } else {
+      arr.unshift(homeClass);
     }
   }
 
-  if (!allSame) {
-    arr.push(...homeClasses);
-  } else {
-    for (let homeClass of homeClasses) {
-      let cor = arr.findIndex(c => c.name === homeClass.name);
-      arr[cor].grade = homeClass.grade;
-    }
-  }
+  // if (same <= 2) {
+  //   arr.push(...homeClasses);
+  // } else {
+  //   for (let homeClass of homeClasses) {
+  //     let cor = arr.findIndex(c => c.name === homeClass.name);
+  //     arr[cor].grade = homeClass.grade;
+  //   }
+  // }
 
   let cumManager = new ClassManager(arr);
 
@@ -201,5 +204,4 @@ Promise.allSettled(fetches).then(async (res) => {
 
   new Cumulative({ target: target as Element, props: { classManager: cumManager, hideGPA } });
 
-});
-
+});

src/models/classes.ts

@@ -57,14 +57,12 @@ export class ClassManager {
     let totalCredits = this.getTotalCredits(1) + this.getTotalCredits(2);
     if (totalCredits === 0) return -1;
     for (const c of this.classes) {
-      if (c.grade.s1 === "INC_NO_CLASS_CREDIT") {
-        continue;
+      if (c.grade.s1 !== "INC_NO_CLASS_CREDIT" && c.grade.s1 !== null) {
+        gpa += (gradeToGPA[c.grade.s1] + (c.isBoosted ? 0.5 : 0)) * c.credits;
       }
-      if (c.grade.s2 === "INC_NO_CLASS_CREDIT") {
-        continue;
+      if (c.grade.s2 !== "INC_NO_CLASS_CREDIT" && c.grade.s2 !== null) {
+        gpa += (gradeToGPA[c.grade.s2] + (c.isBoosted ? 0.5 : 0)) * c.credits;
       }
-      if (c.grade.s1 !== null) gpa += (gradeToGPA[c.grade.s1] + (c.isBoosted ? 0.5 : 0)) * c.credits;
-      if (c.grade.s2 !== null) gpa += (gradeToGPA[c.grade.s2] + (c.isBoosted ? 0.5 : 0)) * c.credits;
     }
     return gpa / totalCredits;
   }

src/models/grades.ts

@@ -109,6 +109,7 @@ function gcd(a: number, b: number): number {
 function findGCD(arr: number[]): number {
   let result = arr[0];
   for (let i = 1; i < arr.length; i++) {
+    if (arr[i] == null || arr[i] == undefined) arr[i] = 0;
     result = gcd(arr[i], result);
 
     if (result == 1) {
@@ -304,7 +305,8 @@ export class GradeManager {
 
     let weights = categoryAssignments.map((a) => a.weight)
 
-    if (weights.includes(0)) return "";
+    // @ts-expect-error if the text box is blank it turns null
+    if (weights.includes(0) || weights.includes(null)) return "";
 
     let sum = weights.reduce((a, b) => a + b, 0);