fixed table reading

Signed-off-by: Suhas Hariharan <[email protected]>

Author: Suhas Hariharan

src/js/components/CategoryWeighting.vue

@@ -140,13 +140,13 @@ export default {
     methods: {
         async getCatmap () {
             let catmap = await getSavedCategoryWeighting();
-            if (catmap === false) {
-                catmap = {};
-                this.categories.sort();
-                this.categories.forEach((e, i) => {
+            catmap = {};
+            this.categories.sort();
+            this.categories.forEach((e, i) => {
+                if (catmap[e] === undefined) {
                     catmap[e] = { weighting: 0, category: e };
-                });
-            }
+                }
+            });
             const category_set = new Set(this.categories);
             for (var cat in catmap) {
                 category_set.add(cat);

src/js/helpers.js

@@ -206,7 +206,11 @@ function extractAssignmentList() {
     const assignments = [];
     [...table.querySelectorAll('tr')].slice(1, -1).forEach((e, i) => {
         const curr = e.querySelectorAll('td');
-        assignments.push(new ClassAssignment(i, curr[0].innerHTML, curr[1].innerText, curr[2].innerHTML, isIndicatorPresent(curr[4]), isIndicatorPresent(curr[5]), isIndicatorPresent(curr[6]), isIndicatorPresent(curr[7]), isIndicatorPresent(curr[8]), curr[11].innerHTML, curr[12].innerHTML.trim()));
+        let offset = 0;
+        if (curr.length === 14) {
+            offset = 1;
+        }
+        assignments.push(new ClassAssignment(i, curr[0].innerHTML, curr[1].innerText, curr[2].innerHTML, isIndicatorPresent(curr[3 + offset]), isIndicatorPresent(curr[4 + offset]), isIndicatorPresent(curr[5 + offset]), isIndicatorPresent(curr[6 + offset]), isIndicatorPresent(curr[7 + offset]), curr[10 + offset].innerText, curr[11 + offset].innerText.trim()));
     });
     return assignments;
 }

src/js/saspowerschoolff.js

@@ -439,6 +439,7 @@ function addHypoGradeCalc (courses) {
 async function addVueGrades () {
     const assignments = extractAssignmentList();
     const cat = extractGradeCategories(document.querySelector("table.zebra.grid > tbody"));
+    console.log(assignments);
     gt = new (Vue.extend(GradeTable))({ // remake grade table to easily read grades
         propsData: {
             categories: cat,