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

Add overtime #444

Closed
EwelinaSkrzypacz opened this issue Jun 3, 2024 · 2 comments · Fixed by #463
Closed

Add overtime #444

EwelinaSkrzypacz opened this issue Jun 3, 2024 · 2 comments · Fixed by #463
Labels
feature new feature to implement

Comments

@EwelinaSkrzypacz
Copy link
Member

EwelinaSkrzypacz commented Jun 3, 2024

So, employees sometimes have overtime and such information is important for HR as it affects payouts.
As an employee I want to create some kind of "overtime request" - in the form it should be information like when, what time it starts, what time it ends, non editable field with number of hours. It will be useful to see list of all my overtimes.
As a technical approver/admin I want to approve/refuse overtime. When I accept it, the administrative approve can see this. Also I want to accept/refuse on Slack. Also I want to see list of all overtimes.
As a administrative approver/admin I want to see accepted overtimes - like in .csv file? Or maybe we can merge somehow file with working hours report? Or just make list with all overtimes and on the top on the page will be button to download accepted overtimes?

@EwelinaSkrzypacz EwelinaSkrzypacz added the feature new feature to implement label Jun 3, 2024
@EwelinaSkrzypacz EwelinaSkrzypacz added this to the M3: Post-first deploy milestone Jun 3, 2024
@kamilpiech97
Copy link
Member

kamilpiech97 commented Jun 5, 2024

Should be clarified with Kamila:

  1. how should be generated reports of overtime (maybe like CSV with working hours per moth for all employes)?
  2. should overtime have field with information about how overtime should be settled?
  3. overtime hours paid should be recognized in some way?
  4. edge cases like limit of overtime or what about overtime on turn of the years/months?
  5. precision of overtime hours/minutes?

@kamilpiech97
Copy link
Member

kamilpiech97 commented Jun 6, 2024

Should be clarified with Kamila:

  1. how should be generated reports of overtime (maybe like CSV with working hours per moth for all employes) - tak jak w godiznach
  2. should overtime have field with information about how overtime should be settled - ma być opcja kasa albo czas
  3. overtime hours paid should be recognized in some way - można to jakoś statusować
  4. edge cases like limit of overtime or what about overtime on turn of the years/months - nie utrudniamy
  5. precision of overtime hours/minutes - co do godzin

After discuss with Kamila, I have answers:

  1. Like in CSV with working hours per moth for all employes
  2. Overtime should have option to choose - money or overtime to be collected from working time
  3. We should add status for overtime settled
  4. It should be done in a simple way without hundreds of cases to handle
  5. Hours precision.

kamilpiech97 added a commit that referenced this issue Jun 10, 2024
kamilpiech97 added a commit that referenced this issue Jun 10, 2024
kamilpiech97 added a commit that referenced this issue Jun 10, 2024
kamilpiech97 added a commit that referenced this issue Jun 10, 2024
kamilpiech97 added a commit that referenced this issue Jun 14, 2024
kamilpiech97 added a commit that referenced this issue Jun 19, 2024
kamilpiech97 added a commit that referenced this issue Jun 19, 2024
kamilpiech97 added a commit that referenced this issue Jun 19, 2024
kamilpiech97 added a commit that referenced this issue Jun 20, 2024
kamilpiech97 added a commit that referenced this issue Jun 20, 2024
kamilpiech97 added a commit that referenced this issue Jul 4, 2024
* #444 - wip: added models and create form for overtime requests

* #444 - wip: added full workflow for overtime

* #444 - fixes

* #444 - added tests

* #444 - fix

* #444 - fixes and added policies

* - fixes

* Update app/Enums/SettlementType.php

Co-authored-by: Krzysztof Rewak <[email protected]>

* - cr fixes

* #444 - cr fixes

* #444 - feat: cr fixes, added permissions

* #444 - cr fixes

* #444 - cr fixes

* #444 - cr fixes

* #444 - added more tests

* #444 - fixes connected with caching queries

---------

Co-authored-by: Krzysztof Rewak <[email protected]>
kamilpiech97 added a commit that referenced this issue Jul 4, 2024
# Conflicts:
#	app/Helpers/DateFormats.php
#	app/Http/Controllers/OvertimeRequestController.php
#	app/Http/Controllers/VacationRequestController.php
#	app/Http/Resources/OvertimeRequestResource.php
#	app/Models/OvertimeRequest.php
#	app/Observers/OvertimeRequestObserver.php
#	app/Observers/VacationRequestObserver.php
#	app/Policies/OvertimeRequestPolicy.php
#	app/States/OvertimeRequest/OvertimeRequestState.php
#	app/Validation/Rules/OvertimeRequest/NoPendingOvertimeRequestInRange.php
#	resources/js/Pages/OvertimeRequest/Create.vue
#	resources/js/Pages/OvertimeRequest/Index.vue
#	resources/js/Pages/OvertimeRequest/Show.vue
#	resources/js/Shared/MainMenu.vue
#	routes/web.php
#	tests/Feature/OvertimeRequestTest.php
kamilpiech97 added a commit that referenced this issue Jul 4, 2024
kamilpiech97 added a commit that referenced this issue Jul 4, 2024
* #444 - wip: added models and create form for overtime requests

* #444 - wip: added full workflow for overtime

* #444 - fixes

* #444 - added tests

* #444 - fix

* #444 - fixes and added policies

* - fixes

* Update app/Enums/SettlementType.php

Co-authored-by: Krzysztof Rewak <[email protected]>

* - cr fixes

* #444 - added overtime report in Excel file for administrator

* #444 - fixes

* #444 - csf

* #444 - fix: fixed button and route for generating overtime reports

* #444 - fix: fixed 'anuluj' button link

---------

Co-authored-by: Krzysztof Rewak <[email protected]>
EwelinaSkrzypacz added a commit that referenced this issue Jul 10, 2024
EwelinaSkrzypacz added a commit that referenced this issue Jul 12, 2024
EwelinaSkrzypacz added a commit that referenced this issue Jul 12, 2024
EwelinaSkrzypacz added a commit that referenced this issue Jul 15, 2024
EwelinaSkrzypacz added a commit that referenced this issue Jul 24, 2024
EwelinaSkrzypacz added a commit that referenced this issue Jul 25, 2024
* - Update dependency blumilksoftware/codestyle to v3

* #444 - wip

---------

Co-authored-by: EwelinaSkrzypacz <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
feature new feature to implement
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants