#22 - wip

app/Infrastructure/Http/Controllers/HolidayController.php

@@ -64,19 +64,4 @@ class HolidayController extends Controller
             ->route("holidays.index")
             ->with("success", __("Holiday has been deleted"));
     }
-
-    public function showCalendar(): Response
-    {
-            $users = User::query()
-                ->withTrashed()
-                ->orderBy("last_name")
-                ->orderBy("first_name")
-                ->paginate()
-                ->withQueryString();
-
-            return inertia("Holidays/Calendar", [
-                "users" => UserResource::collection($users),
-            ]);
-    }
-
 }

app/Infrastructure/Http/Controllers/VacationCalendarController.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Infrastructure\Http\Controllers;
+
+use Inertia\Response;
+use Toby\Eloquent\Models\User;
+use Toby\Infrastructure\Http\Resources\UserResource;
+
+class VacationCalendarController extends Controller
+{
+    public function index(): Response
+    {
+        $users = User::query()
+            ->orderBy("last_name")
+            ->orderBy("first_name")
+            ->paginate();
+
+        return inertia("Calendar", [
+            "users" => UserResource::collection($users),
+        ]);
+    }
+}

app/Infrastructure/Http/Controllers/VacationRequestController.php

@@ -20,15 +20,19 @@ class VacationRequestController extends Controller
 {
     public function index(Request $request): Response
     {
+        $status = $request->get("status", "all");
+
         $vacationRequests = $request->user()
             ->vacationRequests()
             ->latest()
-            ->states(VacationRequestState::filterByStatus($request->query("status", "all")))
+            ->states(VacationRequestState::filterByStatus($status))
             ->paginate();
 
         return inertia("VacationRequest/Index", [
             "requests" => VacationRequestResource::collection($vacationRequests),
-            "filters" => $request->only("status"),
+            "filters" => [
+                "status" => $status,
+            ],
         ]);
     }