DerexXD/UT-Registration-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'sghsri:master' into master

Browse Source
This commit is contained in:
Om Joshi
2021-11-11 23:22:54 -06:00
committed by GitHub
parent 870477d4a2 b4a7e6c0aa
commit 3aad81e2ad
4 changed files with 15 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
js/background.js
View File

@@ -205,15 +205,9 @@ function getCurrentSemesters() {
// use the utexas review api for getting the list of departments // use the utexas review api for getting the list of departments
function getCurrentDepartments() { function getCurrentDepartments() {
$.get("https://www.utexasreview.com/api/get_major", function (response) { $.get("https://raw.githubusercontent.com/sghsri/UT-Registration-Plus/master/docs/departments.json", function (response) {
if (response) { if (response) {
let { majors } = response; departments = JSON.parse(response);
let indices = Object.keys(majors);
let new_departments = [];
for (let i = 0; i < indices.length; i++) {
new_departments.push(majors[i].abr);
}
departments = new_departments;
} }
}); });
} }
@@ -263,7 +257,7 @@ function checkConflicts(sendResponse) {
} }
} }
sendResponse({ sendResponse({
isConflict: conflicts.length === 0, isConflict: conflicts.length !== 0,
between: conflicts.length ? conflicts : undefined, between: conflicts.length ? conflicts : undefined,
}); });
}); });

4
js/options.js
View File

@@ -35,8 +35,8 @@ $.get("https://api.github.com/repos/sghsri/UT-Registration-Plus/stats/contributo
for (var contributorData of data) { for (var contributorData of data) {
$.get(`https://api.github.com/users/${contributorData.author.login}`, userData => { $.get(`https://api.github.com/users/${contributorData.author.login}`, userData => {
let fullData = { ...contributorData, ...userData }; let fullData = { ...contributorData, ...userData };
let { login, avatar_url, html_url, name } = fullData; let { login, avatar_url, html_url } = fullData;
$("#contributor-list").append(Template.Options.contributor_card(login, name, avatar_url, html_url)); $("#contributor-list").append(Template.Options.contributor_card(login, "name", avatar_url, html_url));
}); });
} }
}); });

19
js/popup.js
View File

@@ -23,10 +23,10 @@ function setCourseList() {
let { department, number } = separateCourseNameParts(coursename); let { department, number } = separateCourseNameParts(coursename);
let class_length = parseInt(number.charAt(0)); let class_length = parseInt(number.charAt(0));
let multi_semester_code = number.slice(-1); let multi_semester_code = number.slice(-1);
if (["A","B"].includes(multi_semester_code)) { if (["A", "B"].includes(multi_semester_code)) {
hours += Math.floor(class_length/2); hours += Math.floor(class_length / 2);
} else if (["X","Y","Z"].includes(multi_semester_code)) { } else if (["X", "Y", "Z"].includes(multi_semester_code)) {
hours += Math.floor(class_length/3); hours += Math.floor(class_length / 3);
} else { } else {
hours += class_length; hours += class_length;
} }
@@ -59,6 +59,7 @@ function updateConflicts() {
command: "checkConflicts", command: "checkConflicts",
}, },
function (response) { function (response) {
console.log("updateConflicts -> response", response);
if (response.isConflict) { if (response.isConflict) {
var between = response.between; var between = response.between;
let conflict_message = ""; let conflict_message = "";
@@ -310,15 +311,13 @@ function subtractHours(curr_course) {
let curr_course_number = separateCourseNameParts(curr_course.coursename).number; let curr_course_number = separateCourseNameParts(curr_course.coursename).number;
let class_length = parseInt(curr_course_number.charAt(0)); let class_length = parseInt(curr_course_number.charAt(0));
let multi_semester_code = curr_course_number.slice(-1); let multi_semester_code = curr_course_number.slice(-1);
if (["A","B"].includes(multi_semester_code)) { if (["A", "B"].includes(multi_semester_code)) {
$("#meta-metric").text(curr_total_hours - Math.floor(class_length/2)); $("#meta-metric").text(curr_total_hours - Math.floor(class_length / 2));
} else if (["X","Y","Z"].includes(multi_semester_code)) { } else if (["X", "Y", "Z"].includes(multi_semester_code)) {
$("#meta-metric").text(curr_total_hours - Math.floor(class_length/3)); $("#meta-metric").text(curr_total_hours - Math.floor(class_length / 3));
} else { } else {
$("#meta-metric").text(curr_total_hours - class_length); $("#meta-metric").text(curr_total_hours - class_length);
} }
} }
function handleMoreInfo(clicked_item, curr_course) { function handleMoreInfo(clicked_item, curr_course) {

9
manifest.json
View File

@@ -1,12 +1,10 @@
{ {
"manifest_version": 2, "manifest_version": 2,
"name": "UT Registration Plus", "name": "UT Registration Plus",
"version": "1.2.2.6", "version": "1.2.2.7",
"options_page": "options.html", "options_page": "options.html",
"description": "Improves the course registration process at the University of Texas at Austin!", "description": "Improves the course registration process at the University of Texas at Austin!",
"permissions": [ "permissions": [
"tabs",
"declarativeContent",
"storage", "storage",
"*://*.utdirect.utexas.edu/apps/registrar/course_schedule/*", "*://*.utdirect.utexas.edu/apps/registrar/course_schedule/*",
"*://*.utexas.collegescheduler.com/*", "*://*.utexas.collegescheduler.com/*",
@@ -14,11 +12,6 @@
"*://*.registrar.utexas.edu/schedules/*", "*://*.registrar.utexas.edu/schedules/*",
"*://*.login.utexas.edu/login/*" "*://*.login.utexas.edu/login/*"
], ],
"browser_specific_settings": {
"gecko": {
"id": "sghsri@gmail.com"
}
},
"content_scripts": [ "content_scripts": [
{ {
"css": ["css/styles.css"], "css": ["css/styles.css"],