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

feat(timetable): restore customizable timetables #3483

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

Conversation

zwliew
Copy link
Member

@zwliew zwliew commented Aug 4, 2023

Context

This brings back PRs #3420 and #3434, which were reverted as part of PR #3435.

This re-resolves issue #3404.

Implementation

The original schema migration is faulty, so I added a minor fix for that.

Other Information

TODOs:

  1. Some tests would be good.
  2. Hide in exam schedule.
  3. Add a tally for how many course units are customized.
  4. Deconflict activeLessons and customiseModule in the app state.

@vercel
Copy link

vercel bot commented Aug 4, 2023

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
nusmods-export ✅ Ready (Inspect) Visit Preview 💬 Add feedback Aug 11, 2023 1:01pm
nusmods-website ✅ Ready (Inspect) Visit Preview 💬 Add feedback Aug 11, 2023 1:01pm

@codecov
Copy link

codecov bot commented Aug 4, 2023

Codecov Report

Patch coverage: 45.45% and project coverage change: -0.21% ⚠️

Comparison is base (71f0fbd) 53.22% compared to head (551c8e1) 53.01%.
Report is 2 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #3483      +/-   ##
==========================================
- Coverage   53.22%   53.01%   -0.21%     
==========================================
  Files         271      271              
  Lines        5860     5964     +104     
  Branches     1398     1436      +38     
==========================================
+ Hits         3119     3162      +43     
- Misses       2741     2802      +61     
Files Changed Coverage Δ
website/src/reducers/app.ts 80.64% <0.00%> (-5.57%) ⬇️
website/src/types/reducers.ts 100.00% <ø> (ø)
...c/views/components/module-info/LessonTimetable.tsx 85.71% <ø> (ø)
website/src/views/settings/BetaToggle.tsx 0.00% <0.00%> (ø)
website/src/views/settings/SettingsContainer.tsx 0.00% <ø> (ø)
website/src/views/tetris/TetrisGame.tsx 0.00% <ø> (ø)
website/src/views/timetable/Timetable.tsx 93.54% <ø> (ø)
website/src/views/timetable/TimetableDay.tsx 55.00% <ø> (ø)
website/src/views/timetable/TimetableRow.tsx 94.73% <ø> (ø)
website/src/views/venues/VenueDetails.tsx 9.09% <ø> (ø)
... and 7 more

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

zhoukerrr and others added 6 commits August 10, 2023 21:14
* feat: update lesson to array

* chore: fix lint

* fix: update test cases

* chore: format lint

* chore: update test cases

* feat: update timetable redux schema

* feat: fix lint

* chore: fix lint

* chore: add timetable schema migration test

* fix: add comment for test version

---------

Co-authored-by: Christopher Goh <chrisgzf@gmail.com>
* feat: fix lint

* feat: add customise module button

* feat: add redux actions

* feat: connect button to redux action

* feat: enter and edit module

* feat: exit customising state

* cahnge customisemod default state to empty string

* feat: add timetable state for custimised mods

* feat: remove validation for custom mods

* feat: add TA label to cells

* feat: hide and disable other edit buttons when editing

* feat: add support for changing lessons after customisation

* chore: fix test cases

* chore: fox lint

* chore: fix schema migration test
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.

2 participants