- block sick vacation type for employees (#362)

* - block sick vacation for employees * - fix * - fix
blumilksoftware · Oct 4, 2023 · 8024176 · 8024176
1 parent 430b5dd
commit 8024176
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/config/vacation_types.php b/config/vacation_types.php
@@ -61,14 +61,13 @@
     ],
     VacationType::Sick->value => [
         VacationTypeConfigRetriever::KEY_TECHNICAL_APPROVAL => false,
-        VacationTypeConfigRetriever::KEY_ADMINISTRATIVE_APPROVAL => true,
+        VacationTypeConfigRetriever::KEY_ADMINISTRATIVE_APPROVAL => false,
         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,

diff --git a/resources/js/Pages/Users/Index.vue b/resources/js/Pages/Users/Index.vue
@@ -92,7 +92,7 @@ watch(form, debounce(() => {
           <input
             v-model.trim="form.search"
             type="search"
-            class="block py-2 pr-3 pl-10 w-full max-w-lg sm:text-sm placeholder:text-gray-500 focus:text-gray-900 focus:placeholder:text-gray-400 bg-white rounded-md border border-gray-300 focus:border-blumilk-500 focus:outline-none focus:ring-1 focus:ring-blumilk-500 sm:text-sm"
+            class="block py-2 pr-3 pl-10 w-full max-w-lg placeholder:text-gray-500 focus:text-gray-900 focus:placeholder:text-gray-400 bg-white rounded-md border border-gray-300 focus:border-blumilk-500 focus:outline-none focus:ring-1 focus:ring-blumilk-500 sm:text-sm"
             placeholder="Szukaj"
           >
         </div>
@@ -144,7 +144,7 @@ watch(form, debounce(() => {
           </div>
         </Listbox>
       </div>
-      <div class="overflow-auto xl:overflow-visible relative">
+      <div class="overflow-auto 2xl:overflow-visible relative">
         <div
           v-if="selectedUsers.length > 0"
           class="flex absolute top-0 left-20 h-10 items-center bg-gray-50"
@@ -200,13 +200,13 @@ watch(form, debounce(() => {
               </th>
               <th
                 scope="col"
-                class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
+                class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-normal"
               >
                 Następne badanie lekarskie
               </th>
               <th
                 scope="col"
-                class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
+                class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-normal"
               >
                 Następne szkolenie BHP
               </th>
@@ -255,7 +255,7 @@ watch(form, debounce(() => {
               <td class="p-4 text-sm text-gray-500 whitespace-nowrap">
                 {{ user.lastActiveAt ? DateTime.fromSQL(user.lastActiveAt).toRelative() : '-' }}
               </td>
-              <td class="p-4 text-sm text-gray-500 whitespace-nowrap">
+              <td class="p-4 text-sm text-gray-500 whitespace-normal">
                 {{ user.position }}
               </td>
               <td class="p-4 text-sm text-gray-500 whitespace-nowrap">

diff --git a/tests/Feature/VacationRequestTest.php b/tests/Feature/VacationRequestTest.php
@@ -728,7 +728,6 @@ public function testCorrectVacationTypesAreAvailableForEmployee(): void
                 ["label" => "Urlop bezpłatny", "value" => "unpaid_vacation"],
                 ["label" => "Wolontariat", "value" => "volunteering_vacation"],
                 ["label" => "Odbiór za święto", "value" => "time_in_lieu"],
-                ["label" => "Zwolnienie lekarskie", "value" => "sick_vacation"],
                 ["label" => "Nieobecność", "value" => "absence"],
                 ["label" => "Praca zdalna", "value" => "remote_work"],
             ]);