Merge branch 'main' into states

# Conflicts:
#	app/Domain/CalendarGenerator.php
#	app/Domain/VacationRequestStateManager.php
#	app/Eloquent/Models/VacationRequest.php
#	app/Eloquent/Observers/VacationRequestObserver.php
#	composer.json
#	composer.lock
#	tests/Feature/VacationRequestTest.php

app/Infrastructure/Http/Controllers/TimesheetController.php

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Infrastructure\Http\Controllers;
+
+use Illuminate\Support\Carbon;
+use Maatwebsite\Excel\Facades\Excel;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Toby\Domain\Enums\Month;
+use Toby\Domain\TimesheetExport;
+use Toby\Eloquent\Helpers\YearPeriodRetriever;
+use Toby\Eloquent\Models\User;
+
+class TimesheetController extends Controller
+{
+    public function __invoke(Month $month, YearPeriodRetriever $yearPeriodRetriever): BinaryFileResponse
+    {
+        $yearPeriod = $yearPeriodRetriever->selected();
+        $carbonMonth = Carbon::create($yearPeriod->year, $month->toCarbonNumber());
+
+        $users = User::query()
+            ->orderBy("last_name")
+            ->orderBy("first_name")
+            ->get();
+
+        $filename = "{$carbonMonth->translatedFormat("F Y")}.xlsx";
+
+        $timesheet = (new TimesheetExport())
+            ->forMonth($carbonMonth)
+            ->forUsers($users);
+
+        return Excel::download($timesheet, $filename);
+    }
+}

app/Infrastructure/Http/Controllers/VacationCalendarController.php

@@ -4,11 +4,10 @@ declare(strict_types=1);
 
 namespace Toby\Infrastructure\Http\Controllers;
 
-use Illuminate\Http\Request;
 use Illuminate\Support\Carbon;
-use Illuminate\Support\Str;
 use Inertia\Response;
 use Toby\Domain\CalendarGenerator;
+use Toby\Domain\Enums\Month;
 use Toby\Eloquent\Helpers\YearPeriodRetriever;
 use Toby\Eloquent\Models\User;
 use Toby\Infrastructure\Http\Resources\UserResource;
@@ -16,22 +15,25 @@ use Toby\Infrastructure\Http\Resources\UserResource;
 class VacationCalendarController extends Controller
 {
     public function index(
-        Request $request,
         YearPeriodRetriever $yearPeriodRetriever,
         CalendarGenerator $calendarGenerator,
+        ?string $month = null,
     ): Response {
-        $month = Str::lower($request->query("month", Carbon::now()->englishMonth));
+        $month = Month::fromNameOrCurrent((string)$month);
+
         $yearPeriod = $yearPeriodRetriever->selected();
+        $carbonMonth = Carbon::create($yearPeriod->year, $month->toCarbonNumber());
+
         $users = User::query()
             ->orderBy("last_name")
             ->orderBy("first_name")
             ->get();
 
-        $calendar = $calendarGenerator->generate($yearPeriod, $month);
+        $calendar = $calendarGenerator->generate($carbonMonth);
 
         return inertia("Calendar", [
             "calendar" => $calendar,
-            "currentMonth" => $month,
+            "currentMonth" => $month->value,
             "users" => UserResource::collection($users),
         ]);
     }

app/Infrastructure/Http/Controllers/VacationRequestController.php

@@ -8,7 +8,6 @@ use Barryvdh\DomPDF\Facade\Pdf;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response as LaravelResponse;
-use Illuminate\Support\Arr;
 use Inertia\Response;
 use Toby\Domain\Enums\Role;
 use Toby\Domain\Enums\VacationType;
@@ -21,8 +20,10 @@ use Toby\Domain\VacationRequestStateManager;
 use Toby\Domain\VacationRequestStatesRetriever;
 use Toby\Domain\Validation\VacationRequestValidator;
 use Toby\Eloquent\Helpers\YearPeriodRetriever;
+use Toby\Eloquent\Models\User;
 use Toby\Eloquent\Models\VacationRequest;
 use Toby\Infrastructure\Http\Requests\VacationRequestRequest;
+use Toby\Infrastructure\Http\Resources\UserResource;
 use Toby\Infrastructure\Http\Resources\VacationRequestActivityResource;
 use Toby\Infrastructure\Http\Resources\VacationRequestResource;
 
@@ -61,10 +62,10 @@ class VacationRequestController extends Controller
                 "acceptAsAdministrative" => $vacationRequest->state->canTransitionTo(AcceptedByAdministrative::class)
                     && $user === Role::AdministrativeApprover,
                 "reject" => $vacationRequest->state->canTransitionTo(Rejected::class)
-                    && in_array($user->role, [Role::TechnicalApprover, Role::AdministrativeApprover]),
+                    && in_array($user->role, [Role::TechnicalApprover, Role::AdministrativeApprover], true),
                 "cancel" => $vacationRequest->state->canTransitionTo(Cancelled::class)
                     && $user === Role::AdministrativeApprover,
-            ]
+            ],
         ]);
     }
 
@@ -79,8 +80,14 @@ class VacationRequestController extends Controller
 
     public function create(): Response
     {
+        $users = User::query()
+            ->orderBy("last_name")
+            ->orderBy("first_name")
+            ->get();
+
         return inertia("VacationRequest/Create", [
             "vacationTypes" => VacationType::casesToSelect(),
+            "users" => UserResource::collection($users),
         ]);
     }
 
@@ -91,7 +98,7 @@ class VacationRequestController extends Controller
         VacationDaysCalculator $vacationDaysCalculator,
     ): RedirectResponse {
         /** @var VacationRequest $vacationRequest */
-        $vacationRequest = $request->user()->vacationRequests()->make($request->data());
+        $vacationRequest = $request->user()->createdVacationRequests()->make($request->data());
         $vacationRequestValidator->validate($vacationRequest);
 
         $vacationRequest->save();

app/Infrastructure/Http/Requests/VacationRequestRequest.php

@@ -16,9 +16,11 @@ class VacationRequestRequest extends FormRequest
     public function rules(): array
     {
         return [
+            "user" => ["required", "exists:users,id"],
             "type" => ["required", new Enum(VacationType::class)],
             "from" => ["required", "date_format:Y-m-d", new YearPeriodExists()],
             "to" => ["required", "date_format:Y-m-d", new YearPeriodExists()],
+            "flowSkipped" => ["nullable", "boolean"],
             "comment" => ["nullable"],
         ];
     }
@@ -28,11 +30,13 @@ class VacationRequestRequest extends FormRequest
         $from = $this->get("from");
 
         return [
+            "user_id" => $this->get("user"),
             "type" => $this->get("type"),
             "from" => $from,
             "to" => $this->get("to"),
             "year_period_id" => YearPeriod::findByYear(Carbon::create($from)->year)->id,
             "comment" => $this->get("comment"),
+            "flow_skipped" => $this->boolean("flowSkipped"),
         ];
     }
 }

app/Infrastructure/Http/Resources/VacationRequestActivityResource.php

@@ -13,7 +13,7 @@ class VacationRequestActivityResource extends JsonResource
     public function toArray($request): array
     {
         return [
-            "date" => $this->created_at->format("d.m.Y"),
+            "date" => $this->created_at->toDisplayDate(),
             "time" => $this->created_at->format("H:i"),
             "user" => $this->user ? $this->user->fullName : __("System"),
             "state" => $this->to,