Merge pull request LambdaIITH#9 from iith-dashboard/gpa

Show gpa and selected courses in new tab
shraiysh · Dec 13, 2019 · 3ca1deb · 3ca1deb
2 parents c8d3af5 + 0f83f34
commit 3ca1deb
Show file tree

Hide file tree

Showing 25 changed files with 226 additions and 28 deletions.
diff --git a/firebase-app.js b/firebase-app.js
diff --git a/firebase-auth.js b/firebase-auth.js
diff --git a/firebase-firestore.js b/firebase-firestore.js
diff --git a/ADAM.otf → fonts/ADAM.otf b/ADAM.otf → fonts/ADAM.otf
diff --git a/OpenSans-Light.ttf → fonts/OpenSans-Light.ttf b/OpenSans-Light.ttf → fonts/OpenSans-Light.ttf
diff --git a/fonts/Roboto-Regular.ttf b/fonts/Roboto-Regular.ttf
diff --git a/google.txt b/google.txt
diff --git a/js/firebase-app.js b/js/firebase-app.js
diff --git a/js/firebase-auth.js b/js/firebase-auth.js
diff --git a/js/firebase-firestore.js b/js/firebase-firestore.js
diff --git a/html2pdf.bundle.min.js → js/html2pdf.bundle.min.js b/html2pdf.bundle.min.js → js/html2pdf.bundle.min.js
diff --git a/jquery-3.4.1.min.js → js/jquery-3.4.1.min.js b/jquery-3.4.1.min.js → js/jquery-3.4.1.min.js
diff --git a/manifest.json b/manifest.json
@@ -3,11 +3,11 @@
     "name": "AIMS-Helper",
     "version": "0.1",
     "background": {
-      "scripts": ["background.js"],
+      "scripts": ["/src/bg/background.js"],
       "persistent":false
     },
     "page_action": {
-      "default_popup":"popup.html "
+      "default_popup":"/src/popup/popup.html"
     },
     "content_security_policy":"script-src 'self' https://www.gstatic.com/ https://*.firebaseio.com https://www.googleapis.com https://apis.google.com; object-src 'self'",
     "permissions": ["declarativeContent", "storage", "tabs", "<all_urls>","http://*/","https://*/", "identity"],

diff --git a/spinner.gif → res/spinner.gif b/spinner.gif → res/spinner.gif
diff --git a/slotInfo.json b/slotInfo.json
diff --git a/background.js → src/bg/background.js b/background.js → src/bg/background.js
@@ -14,6 +14,6 @@
     function(request, sender)
     {
       if (request.action == "LaunchTimetableFile")
-        chrome.tabs.create({ url: chrome.runtime.getURL("table.html") });
+        chrome.tabs.create({ url: chrome.runtime.getURL("/src/timetable/table.html") });
     } 
   );
diff --git a/activateGPA.js → src/gpa/activateGPA.js b/activateGPA.js → src/gpa/activateGPA.js
@@ -3,6 +3,8 @@ Source: https://github.com/IITH/aims-gpa-calculator
 */
 
 var exclude_list = [
+  'Minor core',
+  'Honors core',
   'Honours project',
   'Honours coursework',
   'FCC',
@@ -55,27 +57,43 @@ show_total_gpa = function(){
     if ($(".cgpa_cal_check").length==0)
         add_checkboxes();
     elems = $(".hierarchyLi.dataLi").not(".hierarchyHdr, .hierarchySubHdr");
+    var type_credits_map = new Map();
     elems.each(function(i){
         if ($(this).find(".cgpa_cal_check:checked").length == 0 )
             return;
 
         var course = new Object();
-        course.id = $(this).children(".col1").html().trim();
+        course.code = $(this).children(".col1").contents().filter(function(){
+            return this.nodeType == Node.TEXT_NODE;
+          }).text().trim();
         course.name = $(this).children(".col2").html().trim();
         course.type = $(this).children(".col5").html().trim().slice(6);
         course.grade = $(this).children(".col8").html().trim().slice(6);
-        course.credits = $(this).children(".col3").html().trim().slice(6);
+        course.credits = Number($(this).children(".col3").html().trim().slice(6));
         if (!(course.grade in grade_values))
             return;
+
+        if (type_credits_map.has(course.type))
+          type_credits_map.set(course.type, type_credits_map.get(course.type) + course.credits);
+        else
+          type_credits_map.set(course.type, course.credits);
+
+
         grade_value = grade_values[course.grade];
-        credits = Number(course.credits);
+        credits = course.credits;
         total_grades += credits * grade_value;
         total_credits += credits;
         courses.push(course);
     });
     console.log(total_grades, total_credits);
     var gpa = (total_grades / total_credits).toFixed(2);
-    return {courses: courses,
+    return {
+        name: $(".stuName").text().trim(),
+        rollno: $(".studentInfoDiv>.flexDiv:nth-child(3)").find("span").text().trim(),
+        branch: $(".studentInfoDiv>.flexDiv:nth-child(5)").find("div:nth-child(1)").find("span").text().trim(),
+        student_type: $(".studentInfoDiv>.flexDiv:nth-child(5)").find("div:nth-child(2)").find("span").text().trim(),
+        type_credits_map: JSON.stringify(Array.from(type_credits_map)),
+        courses: JSON.stringify(courses),
         gpa: gpa
     };
 }