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

#444 - overtime application process #447

Merged
merged 18 commits into from
Jul 4, 2024
Merged

Conversation

kamilpiech97
Copy link
Member

@kamilpiech97 kamilpiech97 commented Jun 6, 2024

Connected with #444.

Added the ability to add an overtime application, where the employee can add the date and time from and to, type of preferred overtime settlement. Added tests.

Preview:

Screencast.from.10-06-24.13.47.25.webm

@kamilpiech97 kamilpiech97 marked this pull request as ready for review June 10, 2024 11:48
@kamilpiech97 kamilpiech97 requested a review from a team as a code owner June 10, 2024 11:48
@kamilpiech97 kamilpiech97 changed the title #444 - overtime create form #444 - overtime application process Jun 10, 2024
app/Actions/OvertimeRequest/AcceptAsTechnicalAction.php Outdated Show resolved Hide resolved
app/Domain/OvertimeCalculator.php Outdated Show resolved Hide resolved
app/Enums/SettlementType.php Outdated Show resolved Hide resolved
app/Http/Controllers/OvertimeRequestController.php Outdated Show resolved Hide resolved
app/Http/Resources/OvertimeRequestResource.php Outdated Show resolved Hide resolved
Copy link
Member

@EwelinaSkrzypacz EwelinaSkrzypacz left a comment

Choose a reason for hiding this comment

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

  1. When I create an overtime request, the number of hours is always 0 (when I use localhost address, because when I'm using http://toby.blumilk.localhost/overtime/requests/create it is fine

image

  1. Please fix this validation massage, because it's a bit unclear.

image

  1. For me default time it's shouldn't be midnight - I think that most of overtime is afternoon, so maybe it should be like 16:00? Or 15:00?

  2. As an administrator, I don't think we need "Moje nadgodziny" - maybe just do like we have requests? I mean we have just "Requests".

image

  1. Date format - in all appliction we have dd.mm.yyy

image

  1. As an employee should I be able to add overtime request, when I have pending/accepted vacation?

  2. I think we should add here counter, when user has some overtime to accept

image

  1. "Rozliczenie nadgodzin oznaczy nadgodziny jako rozliczone." - can we write this somehow different?

  2. I think that admin should have possibility to cancel settled overtime; just in case - like we have canceling approved vacation requests.

  3. Now numeration for overtime and requests looks the same. Maybe we should distinguish it somehow?

  4. As I understand accepting/declining overtime in Slack will be implemented in another pr? If so, please create issue for that or at least add comment in issue - I don't want to forget about it.

  5. For now, as an administrative approver I can accept overtime. I thought that only technical approver/admin can do that.

@kamilpiech97
Copy link
Member Author

  1. When I create an overtime request, the number of hours is always 0 (when I use localhost address, because when I'm using http://toby.blumilk.localhost/overtime/requests/create it is fine

image

  1. Please fix this validation massage, because it's a bit unclear.

image

  1. For me default time it's shouldn't be midnight - I think that most of overtime is afternoon, so maybe it should be like 16:00? Or 15:00?
  2. As an administrator, I don't think we need "Moje nadgodziny" - maybe just do like we have requests? I mean we have just "Requests".

image

  1. Date format - in all appliction we have dd.mm.yyy

image

  1. As an employee should I be able to add overtime request, when I have pending/accepted vacation?
  2. I think we should add here counter, when user has some overtime to accept

image

  1. "Rozliczenie nadgodzin oznaczy nadgodziny jako rozliczone." - can we write this somehow different?
  2. I think that admin should have possibility to cancel settled overtime; just in case - like we have canceling approved vacation requests.
  3. Now numeration for overtime and requests looks the same. Maybe we should distinguish it somehow?
  4. As I understand accepting/declining overtime in Slack will be implemented in another pr? If so, please create issue for that or at least add comment in issue - I don't want to forget about it.
  5. For now, as an administrative approver I can accept overtime. I thought that only technical approver/admin can do that.
  1. Lets create issue for that.
  2. fixed
  3. I will stay with that
  4. Fixed
  5. Fixed
  6. Let's ask Kamila but AFAIK we do not want create compliated valdation for overtime process
  7. Added
  8. Fixed
  9. Added
  10. Changed
  11. In next PR
  12. I will stay with that

Copy link
Member

@EwelinaSkrzypacz EwelinaSkrzypacz left a comment

Choose a reason for hiding this comment

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

When I logged as an employee and click "Moje nadgodziny" I see error:

image

@kamilpiech97
Copy link
Member Author

When I logged as an employee and click "Moje nadgodziny" I see error:

image

Run seeder?

Copy link
Member

@EwelinaSkrzypacz EwelinaSkrzypacz left a comment

Choose a reason for hiding this comment

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

  1. As a employee I can settle overtime. Is it okay for us?
  2. When I click "Moje nadgodziny" in menu and click button "Dodaj wniosek" (so I'm on the page with creating overtime) on the menu the text "Moje nadgodziny" is not highlighted - in requests it is.
  3. So, when I have settled overtime for example 19.06.2024 15:00 - 19.06.2024 17:00, I can create another overtime 19.06.2024 16:00 - 19.06.2024 18:00. Is this okay for us?

@kamilpiech97
Copy link
Member Author

  1. As a employee I can settle overtime. Is it okay for us?
  2. When I click "Moje nadgodziny" in menu and click button "Dodaj wniosek" (so I'm on the page with creating overtime) on the menu the text "Moje nadgodziny" is not highlighted - in requests it is.
  3. So, when I have settled overtime for example 19.06.2024 15:00 - 19.06.2024 17:00, I can create another overtime 19.06.2024 16:00 - 19.06.2024 18:00. Is this okay for us?
  1. yep
  2. fixed
  3. fixed, added edge cases

krzysztofrewak
krzysztofrewak previously approved these changes Jul 3, 2024
@kamilpiech97 kamilpiech97 merged commit 2dbcb2e into main Jul 4, 2024
3 checks passed
@kamilpiech97 kamilpiech97 deleted the #444-overtime-request branch July 4, 2024 05:15
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.

3 participants