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

fixed bug with isConflict

Browse Source
This commit is contained in:
sghsri
2021-10-17 15:29:25 -05:00
parent f4aebd4050
commit 7ffa96ebab
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/background.js
View File

@@ -257,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) {