Merge pull request #22 from omajoshi/master
This commit is contained in:
@@ -213,9 +213,6 @@ function updateListConflictHighlighting(start = 0) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function updateTextHighlighting(tds, canHighlight, isConflict, alreadyContains, conflictList, row, unique) {
|
function updateTextHighlighting(tds, canHighlight, isConflict, alreadyContains, conflictList, row, unique) {
|
||||||
if(conflictList.length){
|
|
||||||
console.log(conflictList);
|
|
||||||
}
|
|
||||||
conflict_texts = row.find('.tooltiptext');
|
conflict_texts = row.find('.tooltiptext');
|
||||||
let unique_list = conflictList.filter(function(course){
|
let unique_list = conflictList.filter(function(course){
|
||||||
if(course.unique != unique){
|
if(course.unique != unique){
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ $(function () {
|
|||||||
sem = waitlist ? $('[name="s_ccyys"]').val() : $("option[selected='selected']").val();
|
sem = waitlist ? $('[name="s_ccyys"]').val() : $("option[selected='selected']").val();
|
||||||
if (waitlist) {
|
if (waitlist) {
|
||||||
$("[href='#top']").before(Template.Import.import_button());
|
$("[href='#top']").before(Template.Import.import_button());
|
||||||
$("[name='wl_see_my_waitlists']").before(Template.import.store_waitlist_message());
|
$("[name='wl_see_my_waitlists']").before(Template.Import.store_waitlist_message());
|
||||||
$("[name='wl_see_my_waitlists']").after(Template.Import.waitlist_import_button());
|
$("[name='wl_see_my_waitlists']").after(Template.Import.waitlist_import_button());
|
||||||
extractWaitlistInfo();
|
extractWaitlistInfo();
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user