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

bug/265 - enable working hour function and issue/272 - new UI for setting page to work with working hour function #279

Merged
merged 15 commits into from
Apr 25, 2020

Conversation

brianzhang310
Copy link
Contributor

@brianzhang310 brianzhang310 commented Apr 22, 2020

  • The pull request is complete according to the following criteria:
    • Acceptance criteria have been met
    • The documentation is kept up-to-date
    • Comprehensive tests (if applicable) have been generated and all pass.
    • The pull request describes the changes that have been made, and enough information is present in the description for any developer to understand what has changed
    • Commits have been squashed (or will be on merge).
    • The branch name is descriptive and follows the pull request title format : {issue/bug...}/(Issue Number) - Name of issue. E.g bug/30-Fix-Project
    • The pull request title is of the following format : {issue/bug...}/(Issue Number) - Name of issue. E.g bug/30-Fix-Project
    • The description uses github syntax to link to the issue. E,g Resolves se701g2/Doto#{Number}
    • At least two reviewers assigned. One of which must be the assigner of the issue.
    • If there are merge conflicts, run git rebase as opposed to git merge with master.

@brianzhang310
Copy link
Contributor Author

A little summary

  1. bug/265, added a TaskShifter class which re-writes the start-time and end-time of tasks to make sure every task is managed in working time
  2. issue/272, made some changes on setting page. now, you can see there is a save button to save the changes in working hours. If users don't save changes or quit the setting page without saving it, the working hour won't be saved.

Copy link
Contributor

@TCHE614 TCHE614 left a comment

Choose a reason for hiding this comment

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

Tested locally no errors on my side, LGTM.

@DeshmukhChinmay DeshmukhChinmay self-requested a review April 25, 2020 02:41
Copy link
Contributor

@DeshmukhChinmay DeshmukhChinmay left a comment

Choose a reason for hiding this comment

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

Thanks for making the changes from the comments. Tested out locally and the tasks get reallocated when the working hours are changed.

@Matteas-Eden Matteas-Eden added bug Something isn't working frontend labels Apr 25, 2020
@brianzhang310 brianzhang310 merged commit a4e9d97 into se701g2:master Apr 25, 2020
@brianzhang310
Copy link
Contributor Author

@all-contributors please add @brianzhang310 for code, review, doc

@allcontributors
Copy link
Contributor

@brianzhang310

I've put up a pull request to add @brianzhang310! 🎉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working frontend
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add a save button and popup window when change the settings acting hours doesn't work
4 participants