Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions app/Enums/VacationType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
17 changes: 17 additions & 0 deletions config/vacation_types.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions lang/pl.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 8 additions & 0 deletions resources/js/Composables/vacationTypeInfo.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
{
Expand Down Expand Up @@ -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',
Expand Down
5 changes: 5 additions & 0 deletions tests/Feature/VacationRequestTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
]);
Expand Down Expand Up @@ -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"],
]);
Expand Down Expand Up @@ -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"],
]);
Expand Down Expand Up @@ -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"],
]);
Expand Down Expand Up @@ -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"],
]);
Expand Down
Loading