diff --git a/app/Infrastructure/Http/Controllers/VacationCalendarController.php b/app/Infrastructure/Http/Controllers/VacationCalendarController.php index c3d72a9..a347ee4 100644 --- a/app/Infrastructure/Http/Controllers/VacationCalendarController.php +++ b/app/Infrastructure/Http/Controllers/VacationCalendarController.php @@ -28,7 +28,7 @@ class VacationCalendarController extends Controller $carbonMonth = Carbon::create($yearPeriod->year, $month->toCarbonNumber()); $users = User::query() - ->where("id", "!=", $currentUser->id) + ->where("id", "!=", $currentUser->id) ->orderBy("last_name") ->orderBy("first_name") ->get(); @@ -39,7 +39,8 @@ class VacationCalendarController extends Controller return inertia("Calendar", [ "calendar" => $calendar, - "currentMonth" => $month->value, + "current" => Month::current(), + "selected" => $month->value, "users" => UserResource::collection($users), "can" => [ "generateTimesheet" => $request->user()->can("generateTimesheet"), diff --git a/resources/js/Pages/Calendar.vue b/resources/js/Pages/Calendar.vue index 9d055c0..7e70980 100644 --- a/resources/js/Pages/Calendar.vue +++ b/resources/js/Pages/Calendar.vue @@ -6,79 +6,43 @@