-
Notifications
You must be signed in to change notification settings - Fork 23
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
Fix schedule + clock for semester 2 #255
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
It may be a good idea to merge this without the latter two to-do items (and splitting those off into a separate issue), given that those two would entail broad structural changes and that we should merge this into master in time for 2.6.3. |
tektaxi
approved these changes
Feb 6, 2021
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Works well for me!
Stop the Study Support block from being counted as a period.
- Update schedule.json to include the new schedule (Monday/Tuesday variation, Wednesday variation, and Thursday/Friday variation) - Use the Monday/Tuesday variation of the new schedule instead of the old schedule (this should be changed to detect the day of the week and act accordingly) - Enable period name detection once again
The day of the week of the current time or the date_override is now used to determine which schedule variant (Mon/Tue, Wed, Thu/Fri) is used as well as whether it is a black day or a silver day. Additionally, the black/silver slider on the schedule tab has been removed.
Instead of having a "Before School" dummy period, make it a real period aligned with the timing of classes that meet before school.
jadebuckwalter
approved these changes
Feb 6, 2021
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request makes some changes to the backend and the frontend to
adapt to the semester 2 schedule. On the backend, it excludes the Study
Support block from being counted as a class so that it can be included
on the frontend. On the frontend, a few changes have been made:
schedule.json
to include the new schedule (Monday/Tuesday,Wednesday, and Thursday/Friday variations)
old schedule
To do:
variation of the schedule as well as black/silver
day-of-week picker
progression of the day as well as how the schedule is displayed on
Aspen (we could draw from
schedule.json
for the order of periods aswell as times)