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

ui/schedules: temp sched calendar override button #1857

Merged
merged 25 commits into from
Sep 9, 2021

Conversation

spencerpauly
Copy link
Contributor

@spencerpauly spencerpauly commented Aug 12, 2021

  • Identified the issue which this PR solves.
  • Read the CONTRIBUTING document.
  • Code builds clean without any errors or warnings.
  • Added appropriate tests for any new functionality.
  • All new and existing tests passed.
  • Added comments in the code, where necessary.
  • Ran make check to catch common errors. Fixed any that came up.

Description:
This PR modified the schedule calendar functionality (see pictures) so that it's more clear what changes do. It replaced the temporary schedule button on the upper right of the calendar with an override button. It also replaces the "remove" and "replace" buttons when you click on a shift with a general "override shift" button.

Both these override buttons bring you to a dialog where you can choose the type of override you want to do (including a temp schedule).

Which issue(s) this PR fixes:

Usage: Fixes #<issue number>, or Fixes (paste link of issue).

Out of Scope:
Include any out of scope items here.

Screenshots:
If applicable, add some screenshots here.

New schedule buttons (override and override shift buttons):
Screen Shot 2021-08-16 at 1 11 58 PM

After clicking "override shift":
Screen Shot 2021-09-09 at 11 30 21 AM

After clicking "override":
Screen Shot 2021-09-09 at 11 30 38 AM

Describe any introduced user-facing changes:

  • "Remove" and "replace" buttons when overriding a shift are now replaced with a general "override" button
  • "Temporary shift" button on calendar replaced with an "override" button

Describe any introduced API changes:
If introducing any API changes, provide a clear description of them.

Additional Info:
Any additional information or context.

@spencerpauly spencerpauly marked this pull request as ready for review August 17, 2021 14:57
@spencerpauly
Copy link
Contributor Author

spencerpauly commented Aug 19, 2021

Working on some changes right now. I thought I ran the cypress tests before making original PR but didn't 😮 .

@spencerpauly spencerpauly marked this pull request as draft August 19, 2021 20:39
@spencerpauly spencerpauly marked this pull request as ready for review August 20, 2021 15:04
Copy link
Contributor

@dctalbot dctalbot left a comment

Choose a reason for hiding this comment

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

Nice progress! One more thing we need to do is disable to "replaced user" field when doing a replace/remove override. Left some suggestions for how we could achieve that.

Also, if you're interested in converting some of the new files into typescript, that could be great for keeping our component props interfaces clean and minimal.

dctalbot
dctalbot previously approved these changes Sep 8, 2021
dctalbot
dctalbot previously approved these changes Sep 8, 2021
@spencerpauly spencerpauly merged commit b0fe4e4 into master Sep 9, 2021
@spencerpauly spencerpauly deleted the temp-sched-calendar-override branch September 9, 2021 18:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants