#457 - fix: cleaning

blumilksoftware · Jul 8, 2024 · 176d349 · 176d349
1 parent 0c6bfcd
commit 176d349
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/app/Http/Controllers/OvertimeRequestController.php b/app/Http/Controllers/OvertimeRequestController.php
@@ -103,7 +103,7 @@ public function indexForApprovers(
         $overtimeRequests = OvertimeRequest::query()
             ->with(["user.permissions", "user.profile"])
             ->whereBelongsTo($yearPeriod)
-            ->whereRelation("user", fn($query) => $query->withTrashed($withTrashedUsers))
+            ->whereRelation("user", fn(Builder $query): Builder => $query->withTrashed($withTrashedUsers))
             ->when($user !== null, fn(Builder $query): Builder => $query->where("user_id", $user))
             ->states(OvertimeRequestStatesRetriever::filterByStatusGroup($status, $request->user()))
             ->latest()

diff --git a/app/Http/Controllers/VacationRequestController.php b/app/Http/Controllers/VacationRequestController.php
@@ -110,7 +110,7 @@ public function indexForApprovers(
         $vacationRequests = VacationRequest::query()
             ->with(["vacations.user.profile", "user.permissions", "user.profile"])
             ->whereBelongsTo($yearPeriod)
-            ->whereRelation("user", fn($query) => $query->withTrashed($withTrashedUsers))
+            ->whereRelation("user", fn(Builder $query): Builder => $query->withTrashed($withTrashedUsers))
             ->when($user !== null, fn(Builder $query): Builder => $query->where("user_id", $user))
             ->when($type !== null, fn(Builder $query): Builder => $query->where("type", $type))
             ->states(VacationRequestStatesRetriever::filterByStatusGroup($status, $request->user()))

diff --git a/resources/js/Pages/VacationRequest/IndexForApprovers.vue b/resources/js/Pages/VacationRequest/IndexForApprovers.vue
@@ -168,6 +168,20 @@ watch(form, debounce(() => {
               </ListboxOptions>
             </transition>
           </div>
+          <div class="flex items-center space-x-2 mt-3">
+            <input
+              id="withTrashedUsers"
+              v-model="form.withTrashedUsers"
+              class="left-6 top-1/2 h-4 w-4 rounded border-gray-300 text-blumilk-600 focus:ring-blumilk-500"
+              type="checkbox"
+            >
+            <label
+              class="block text-sm font-medium text-gray-700"
+              for="withTrashedUsers"
+            >
+              Zablokowani użytkownicy
+            </label>
+          </div>
         </Listbox>
         <Listbox
           v-model="form.status"
@@ -296,20 +310,6 @@ watch(form, debounce(() => {
             </transition>
           </div>
         </Listbox>
-        <div class="flex items-center space-x-2 mt-3 md:mt-0">
-          <input
-            id="withTrashedUsers"
-            v-model="form.withTrashedUsers"
-            class="left-6 top-1/2 h-4 w-4 rounded border-gray-300 text-blumilk-600 focus:ring-blumilk-500"
-            type="checkbox"
-          >
-          <label
-            class="block text-sm font-medium text-gray-700"
-            for="withTrashedUsers"
-          >
-            Zablokowani użytkownicy
-          </label>
-        </div>
       </div>
     </div>
     <div class="overflow-auto xl:overflow-visible">