From 227e44a23defb77742885e23653a93ac4350224c Mon Sep 17 00:00:00 2001 From: EwelinaSkrzypacz Date: Thu, 29 Oct 2026 13:38:30 +0100 Subject: [PATCH] - add maternity leave --- app/Enums/VacationType.php | 1 + config/vacation_types.php | 17 +++++++++++++++++ lang/pl.json | 1 + resources/js/Composables/vacationTypeInfo.js | 8 ++++++++ tests/Feature/VacationRequestTest.php | 5 +++++ 5 files changed, 32 insertions(+) diff --git a/app/Enums/VacationType.php b/app/Enums/VacationType.php index 8b0a2858..d9803c2a 100644 --- a/app/Enums/VacationType.php +++ b/app/Enums/VacationType.php @@ -19,6 +19,7 @@ enum VacationType: string case Training = "training_vacation"; case Childcare = "childcare_vacation"; case PaternityLeave = "paternity_leave"; + case MaternityLeave = "maternity_leave"; case Volunteering = "volunteering_vacation"; case BloodDonation = "blood_donation_vacation"; case Absence = "absence"; diff --git a/config/vacation_types.php b/config/vacation_types.php index 286f2d11..f7a85083 100644 --- a/config/vacation_types.php +++ b/config/vacation_types.php @@ -160,6 +160,23 @@ VacationTypeConfigRetriever::KEY_IS_VACATION => true, VacationTypeConfigRetriever::KEY_DURING_NON_WORKDAYS => true, ], + VacationType::MaternityLeave->value => [ + VacationTypeConfigRetriever::KEY_TECHNICAL_APPROVAL => true, + VacationTypeConfigRetriever::KEY_ADMINISTRATIVE_APPROVAL => true, + VacationTypeConfigRetriever::KEY_BILLABLE => true, + VacationTypeConfigRetriever::KEY_HAS_LIMIT => false, + VacationTypeConfigRetriever::KEY_AVAILABLE_FOR => [ + EmploymentForm::EmploymentContract, + ], + VacationTypeConfigRetriever::KEY_REQUEST_ALLOWED_FOR => [ + Role::Employee, + Role::Administrator, + Role::AdministrativeApprover, + Role::TechnicalApprover, + ], + VacationTypeConfigRetriever::KEY_IS_VACATION => true, + VacationTypeConfigRetriever::KEY_DURING_NON_WORKDAYS => true, + ], VacationType::Training->value => [ VacationTypeConfigRetriever::KEY_TECHNICAL_APPROVAL => true, VacationTypeConfigRetriever::KEY_ADMINISTRATIVE_APPROVAL => true, diff --git a/lang/pl.json b/lang/pl.json index 048d515d..cef32647 100644 --- a/lang/pl.json +++ b/lang/pl.json @@ -12,6 +12,7 @@ "special_vacation": "Urlop okolicznościowy", "childcare_vacation": "Opieka nad dzieckiem (art. 188 kp)", "paternity_leave": "Urlop ojcowski", + "maternity_leave": "Urlop macierzyński", "training_vacation": "Urlop szkoleniowy", "unpaid_vacation": "Urlop bezpłatny", "volunteering_vacation": "Wolontariat", diff --git a/resources/js/Composables/vacationTypeInfo.js b/resources/js/Composables/vacationTypeInfo.js index 5bec616e..d6b31ef3 100644 --- a/resources/js/Composables/vacationTypeInfo.js +++ b/resources/js/Composables/vacationTypeInfo.js @@ -13,6 +13,7 @@ import PlusIcon from 'vue-material-design-icons/Plus.vue' import PlaneTrainIcon from 'vue-material-design-icons/PlaneTrain.vue' import WaterPlusIcon from 'vue-material-design-icons/WaterPlus.vue' import HumanMaleChildIcon from 'vue-material-design-icons/HumanMaleChild.vue' +import HumanFemaleGirlIcon from 'vue-material-design-icons/HumanFemaleGirl.vue' const types = [ { @@ -50,6 +51,13 @@ const types = [ color: 'text-purple-800', border: 'border-purple-800', }, + { + text: 'Urlop macierzyński', + value: 'maternity_leave', + icon: HumanFemaleGirlIcon, + color: 'text-fuchsia-800', + border: 'border-fuchsia-800', + }, { text: 'Urlop szkoleniowy', value: 'training_vacation', diff --git a/tests/Feature/VacationRequestTest.php b/tests/Feature/VacationRequestTest.php index 054072ae..6bb31a9c 100644 --- a/tests/Feature/VacationRequestTest.php +++ b/tests/Feature/VacationRequestTest.php @@ -922,6 +922,7 @@ public function testCorrectVacationTypesAreAvailableForEmployee(): void ["label" => "Urlop szkoleniowy", "value" => "training_vacation"], ["label" => "Opieka nad dzieckiem (art. 188 kp)", "value" => "childcare_vacation"], ["label" => "Urlop ojcowski", "value" => "paternity_leave"], + ["label" => "Urlop macierzyński", "value" => "maternity_leave"], ["label" => "Wolontariat", "value" => "volunteering_vacation"], ["label" => "Oddanie krwi", "value" => "blood_donation_vacation"], ]); @@ -950,6 +951,7 @@ public function testCorrectVacationTypesAreAvailableForTechnicalApprover(): void ["label" => "Urlop szkoleniowy", "value" => "training_vacation"], ["label" => "Opieka nad dzieckiem (art. 188 kp)", "value" => "childcare_vacation"], ["label" => "Urlop ojcowski", "value" => "paternity_leave"], + ["label" => "Urlop macierzyński", "value" => "maternity_leave"], ["label" => "Wolontariat", "value" => "volunteering_vacation"], ["label" => "Oddanie krwi", "value" => "blood_donation_vacation"], ]); @@ -979,6 +981,7 @@ public function testCorrectVacationTypesAreAvailableForAdministrativeApprover(): ["label" => "Urlop szkoleniowy", "value" => "training_vacation"], ["label" => "Opieka nad dzieckiem (art. 188 kp)", "value" => "childcare_vacation"], ["label" => "Urlop ojcowski", "value" => "paternity_leave"], + ["label" => "Urlop macierzyński", "value" => "maternity_leave"], ["label" => "Wolontariat", "value" => "volunteering_vacation"], ["label" => "Oddanie krwi", "value" => "blood_donation_vacation"], ]); @@ -1008,6 +1011,7 @@ public function testCorrectVacationTypesAreAvailableForAdmin(): void ["label" => "Urlop szkoleniowy", "value" => "training_vacation"], ["label" => "Opieka nad dzieckiem (art. 188 kp)", "value" => "childcare_vacation"], ["label" => "Urlop ojcowski", "value" => "paternity_leave"], + ["label" => "Urlop macierzyński", "value" => "maternity_leave"], ["label" => "Wolontariat", "value" => "volunteering_vacation"], ["label" => "Oddanie krwi", "value" => "blood_donation_vacation"], ]); @@ -1093,6 +1097,7 @@ public function testEmployeeWithPermissionToCreateOnBehalfSeesAllVacationTypesFo ["label" => "Urlop szkoleniowy", "value" => "training_vacation"], ["label" => "Opieka nad dzieckiem (art. 188 kp)", "value" => "childcare_vacation"], ["label" => "Urlop ojcowski", "value" => "paternity_leave"], + ["label" => "Urlop macierzyński", "value" => "maternity_leave"], ["label" => "Wolontariat", "value" => "volunteering_vacation"], ["label" => "Oddanie krwi", "value" => "blood_donation_vacation"], ]);