Skip to content

Hotfix/#165 menu deselection #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
itshuey wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Hotfix/#165 menu deselection #170

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9bd1df8
Fixing menu deselection issue
itshuey Sep 9, 2019
55ec9ab
Fixing syntax
itshuey Sep 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion app/views/menu/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
let selectedDay = selectedDayElement.text().trim().toLowerCase();
$('#menu-day-field').val(selectedDay);

// Set the dining hall to fetch menu for
// Set the type of meal to fetch menu for
let selectedMealType = selectedMealTypeElement.text().trim().toLowerCase();
$('#meal-type-field').val(selectedMealType);

Expand Down Expand Up @@ -101,6 +101,22 @@
$(this).removeClass('is-active');
});
$(this).parent().toggleClass('is-active');
day = $(this).parent().text().trim().toLowerCase();

// Fix the meal type if necessary
$('.meal-type-button').parent().each(function() {
if ($(this).attr('class') == 'is-active') {
isWeekend = day == 'saturday' || day == 'sunday';
isBreakfastOrLunch = $(this).attr('id') == 'breakfast-button' || $(this).attr('id') == 'lunch-button';
if (isWeekend && isBreakfastOrLunch) {
$(this).removeClass('is-active');
$('#brunch-button').toggleClass('is-active');
} else if (!isWeekend && $(this).attr('id') == 'brunch-button') {
$(this).removeClass('is-active');
$('#breakfast-button').toggleClass('is-active');
}
}
});

// Submit the form
submitMenuForm();
Expand Down