fixed bug with isConflict

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

View File

@@ -257,7 +257,7 @@ function checkConflicts(sendResponse) {
}
}
sendResponse({
isConflict: conflicts.length === 0,
isConflict: conflicts.length !== 0,
between: conflicts.length ? conflicts : undefined,
});
});

View File

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

View File

@@ -59,6 +59,7 @@ function updateConflicts() {
command: "checkConflicts",
},
function (response) {
console.log("updateConflicts -> response", response);
if (response.isConflict) {
var between = response.between;
let conflict_message = "";
@@ -317,8 +318,6 @@ function subtractHours(curr_course) {
} else {
$("#meta-metric").text(curr_total_hours - class_length);
}
}
function handleMoreInfo(clicked_item, curr_course) {