Skip to content

- prevent employee for creating time in lieu request #534

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.

Sign up for GitHub

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

Merged
EwelinaSkrzypacz merged 3 commits into from
Aug 20, 2025
Merged

- prevent employee for creating time in lieu request #534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e4ab77
- prevent employee to create time in lieu request
EwelinaSkrzypacz Aug 11, 2025
8a5bccf
- fix test
EwelinaSkrzypacz Aug 11, 2025
ee86ce4
- change vacation type order in create a vacation request form
EwelinaSkrzypacz Aug 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions app/Enums/VacationType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@

enum VacationType: string
{
case RemoteWork = "remote_work";
case Absence = "absence";
case Vacation = "vacation";
case OnRequest = "vacation_on_request";
case Sick = "sick_vacation";
case Special = "special_vacation";
case Childcare = "childcare_vacation";
case Training = "training_vacation";
case Delegation = "delegation";
case TimeInLieu = "time_in_lieu";
case Unpaid = "unpaid_vacation";
case OnRequest = "vacation_on_request";
case Training = "training_vacation";
case Childcare = "childcare_vacation";
case Volunteering = "volunteering_vacation";
case TimeInLieu = "time_in_lieu";
case Sick = "sick_vacation";
case Absence = "absence";
case RemoteWork = "remote_work";
case Delegation = "delegation";

public static function casesToSelect(): array
{
Expand Down
1 change: 0 additions & 1 deletion config/vacation_types.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
EmploymentForm::EmploymentContract,
],
VacationTypeConfigRetriever::KEY_REQUEST_ALLOWED_FOR => [
Role::Employee,
Role::Administrator,
Role::AdministrativeApprover,
Role::TechnicalApprover,
Expand Down
57 changes: 28 additions & 29 deletions tests/Feature/VacationRequestTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -852,16 +852,15 @@ public function testCorrectVacationTypesAreAvailableForEmployee(): void
])
->assertOk()
->assertJson([
["label" => "Praca zdalna", "value" => "remote_work"],
["label" => "Urlop wypoczynkowy", "value" => "vacation"],
["label" => "Urlop na żądanie", "value" => "vacation_on_request"],
["label" => "Zwolnienie lekarskie", "value" => "sick_vacation"],
["label" => "Urlop okolicznościowy", "value" => "special_vacation"],
["label" => "Opieka nad dzieckiem (art. 188 kp)", "value" => "childcare_vacation"],
["label" => "Urlop szkoleniowy", "value" => "training_vacation"],
["label" => "Urlop bezpłatny", "value" => "unpaid_vacation"],
["label" => "Urlop na żądanie", "value" => "vacation_on_request"],
["label" => "Urlop szkoleniowy", "value" => "training_vacation"],
["label" => "Opieka nad dzieckiem (art. 188 kp)", "value" => "childcare_vacation"],
["label" => "Wolontariat", "value" => "volunteering_vacation"],
["label" => "Odbiór za święto", "value" => "time_in_lieu"],
["label" => "Zwolnienie lekarskie", "value" => "sick_vacation"],
["label" => "Praca zdalna", "value" => "remote_work"],
]);
}

Expand All @@ -878,16 +877,16 @@ public function testCorrectVacationTypesAreAvailableForTechnicalApprover(): void
])
->assertOk()
->assertJson([
["label" => "Praca zdalna", "value" => "remote_work"],
["label" => "Urlop wypoczynkowy", "value" => "vacation"],
["label" => "Urlop na żądanie", "value" => "vacation_on_request"],
["label" => "Zwolnienie lekarskie", "value" => "sick_vacation"],
["label" => "Urlop okolicznościowy", "value" => "special_vacation"],
["label" => "Opieka nad dzieckiem (art. 188 kp)", "value" => "childcare_vacation"],
["label" => "Urlop szkoleniowy", "value" => "training_vacation"],
["label" => "Odbiór za święto", "value" => "time_in_lieu"],
["label" => "Urlop bezpłatny", "value" => "unpaid_vacation"],
["label" => "Urlop na żądanie", "value" => "vacation_on_request"],
["label" => "Urlop szkoleniowy", "value" => "training_vacation"],
["label" => "Opieka nad dzieckiem (art. 188 kp)", "value" => "childcare_vacation"],
["label" => "Wolontariat", "value" => "volunteering_vacation"],
["label" => "Odbiór za święto", "value" => "time_in_lieu"],
["label" => "Zwolnienie lekarskie", "value" => "sick_vacation"],
["label" => "Praca zdalna", "value" => "remote_work"],
]);
}

Expand All @@ -904,17 +903,17 @@ public function testCorrectVacationTypesAreAvailableForAdministrativeApprover():
])
->assertOk()
->assertJson([
["label" => "Praca zdalna", "value" => "remote_work"],
["label" => "Urlop wypoczynkowy", "value" => "vacation"],
["label" => "Urlop na żądanie", "value" => "vacation_on_request"],
["label" => "Zwolnienie lekarskie", "value" => "sick_vacation"],
["label" => "Urlop okolicznościowy", "value" => "special_vacation"],
["label" => "Opieka nad dzieckiem (art. 188 kp)", "value" => "childcare_vacation"],
["label" => "Urlop szkoleniowy", "value" => "training_vacation"],
["label" => "Delegacja", "value" => "delegation"],
["label" => "Odbiór za święto", "value" => "time_in_lieu"],
["label" => "Urlop bezpłatny", "value" => "unpaid_vacation"],
["label" => "Urlop na żądanie", "value" => "vacation_on_request"],
["label" => "Urlop szkoleniowy", "value" => "training_vacation"],
["label" => "Opieka nad dzieckiem (art. 188 kp)", "value" => "childcare_vacation"],
["label" => "Wolontariat", "value" => "volunteering_vacation"],
["label" => "Odbiór za święto", "value" => "time_in_lieu"],
["label" => "Zwolnienie lekarskie", "value" => "sick_vacation"],
["label" => "Praca zdalna", "value" => "remote_work"],
["label" => "Delegacja", "value" => "delegation"],
]);
}

Expand All @@ -931,17 +930,17 @@ public function testCorrectVacationTypesAreAvailableForAdmin(): void
])
->assertOk()
->assertJson([
["label" => "Praca zdalna", "value" => "remote_work"],
["label" => "Urlop wypoczynkowy", "value" => "vacation"],
["label" => "Urlop na żądanie", "value" => "vacation_on_request"],
["label" => "Zwolnienie lekarskie", "value" => "sick_vacation"],
["label" => "Urlop okolicznościowy", "value" => "special_vacation"],
["label" => "Opieka nad dzieckiem (art. 188 kp)", "value" => "childcare_vacation"],
["label" => "Urlop szkoleniowy", "value" => "training_vacation"],
["label" => "Delegacja", "value" => "delegation"],
["label" => "Odbiór za święto", "value" => "time_in_lieu"],
["label" => "Urlop bezpłatny", "value" => "unpaid_vacation"],
["label" => "Urlop na żądanie", "value" => "vacation_on_request"],
["label" => "Urlop szkoleniowy", "value" => "training_vacation"],
["label" => "Opieka nad dzieckiem (art. 188 kp)", "value" => "childcare_vacation"],
["label" => "Wolontariat", "value" => "volunteering_vacation"],
["label" => "Odbiór za święto", "value" => "time_in_lieu"],
["label" => "Zwolnienie lekarskie", "value" => "sick_vacation"],
["label" => "Praca zdalna", "value" => "remote_work"],
["label" => "Delegacja", "value" => "delegation"],
]);
}

Expand All @@ -957,8 +956,8 @@ public function testCorrectVacationTypesAreAvailableForCommissionContract(): voi
])
->assertOk()
->assertJson([
["label" => "Nieobecność", "value" => "absence"],
["label" => "Praca zdalna", "value" => "remote_work"],
["label" => "Nieobecność", "value" => "absence"],
]);
}

Expand All @@ -974,8 +973,8 @@ public function testCorrectVacationTypesAreAvailableForB2bContract(): void
])
->assertOk()
->assertJson([
["label" => "Nieobecność", "value" => "absence"],
["label" => "Praca zdalna", "value" => "remote_work"],
["label" => "Nieobecność", "value" => "absence"],
]);
}

Expand All @@ -991,8 +990,8 @@ public function testCorrectVacationTypesAreAvailableForBoardMemberContract(): vo
])
->assertOk()
->assertJson([
["label" => "Nieobecność", "value" => "absence"],
["label" => "Praca zdalna", "value" => "remote_work"],
["label" => "Nieobecność", "value" => "absence"],
]);
}
}