Skip to content

Add support for May-June 2021 schedule #294

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.

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

Merged
merged 13 commits into from
May 7, 2021
Merged

Add support for May-June 2021 schedule #294

merged 13 commits into from
May 7, 2021

Conversation

psvenk
Copy link
Member

@psvenk psvenk commented Apr 12, 2021

Fixes #288. This pull request adds support for the anticipated schedule for May and June 2021. Please note that the current support is preliminary and needs changes in the code.

@psvenk psvenk added this to the 2.8.0 milestone Apr 12, 2021
@psvenk psvenk marked this pull request as ready for review April 29, 2021 12:50
@psvenk
Copy link
Member Author

psvenk commented Apr 29, 2021

I think this should be ready for review (and hopefully merge). As far as I remember, the only omission here is that lunch guessing has not been incorporated yet. Because we do not yet have information about how lunches will be assigned, we can address that in a separate pull request (to close #95) and merge this for now (which defaults to lunch A).

I'm not sure if this uses localStorage to store the user's lunch; someone (possibly me) should test that.

@jadebuckwalter
Copy link
Collaborator

@psvenk We could temporarily create a lunch slider where people can choose between lunch A and lunch B (like in the past), but that might not be necessary if we implement lunch guessing as soon as we know how lunches are being assigned.

Also, since Wednesdays alternate between black and silver, how should we take that into account? Maybe instead of determining whether it's a black or silver week, we just display both classes (if there are different classes for black and silver days) in Wednesday's schedule and clock. We could also hard-code for the remainder of the year, but that's not the best solution.

psvenk added 6 commits May 4, 2021 20:21
Makes navigation easier in Vim (and possibly other editors)
Re-introduce the lunch slider and make the update_lunch function work
properly
Reflect the fact that the new schedule has only two lunches in the lunch
slider.
Instead of initially loading a lunch-agnostic schedule but showing lunch
A as selected in the slider, choose lunch A by default. This should be
changed to code that guesses the student's lunch.
In accordance with recent changes from the school to make sure that all
blocks are 50 minutes long on Wednesdays (block 1 was 45 minutes long).
Move the lunch slider from the clock to the schedule tab and align it
with the day of the week dropdown. I also made it a bit smaller.
@jadebuckwalter jadebuckwalter linked an issue May 7, 2021 that may be closed by this pull request
psvenk added 2 commits May 6, 2021 22:11
Prevent a race condition that causes the potentially confusing
lunch-agnostic schedule to display instead of lunch A by default.
In accordance with the new lunch A and lunch B assignments for the rest
of the year. Also make sure that the slider is updated accordingly when
a lunch is determined based on the period 3 class.
@psvenk psvenk linked an issue May 7, 2021 that may be closed by this pull request
2 tasks
@psvenk psvenk mentioned this pull request May 7, 2021
2 tasks
psvenk and others added 2 commits May 6, 2021 22:37
We cannot possibly handle all of the irregular schedules over the next
several weeks; luckily, Ms. Yu has come to the rescue and made this
helpful document.
Hopefully this will clear up some confusion even if the schedule doesn't
adapt accordingly.
@psvenk psvenk requested review from jadebuckwalter and tektaxi May 7, 2021 03:10
psvenk added 2 commits May 7, 2021 00:22
Make the colors more adaptive for dark mode.
Copy link
Collaborator

@jadebuckwalter jadebuckwalter left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

@jadebuckwalter jadebuckwalter merged commit d4161e9 into master May 7, 2021
@jadebuckwalter jadebuckwalter deleted the new-schedule branch May 7, 2021 11:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Move lunch switch Add support for anticipated (early May) schedule Figure out what lunch students have
2 participants