diff --git a/app/Enums/VacationType.php b/app/Enums/VacationType.php index 1cb4e6b1..bf6b231c 100644 --- a/app/Enums/VacationType.php +++ b/app/Enums/VacationType.php @@ -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 { diff --git a/config/vacation_types.php b/config/vacation_types.php index abf5204b..04a976f1 100644 --- a/config/vacation_types.php +++ b/config/vacation_types.php @@ -51,7 +51,6 @@ EmploymentForm::EmploymentContract, ], VacationTypeConfigRetriever::KEY_REQUEST_ALLOWED_FOR => [ - Role::Employee, Role::Administrator, Role::AdministrativeApprover, Role::TechnicalApprover, diff --git a/tests/Feature/VacationRequestTest.php b/tests/Feature/VacationRequestTest.php index 31537f18..5426c665 100644 --- a/tests/Feature/VacationRequestTest.php +++ b/tests/Feature/VacationRequestTest.php @@ -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"], ]); } @@ -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"], ]); } @@ -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"], ]); } @@ -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"], ]); } @@ -957,8 +956,8 @@ public function testCorrectVacationTypesAreAvailableForCommissionContract(): voi ]) ->assertOk() ->assertJson([ - ["label" => "Nieobecność", "value" => "absence"], ["label" => "Praca zdalna", "value" => "remote_work"], + ["label" => "Nieobecność", "value" => "absence"], ]); } @@ -974,8 +973,8 @@ public function testCorrectVacationTypesAreAvailableForB2bContract(): void ]) ->assertOk() ->assertJson([ - ["label" => "Nieobecność", "value" => "absence"], ["label" => "Praca zdalna", "value" => "remote_work"], + ["label" => "Nieobecność", "value" => "absence"], ]); } @@ -991,8 +990,8 @@ public function testCorrectVacationTypesAreAvailableForBoardMemberContract(): vo ]) ->assertOk() ->assertJson([ - ["label" => "Nieobecność", "value" => "absence"], ["label" => "Praca zdalna", "value" => "remote_work"], + ["label" => "Nieobecność", "value" => "absence"], ]); } }