Skip to content
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 4 commits into from
Feb 6, 2021
Merged

Fix schedule + clock for semester 2 #255

merged 4 commits into from
Feb 6, 2021

Conversation

psvenk
Copy link
Member

@psvenk psvenk commented Feb 6, 2021

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:

  • Update schedule.json to include the new schedule (Monday/Tuesday,
    Wednesday, and Thursday/Friday variations)
  • Use the Monday/Tuesday variation of the new schedule instead of the
    old schedule
  • Re-enable period name detection

To do:

  • Detect the day of the week and use this to select the appropriate
    variation of the schedule as well as black/silver
  • Replace the black/silver slider on the schedule tab with a
    day-of-week picker
  • Change the schedule display to be more in line with the
    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 as
    well as times)

@psvenk psvenk added this to the 2.7.0 milestone Feb 6, 2021
@psvenk psvenk linked an issue Feb 6, 2021 that may be closed by this pull request
@psvenk psvenk modified the milestones: 2.7.0, 2.6.3 Feb 6, 2021
@psvenk psvenk marked this pull request as ready for review February 6, 2021 19:12
@psvenk
Copy link
Member Author

psvenk commented Feb 6, 2021

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.

Copy link
Collaborator

@tektaxi tektaxi left a 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.
@psvenk psvenk merged commit 46ead44 into master Feb 6, 2021
@psvenk psvenk deleted the fix-schedule branch February 6, 2021 21:53
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.

Update clock to match second semester schedule
3 participants