From 706389a5c31055d2b2d1af3c9887f189ff1b671c Mon Sep 17 00:00:00 2001
From: Kamil <kamil.piech.97@gmail.com>
Date: Thu, 6 Jun 2024 14:46:50 +0200
Subject: [PATCH 01/14] #444 - wip: added models and create form for overtime
 requests

---
 app/Actions/OvertimeRequest/CreateAction.php  |  59 ++++
 app/Domain/OvertimeCalculator.php             |  18 ++
 app/Domain/OvertimeRequestStateManager.php    |  74 +++++
 app/Domain/OvertimeRequestStatesRetriever.php |  72 +++++
 app/Enums/SettlementType.php                  |  28 ++
 .../Controllers/OvertimeRequestController.php |  30 ++
 app/Http/Requests/OvertimeRequestRequest.php  |  43 +++
 app/Models/OvertimeRequest.php                |  73 +++++
 app/Models/OvertimeRequestActivity.php        |  45 +++
 app/Models/User.php                           |   5 +
 app/Models/YearPeriod.php                     |   6 +
 app/Observers/OvertimeRequestObserver.php     |  18 ++
 app/Providers/ObserverServiceProvider.php     |   3 +
 .../OvertimeRequest/AcceptedByTechnical.php   |  10 +
 app/States/OvertimeRequest/Approved.php       |  10 +
 app/States/OvertimeRequest/Cancelled.php      |  10 +
 app/States/OvertimeRequest/Created.php        |  10 +
 .../OvertimeRequest/OvertimeRequestState.php  |  38 +++
 app/States/OvertimeRequest/Rejected.php       |  10 +
 app/States/OvertimeRequest/Settled.php        |  10 +
 .../OvertimeRequest/WaitingForTechnical.php   |  10 +
 .../OvertimeRequestActivityFactory.php        |  22 ++
 database/factories/OvertimeRequestFactory.php |  35 +++
 ..._080039_create_overtime_requests_table.php |  35 +++
 ...eate_overtime_request_activities_table.php |  28 ++
 .../js/Composables/settlementTypeInfo.js      |  29 ++
 resources/js/Pages/OvertimeRequest/Create.vue | 280 ++++++++++++++++++
 resources/js/Shared/SettlementType.vue        |  23 ++
 routes/web.php                                |   7 +
 29 files changed, 1041 insertions(+)
 create mode 100644 app/Actions/OvertimeRequest/CreateAction.php
 create mode 100644 app/Domain/OvertimeCalculator.php
 create mode 100644 app/Domain/OvertimeRequestStateManager.php
 create mode 100644 app/Domain/OvertimeRequestStatesRetriever.php
 create mode 100644 app/Enums/SettlementType.php
 create mode 100644 app/Http/Controllers/OvertimeRequestController.php
 create mode 100644 app/Http/Requests/OvertimeRequestRequest.php
 create mode 100644 app/Models/OvertimeRequest.php
 create mode 100644 app/Models/OvertimeRequestActivity.php
 create mode 100644 app/Observers/OvertimeRequestObserver.php
 create mode 100644 app/States/OvertimeRequest/AcceptedByTechnical.php
 create mode 100644 app/States/OvertimeRequest/Approved.php
 create mode 100644 app/States/OvertimeRequest/Cancelled.php
 create mode 100644 app/States/OvertimeRequest/Created.php
 create mode 100644 app/States/OvertimeRequest/OvertimeRequestState.php
 create mode 100644 app/States/OvertimeRequest/Rejected.php
 create mode 100644 app/States/OvertimeRequest/Settled.php
 create mode 100644 app/States/OvertimeRequest/WaitingForTechnical.php
 create mode 100644 database/factories/OvertimeRequestActivityFactory.php
 create mode 100644 database/factories/OvertimeRequestFactory.php
 create mode 100644 database/migrations/2024_06_06_080039_create_overtime_requests_table.php
 create mode 100644 database/migrations/2024_06_06_140009_create_overtime_request_activities_table.php
 create mode 100644 resources/js/Composables/settlementTypeInfo.js
 create mode 100644 resources/js/Pages/OvertimeRequest/Create.vue
 create mode 100644 resources/js/Shared/SettlementType.vue

diff --git a/app/Actions/OvertimeRequest/CreateAction.php b/app/Actions/OvertimeRequest/CreateAction.php
new file mode 100644
index 00000000..4de92e7e
--- /dev/null
+++ b/app/Actions/OvertimeRequest/CreateAction.php
@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Actions\OvertimeRequest;
+
+use Illuminate\Validation\ValidationException;
+use Toby\Actions\VacationRequest\ApproveAction;
+use Toby\Actions\VacationRequest\WaitForTechApprovalAction;
+use Toby\Domain\OvertimeCalculator;
+use Toby\Domain\OvertimeRequestStateManager;
+use Toby\Models\OvertimeRequest;
+use Toby\Models\User;
+use Toby\Models\VacationRequest;
+use Toby\Notifications\VacationRequestCreatedNotification;
+
+class CreateAction
+{
+    public function __construct(
+        protected OvertimeRequestStateManager $stateManager,
+        protected WaitForTechApprovalAction $waitForTechApprovalAction,
+        protected OvertimeCalculator $overtimeCalculator,
+        protected ApproveAction $approveAction,
+    ) {}
+
+    /**
+     * @throws ValidationException
+     */
+    public function execute(array $data, User $creator): OvertimeRequest
+    {
+        $overtimeRequest = $this->createVacationRequest($data, $creator);
+
+        $this->handleCreatedOvertimeRequest($overtimeRequest);
+
+        return $overtimeRequest;
+    }
+
+    protected function createVacationRequest(array $data, User $creator): OvertimeRequest
+    {
+        /** @var OvertimeRequest $overtimeRequest */
+        $overtimeRequest = $creator->createdOvertimeRequests()->make($data);
+        $overtimeRequest->hours = $this->overtimeCalculator->calculateHours($overtimeRequest->from, $overtimeRequest->to);
+
+        $overtimeRequest->save();
+
+        $this->stateManager->markAsCreated($overtimeRequest);
+
+        return $overtimeRequest;
+    }
+
+    protected function handleCreatedOvertimeRequest(OvertimeRequest $overtimeRequest): void
+    {
+    }
+
+    protected function notify(VacationRequest $vacationRequest): void
+    {
+        $vacationRequest->user->notify(new VacationRequestCreatedNotification($vacationRequest));
+    }
+}
diff --git a/app/Domain/OvertimeCalculator.php b/app/Domain/OvertimeCalculator.php
new file mode 100644
index 00000000..c74108f1
--- /dev/null
+++ b/app/Domain/OvertimeCalculator.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Domain;
+
+use Carbon\Carbon;
+use Carbon\CarbonInterface;
+
+class OvertimeCalculator
+{
+    public function calculateHours(CarbonInterface $from, CarbonInterface $to): int
+    {
+        $hours = Carbon::create($from)->diffInHours($to);
+
+        return (int)$hours;
+    }
+}
diff --git a/app/Domain/OvertimeRequestStateManager.php b/app/Domain/OvertimeRequestStateManager.php
new file mode 100644
index 00000000..aef32536
--- /dev/null
+++ b/app/Domain/OvertimeRequestStateManager.php
@@ -0,0 +1,74 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Domain;
+
+use Illuminate\Contracts\Events\Dispatcher;
+use Toby\Models\OvertimeRequest;
+use Toby\Models\User;
+use Toby\States\OvertimeRequest\AcceptedByTechnical;
+use Toby\States\OvertimeRequest\Approved;
+use Toby\States\OvertimeRequest\Cancelled;
+use Toby\States\OvertimeRequest\OvertimeRequestState;
+use Toby\States\OvertimeRequest\Rejected;
+use Toby\States\OvertimeRequest\WaitingForTechnical;
+
+class OvertimeRequestStateManager
+{
+    public function __construct(
+        protected Dispatcher $dispatcher,
+    ) {}
+
+    public function markAsCreated(OvertimeRequest $overtimeRequest): void
+    {
+        $this->createActivity($overtimeRequest, null, $overtimeRequest->state, $overtimeRequest->creator);
+    }
+
+    public function approve(OvertimeRequest $overtimeRequest, ?User $user = null): void
+    {
+        $this->changeState($overtimeRequest, Approved::class, $user);
+    }
+
+    public function reject(OvertimeRequest $overtimeRequest, User $user): void
+    {
+        $this->changeState($overtimeRequest, Rejected::class, $user);
+    }
+
+    public function cancel(OvertimeRequest $overtimeRequest, User $user): void
+    {
+        $this->changeState($overtimeRequest, Cancelled::class, $user);
+    }
+
+    public function acceptAsTechnical(OvertimeRequest $overtimeRequest, User $user): void
+    {
+        $this->changeState($overtimeRequest, AcceptedByTechnical::class, $user);
+    }
+
+    public function waitForTechnical(OvertimeRequest $overtimeRequest): void
+    {
+        $this->changeState($overtimeRequest, WaitingForTechnical::class);
+    }
+
+    protected function changeState(OvertimeRequest $overtimeRequest, string $state, ?User $user = null): void
+    {
+        $previousState = $overtimeRequest->state;
+        $overtimeRequest->state->transitionTo($state);
+        $overtimeRequest->save();
+
+        $this->createActivity($overtimeRequest, $previousState, $overtimeRequest->state, $user);
+    }
+
+    protected function createActivity(
+        OvertimeRequest $overtimeRequest,
+        ?OvertimeRequestState $from,
+        OvertimeRequestState $to,
+        ?User $user = null,
+    ): void {
+        $overtimeRequest->activities()->create([
+            "from" => $from,
+            "to" => $to,
+            "user_id" => $user?->id,
+        ]);
+    }
+}
diff --git a/app/Domain/OvertimeRequestStatesRetriever.php b/app/Domain/OvertimeRequestStatesRetriever.php
new file mode 100644
index 00000000..f2d11fb6
--- /dev/null
+++ b/app/Domain/OvertimeRequestStatesRetriever.php
@@ -0,0 +1,72 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Domain;
+
+use Toby\Enums\Role;
+use Toby\Models\User;
+use Toby\States\OvertimeRequest\AcceptedByTechnical;
+use Toby\States\OvertimeRequest\Approved;
+use Toby\States\OvertimeRequest\Cancelled;
+use Toby\States\OvertimeRequest\Created;
+use Toby\States\OvertimeRequest\Rejected;
+use Toby\States\OvertimeRequest\WaitingForTechnical;
+
+class OvertimeRequestStatesRetriever
+{
+    public static function pendingStates(): array
+    {
+        return [
+            Created::class,
+            WaitingForTechnical::class,
+            AcceptedByTechnical::class,
+        ];
+    }
+
+    public static function successStates(): array
+    {
+        return [Approved::class];
+    }
+
+    public static function failedStates(): array
+    {
+        return [
+            Rejected::class,
+            Cancelled::class,
+        ];
+    }
+
+    public static function notFailedStates(): array
+    {
+        return array_merge(static::successStates(), static::pendingStates());
+    }
+
+    public static function waitingForUserActionStates(User $user): array
+    {
+        return match ($user->role) {
+            Role::TechnicalApprover, Role::Administrator => [WaitingForTechnical::class],
+            default => [],
+        };
+    }
+
+    public static function all(): array
+    {
+        return [
+            ...self::pendingStates(),
+            ...self::successStates(),
+            ...self::failedStates(),
+        ];
+    }
+
+    public static function filterByStatusGroup(string $filter, ?User $user = null): array
+    {
+        return match ($filter) {
+            "pending" => self::pendingStates(),
+            "success" => self::successStates(),
+            "failed" => self::failedStates(),
+            "waiting_for_action" => self::waitingForUserActionStates($user),
+            default => self::all(),
+        };
+    }
+}
diff --git a/app/Enums/SettlementType.php b/app/Enums/SettlementType.php
new file mode 100644
index 00000000..e7008a7c
--- /dev/null
+++ b/app/Enums/SettlementType.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Enums;
+
+enum SettlementType: string
+{
+    case Hours = "hours";
+    case Money = "money";
+
+    public function label(): string
+    {
+        return __($this->value);
+    }
+
+    public static function casesToSelect(): array
+    {
+        $cases = collect(SettlementType::cases());
+
+        return $cases->map(
+            fn(SettlementType $enum): array => [
+                "label" => $enum->label(),
+                "value" => $enum->value,
+            ],
+        )->toArray();
+    }
+}
diff --git a/app/Http/Controllers/OvertimeRequestController.php b/app/Http/Controllers/OvertimeRequestController.php
new file mode 100644
index 00000000..c9667b42
--- /dev/null
+++ b/app/Http/Controllers/OvertimeRequestController.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Http\Controllers;
+
+use Illuminate\Http\RedirectResponse;
+use Inertia\Response;
+use Toby\Actions\OvertimeRequest\CreateAction;
+use Toby\Enums\SettlementType;
+use Toby\Http\Requests\OvertimeRequestRequest;
+
+class OvertimeRequestController extends Controller
+{
+    public function create(): Response
+    {
+        return inertia("OvertimeRequest/Create", [
+            "settlementTypes" => SettlementType::casesToSelect(),
+        ]);
+    }
+
+    public function store(OvertimeRequestRequest $request, CreateAction $createAction): RedirectResponse
+    {
+        $overtimeRequest = $createAction->execute($request->data(), $request->user());
+
+        return redirect()
+            ->route("overtime.requests.show", $overtimeRequest)
+            ->with("success", __("Request created."));
+    }
+}
diff --git a/app/Http/Requests/OvertimeRequestRequest.php b/app/Http/Requests/OvertimeRequestRequest.php
new file mode 100644
index 00000000..9f5f0bdb
--- /dev/null
+++ b/app/Http/Requests/OvertimeRequestRequest.php
@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Carbon;
+use Illuminate\Validation\Rules\Enum;
+use Toby\Enums\SettlementType;
+use Toby\Http\Rules\YearPeriodExists;
+use Toby\Models\YearPeriod;
+
+class OvertimeRequestRequest extends FormRequest
+{
+    public function rules(): array
+    {
+        return [
+            "user" => ["required", "exists:users,id"],
+            "from" => ["required", "date_format:Y-m-d H:i", new YearPeriodExists()],
+            "to" => ["required", "date_format:Y-m-d H:i", new YearPeriodExists()],
+            "type" => ["required", new Enum(SettlementType::class)],
+            "comment" => ["nullable"],
+        ];
+    }
+
+    public function data(): array
+    {
+        return [
+            "user_id" => $this->get("user"),
+            "from" => $this->get("from"),
+            "to" => $this->get("to"),
+            "settlement_type" => $this->get("type"),
+            "year_period_id" => $this->yearPeriod()->id,
+            "comment" => $this->get("comment"),
+        ];
+    }
+
+    public function yearPeriod(): YearPeriod
+    {
+        return YearPeriod::findByYear(Carbon::create($this->get("from"))->year);
+    }
+}
diff --git a/app/Models/OvertimeRequest.php b/app/Models/OvertimeRequest.php
new file mode 100644
index 00000000..0c7293e5
--- /dev/null
+++ b/app/Models/OvertimeRequest.php
@@ -0,0 +1,73 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Models;
+
+use Database\Factories\OvertimeRequestFactory;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Support\Carbon;
+use Spatie\ModelStates\HasStates;
+use Toby\Enums\SettlementType;
+use Toby\States\OvertimeRequest\OvertimeRequestState;
+
+/**
+ * @property int $id
+ * @property string $name
+ * @property OvertimeRequestState $state
+ * @property Carbon $from
+ * @property Carbon $to
+ * @property integer $hours
+ * @property SettlementType $settlement_type
+ * @property boolean $settled
+ * @property string $comment
+ * @property User $user
+ * @property User $creator
+ * @property YearPeriod $yearPeriod
+ * @property Carbon $created_at
+ * @property Carbon $updated_at
+ */
+class OvertimeRequest extends Model
+{
+    use HasFactory;
+    use HasStates;
+
+    protected $guarded = [];
+    protected $casts = [
+        "state" => OvertimeRequestState::class,
+        "from" => "datetime",
+        "to" => "datetime",
+        "settled" => "boolean",
+        "settlement_type" => SettlementType::class,
+    ];
+    protected $perPage = 50;
+
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class)
+            ->withTrashed();
+    }
+
+    public function creator(): BelongsTo
+    {
+        return $this->belongsTo(User::class, "creator_id");
+    }
+
+    public function yearPeriod(): BelongsTo
+    {
+        return $this->belongsTo(YearPeriod::class);
+    }
+
+    public function activities(): HasMany
+    {
+        return $this->hasMany(OvertimeRequestActivity::class);
+    }
+
+    protected static function newFactory(): OvertimeRequestFactory
+    {
+        return OvertimeRequestFactory::new();
+    }
+}
diff --git a/app/Models/OvertimeRequestActivity.php b/app/Models/OvertimeRequestActivity.php
new file mode 100644
index 00000000..53700c60
--- /dev/null
+++ b/app/Models/OvertimeRequestActivity.php
@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Models;
+
+use Database\Factories\OvertimeRequestActivityFactory;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Toby\States\OvertimeRequest\OvertimeRequestState;
+
+/**
+ * @property int $id
+ * @property OvertimeRequest $overtimeRequest
+ * @property ?User $user
+ * @property ?OvertimeRequestState $from
+ * @property OvertimeRequestState $to
+ */
+class OvertimeRequestActivity extends Model
+{
+    use HasFactory;
+
+    protected $guarded = [];
+    protected $casts = [
+        "from" => OvertimeRequestState::class,
+        "to" => OvertimeRequestState::class,
+    ];
+
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class)
+            ->withTrashed();
+    }
+
+    public function overtimeRequest(): BelongsTo
+    {
+        return $this->belongsTo(OvertimeRequest::class);
+    }
+
+    protected static function newFactory(): OvertimeRequestActivityFactory
+    {
+        return OvertimeRequestActivityFactory::new();
+    }
+}
diff --git a/app/Models/User.php b/app/Models/User.php
index a6027a7e..4266fb00 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -75,6 +75,11 @@ public function createdVacationRequests(): HasMany
         return $this->hasMany(VacationRequest::class, "creator_id");
     }
 
+    public function createdOvertimeRequests(): HasMany
+    {
+        return $this->hasMany(OvertimeRequest::class, "creator_id");
+    }
+
     public function vacations(): HasMany
     {
         return $this->hasMany(Vacation::class);
diff --git a/app/Models/YearPeriod.php b/app/Models/YearPeriod.php
index a4473ef5..edb010fa 100644
--- a/app/Models/YearPeriod.php
+++ b/app/Models/YearPeriod.php
@@ -16,6 +16,7 @@
  * @property int $year
  * @property Collection $vacationLimits
  * @property Collection $vacationRequests
+ * @property Collection $overtimeRequests
  * @property Collection $holidays
  */
 class YearPeriod extends Model
@@ -47,6 +48,11 @@ public function vacationRequests(): HasMany
         return $this->hasMany(VacationRequest::class);
     }
 
+    public function overtimeRequests(): HasMany
+    {
+        return $this->hasMany(OvertimeRequest::class);
+    }
+
     public function holidays(): HasMany
     {
         return $this->hasMany(Holiday::class);
diff --git a/app/Observers/OvertimeRequestObserver.php b/app/Observers/OvertimeRequestObserver.php
new file mode 100644
index 00000000..12c2ee74
--- /dev/null
+++ b/app/Observers/OvertimeRequestObserver.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Observers;
+
+use Toby\Models\OvertimeRequest;
+
+class OvertimeRequestObserver
+{
+    public function creating(OvertimeRequest $overtime): void
+    {
+        $count = $overtime->yearPeriod->overtimeRequests()->count();
+        $number = $count + 1;
+
+        $overtime->name = "{$number}/{$overtime->yearPeriod->year}";
+    }
+}
diff --git a/app/Providers/ObserverServiceProvider.php b/app/Providers/ObserverServiceProvider.php
index 54990af8..15217ad8 100644
--- a/app/Providers/ObserverServiceProvider.php
+++ b/app/Providers/ObserverServiceProvider.php
@@ -5,9 +5,11 @@
 namespace Toby\Providers;
 
 use Illuminate\Support\ServiceProvider;
+use Toby\Models\OvertimeRequest;
 use Toby\Models\User;
 use Toby\Models\VacationLimit;
 use Toby\Models\VacationRequest;
+use Toby\Observers\OvertimeRequestObserver;
 use Toby\Observers\UserObserver;
 use Toby\Observers\VacationLimitObserver;
 use Toby\Observers\VacationRequestObserver;
@@ -19,5 +21,6 @@ public function boot(): void
         User::observe(UserObserver::class);
         VacationRequest::observe(VacationRequestObserver::class);
         VacationLimit::observe(VacationLimitObserver::class);
+        OvertimeRequest::observe(OvertimeRequestObserver::class);
     }
 }
diff --git a/app/States/OvertimeRequest/AcceptedByTechnical.php b/app/States/OvertimeRequest/AcceptedByTechnical.php
new file mode 100644
index 00000000..b0160585
--- /dev/null
+++ b/app/States/OvertimeRequest/AcceptedByTechnical.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\States\OvertimeRequest;
+
+class AcceptedByTechnical extends OvertimeRequestState
+{
+    public static string $name = "accepted_by_technical";
+}
diff --git a/app/States/OvertimeRequest/Approved.php b/app/States/OvertimeRequest/Approved.php
new file mode 100644
index 00000000..01372d10
--- /dev/null
+++ b/app/States/OvertimeRequest/Approved.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\States\OvertimeRequest;
+
+class Approved extends OvertimeRequestState
+{
+    public static string $name = "approved";
+}
diff --git a/app/States/OvertimeRequest/Cancelled.php b/app/States/OvertimeRequest/Cancelled.php
new file mode 100644
index 00000000..f105a413
--- /dev/null
+++ b/app/States/OvertimeRequest/Cancelled.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\States\OvertimeRequest;
+
+class Cancelled extends OvertimeRequestState
+{
+    public static string $name = "cancelled";
+}
diff --git a/app/States/OvertimeRequest/Created.php b/app/States/OvertimeRequest/Created.php
new file mode 100644
index 00000000..5648f9de
--- /dev/null
+++ b/app/States/OvertimeRequest/Created.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\States\OvertimeRequest;
+
+class Created extends OvertimeRequestState
+{
+    public static string $name = "created";
+}
diff --git a/app/States/OvertimeRequest/OvertimeRequestState.php b/app/States/OvertimeRequest/OvertimeRequestState.php
new file mode 100644
index 00000000..571c8efe
--- /dev/null
+++ b/app/States/OvertimeRequest/OvertimeRequestState.php
@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\States\OvertimeRequest;
+
+use Spatie\ModelStates\Exceptions\InvalidConfig;
+use Spatie\ModelStates\State;
+use Spatie\ModelStates\StateConfig;
+
+abstract class OvertimeRequestState extends State
+{
+    /**
+     * @throws InvalidConfig
+     */
+    public static function config(): StateConfig
+    {
+        return parent::config()
+            ->default(Created::class)
+            ->allowTransition(Created::class, Approved::class)
+            ->allowTransition(Created::class, WaitingForTechnical::class)
+            ->allowTransition(WaitingForTechnical::class, Rejected::class)
+            ->allowTransition(WaitingForTechnical::class, AcceptedByTechnical::class)
+            ->allowTransition(AcceptedByTechnical::class, Approved::class)
+            ->allowTransition([
+                Created::class,
+                WaitingForTechnical::class,
+                AcceptedByTechnical::class,
+                Approved::class,
+            ], Cancelled::class)
+            ->allowTransition(Approved::class, Settled::class);
+    }
+
+    public function label(): string
+    {
+        return __(static::$name);
+    }
+}
diff --git a/app/States/OvertimeRequest/Rejected.php b/app/States/OvertimeRequest/Rejected.php
new file mode 100644
index 00000000..8be0d9f0
--- /dev/null
+++ b/app/States/OvertimeRequest/Rejected.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\States\OvertimeRequest;
+
+class Rejected extends OvertimeRequestState
+{
+    public static string $name = "rejected";
+}
diff --git a/app/States/OvertimeRequest/Settled.php b/app/States/OvertimeRequest/Settled.php
new file mode 100644
index 00000000..a0121078
--- /dev/null
+++ b/app/States/OvertimeRequest/Settled.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\States\OvertimeRequest;
+
+class Settled extends OvertimeRequestState
+{
+    public static string $name = "settled";
+}
diff --git a/app/States/OvertimeRequest/WaitingForTechnical.php b/app/States/OvertimeRequest/WaitingForTechnical.php
new file mode 100644
index 00000000..9c35f05c
--- /dev/null
+++ b/app/States/OvertimeRequest/WaitingForTechnical.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\States\OvertimeRequest;
+
+class WaitingForTechnical extends OvertimeRequestState
+{
+    public static string $name = "waiting_for_technical";
+}
diff --git a/database/factories/OvertimeRequestActivityFactory.php b/database/factories/OvertimeRequestActivityFactory.php
new file mode 100644
index 00000000..4fd5a843
--- /dev/null
+++ b/database/factories/OvertimeRequestActivityFactory.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Database\Factories;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+use Toby\Models\OvertimeRequestActivity;
+use Toby\States\OvertimeRequest\OvertimeRequestState;
+
+class OvertimeRequestActivityFactory extends Factory
+{
+    protected $model = OvertimeRequestActivity::class;
+
+    public function definition(): array
+    {
+        return [
+            "from" => $this->faker->randomElement(OvertimeRequestState::all()),
+            "to" => $this->faker->randomElement(OvertimeRequestState::all()),
+        ];
+    }
+}
diff --git a/database/factories/OvertimeRequestFactory.php b/database/factories/OvertimeRequestFactory.php
new file mode 100644
index 00000000..e822b282
--- /dev/null
+++ b/database/factories/OvertimeRequestFactory.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Database\Factories;
+
+use Carbon\CarbonImmutable;
+use Illuminate\Database\Eloquent\Factories\Factory;
+use Toby\Domain\OvertimeRequestStatesRetriever;
+use Toby\Models\OvertimeRequest;
+use Toby\Models\User;
+use Toby\Models\YearPeriod;
+
+class OvertimeRequestFactory extends Factory
+{
+    protected $model = OvertimeRequest::class;
+
+    public function definition(): array
+    {
+        $from = CarbonImmutable::create($this->faker->dateTimeThisYear);
+        $to = $from->addHours($this->faker->numberBetween(1, 10));
+        $hours = $to->diffInHours($from);
+
+        return [
+            "user_id" => User::factory(),
+            "creator_id" => fn(array $attributes): int => $attributes["user_id"],
+            "year_period_id" => YearPeriod::factory(),
+            "state" => $this->faker->randomElement(OvertimeRequestStatesRetriever::all()),
+            "from" => $from,
+            "to" => $to,
+            "hours" => $hours,
+            "comment" => $this->faker->boolean ? $this->faker->paragraph() : null,
+        ];
+    }
+}
diff --git a/database/migrations/2024_06_06_080039_create_overtime_requests_table.php b/database/migrations/2024_06_06_080039_create_overtime_requests_table.php
new file mode 100644
index 00000000..aaa50b5f
--- /dev/null
+++ b/database/migrations/2024_06_06_080039_create_overtime_requests_table.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use Toby\Models\User;
+use Toby\Models\YearPeriod;
+
+return new class() extends Migration {
+    public function up(): void
+    {
+        Schema::create("overtime_requests", function (Blueprint $table): void {
+            $table->id();
+            $table->string("name");
+            $table->foreignIdFor(User::class, "creator_id")->constrained("users")->cascadeOnDelete();
+            $table->foreignIdFor(User::class)->constrained()->cascadeOnDelete();
+            $table->foreignIdFor(YearPeriod::class)->constrained()->cascadeOnDelete();
+            $table->string("state")->nullable();
+            $table->string("settlement_type");
+            $table->boolean("settled")->default(false);
+            $table->date("from");
+            $table->date("to");
+            $table->integer("hours");
+            $table->text("comment")->nullable();
+            $table->timestamps();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists("overtime_requests");
+    }
+};
diff --git a/database/migrations/2024_06_06_140009_create_overtime_request_activities_table.php b/database/migrations/2024_06_06_140009_create_overtime_request_activities_table.php
new file mode 100644
index 00000000..69328d35
--- /dev/null
+++ b/database/migrations/2024_06_06_140009_create_overtime_request_activities_table.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use Toby\Models\OvertimeRequest;
+use Toby\Models\User;
+
+return new class() extends Migration {
+    public function up(): void
+    {
+        Schema::create("overtime_request_activities", function (Blueprint $table): void {
+            $table->id();
+            $table->foreignIdFor(OvertimeRequest::class)->constrained()->cascadeOnDelete();
+            $table->foreignIdFor(User::class)->nullable()->constrained()->cascadeOnDelete();
+            $table->string("from")->nullable();
+            $table->string("to");
+            $table->timestamps();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists("overtime_request_activities");
+    }
+};
diff --git a/resources/js/Composables/settlementTypeInfo.js b/resources/js/Composables/settlementTypeInfo.js
new file mode 100644
index 00000000..9a0018ef
--- /dev/null
+++ b/resources/js/Composables/settlementTypeInfo.js
@@ -0,0 +1,29 @@
+import ClockTimeFourOutlineIcon from 'vue-material-design-icons/ClockTimeFourOutline.vue'
+import CurrencyUsdIcon from 'vue-material-design-icons/CurrencyUsd.vue'
+
+const types = [
+  {
+    text: 'Godzinowe',
+    value: 'hours',
+    icon: ClockTimeFourOutlineIcon,
+    color: 'text-blue-500',
+    border: 'border-blue-500',
+  },
+  {
+    text: 'Pieniężne',
+    value: 'money',
+    icon: CurrencyUsdIcon,
+    color: 'text-green-500',
+    border: 'border-green-500',
+  },
+]
+
+export default function useSettlementTypeInfo() {
+  const getTypes = () => types
+  const findType = value => types.find(type => type.value === value)
+
+  return {
+    getTypes,
+    findType,
+  }
+}
diff --git a/resources/js/Pages/OvertimeRequest/Create.vue b/resources/js/Pages/OvertimeRequest/Create.vue
new file mode 100644
index 00000000..9c7a5b2c
--- /dev/null
+++ b/resources/js/Pages/OvertimeRequest/Create.vue
@@ -0,0 +1,280 @@
+<script setup>
+import { useForm } from '@inertiajs/inertia-vue3'
+import FlatPickr from 'vue-flatpickr-component'
+import { CheckIcon, ChevronUpDownIcon, XCircleIcon } from '@heroicons/vue/24/solid'
+import { reactive, ref, watch } from 'vue'
+import axios from 'axios'
+import useCurrentYearPeriodInfo from '@/Composables/yearPeriodInfo.js'
+import { Listbox, ListboxButton, ListboxLabel, ListboxOption, ListboxOptions } from '@headlessui/vue'
+import VacationType from '@/Shared/VacationType.vue'
+import SettlementType from '@/Shared/SettlementType.vue'
+
+const props = defineProps({
+  auth: Object,
+  vacationUserId: [Number, null],
+  vacationFromDate: [String, null],
+  settlementTypes: Array,
+})
+
+const form = useForm({
+  user: props.auth.user,
+  from: props.vacationFromDate,
+  to: props.vacationFromDate,
+  settlementType: props.settlementTypes[0],
+  comment: null,
+})
+
+let isDirty = ref(false)
+
+watch(form, formData => {
+  const { from, to } = formData.data()
+  isDirty.value = formData.isDirty || from !== null || to !== null
+}, { immediate: true, deep: true })
+
+const estimatedDays = ref([])
+
+const { minDate, maxDate } = useCurrentYearPeriodInfo()
+
+const fromInputConfig = reactive({
+  minDate,
+  maxDate,
+  enableTime: true,
+  dateFormat: 'Y-m-d H:i',
+  altFormat: 'd.m.Y H:i',
+})
+
+const toInputConfig = reactive({
+  minDate,
+  maxDate,
+  enableTime: true,
+  dateFormat: 'Y-m-d H:i',
+  altFormat: 'd.m.Y H:i',
+})
+
+function createForm() {
+  form
+    .transform(data => ({
+      ...data,
+      user: data.user.id,
+      type: data.settlementType.value,
+    }))
+    .post('/overtime/requests')
+}
+</script>
+
+<template>
+  <InertiaHead title="Dodaj wniosek" />
+  <div class="mx-auto w-full max-w-7xl">
+    <div class="flex flex-col h-full bg-white shadow-md xl:col-span-2">
+      <div class="p-4 sm:px-6">
+        <h2 class="text-lg font-medium leading-6 text-gray-900">
+          Dodaj wniosek
+        </h2>
+      </div>
+      <form
+        class="px-6 h-full border-t border-gray-200"
+        @submit.prevent="createForm"
+      >
+        <div class="flex flex-col justify-around h-full">
+          <div>
+            <div
+              v-if="form.errors.overtimeRequest"
+              class="p-4 mt-2 bg-red-50 rounded-md"
+            >
+              <div class="flex">
+                <div class="shrink-0">
+                  <XCircleIcon class="w-5 h-5 text-red-400" />
+                </div>
+                <div class="ml-3">
+                  <h3 class="text-sm font-medium text-red-800">
+                    Wniosek nie mógł zostać utworzony
+                  </h3>
+                  <div class="mt-2 text-sm text-red-700">
+                    <span>{{ form.errors.overtimeRequest }}</span>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="items-center py-4 sm:grid sm:grid-cols-3">
+              <label
+                for="date_from"
+                class="block text-sm font-medium text-gray-700 sm:mt-px"
+              >
+                Osoba składająca wniosek
+              </label>
+              <div class="mt-1 sm:col-span-2 sm:mt-0">
+                <div class="flex justify-start items-center">
+                  <span class="inline-flex justify-center items-center w-10 h-10 rounded-full">
+                    <img
+                      class="w-10 h-10 rounded-full"
+                      :src="auth.user.avatar"
+                    >
+                  </span>
+                  <div class="ml-3">
+                    <div class="text-sm font-medium text-gray-900">
+                      {{ auth.user.name }}
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="items-center py-4 sm:grid sm:grid-cols-3">
+              <label
+                for="date_from"
+                class="block text-sm font-medium text-gray-700 sm:mt-px"
+              >
+                Data od
+              </label>
+              <div class="mt-1 sm:col-span-2 sm:mt-0">
+                <FlatPickr
+                  id="date_from"
+                  v-model="form.from"
+                  :config="fromInputConfig"
+                  class="block w-full max-w-lg rounded-md shadow-sm sm:text-sm"
+                  :class="{ 'border-red-300 text-red-900 focus:outline-none focus:ring-red-500 focus:border-red-500': form.errors.from, 'focus:ring-blumilk-500 focus:border-blumilk-500 sm:text-sm border-gray-300': !form.errors.from }"
+                />
+                <p
+                  v-if="form.errors.from"
+                  class="mt-2 text-sm text-red-600"
+                >
+                  {{ form.errors.from }}
+                </p>
+              </div>
+            </div>
+            <div class="items-center py-4 sm:grid sm:grid-cols-3">
+              <label
+                for="date_from"
+                class="block text-sm font-medium text-gray-700 sm:mt-px"
+              >
+                Data do
+              </label>
+              <div class="mt-1 sm:col-span-2 sm:mt-0">
+                <FlatPickr
+                  id="date_to"
+                  v-model="form.to"
+                  :config="toInputConfig"
+                  class="block w-full max-w-lg rounded-md shadow-sm sm:text-sm"
+                  :class="{ 'border-red-300 text-red-900 focus:outline-none focus:ring-red-500 focus:border-red-500': form.errors.to, 'focus:ring-blumilk-500 focus:border-blumilk-500 sm:text-sm border-gray-300': !form.errors.to }"
+                />
+                <p
+                  v-if="form.errors.to"
+                  class="mt-2 text-sm text-red-600"
+                >
+                  {{ form.errors.to }}
+                </p>
+              </div>
+            </div>
+            <div class="items-center py-4 sm:grid sm:grid-cols-3">
+              <span class="block text-sm font-medium text-gray-700 sm:mt-px">Liczba godzin</span>
+              <div
+                class="inline-flex items-center py-2 px-4 mt-1 w-full max-w-lg text-gray-500 bg-gray-50 rounded-md border border-gray-300 sm:col-span-2 sm:mt-0 sm:text-sm"
+              >
+                {{ estimatedDays.length }}
+              </div>
+            </div>
+            <Listbox
+              v-model="form.settlementType"
+              as="div"
+              class="items-center py-4 sm:grid sm:grid-cols-3"
+            >
+              <ListboxLabel class="block text-sm font-medium text-gray-700">
+                Typ rozliczenia nadgodzin
+              </ListboxLabel>
+              <div class="relative mt-1 sm:col-span-2 sm:mt-0">
+                <ListboxButton
+                  class="relative py-2 pr-10 pl-3 w-full max-w-lg text-left bg-white rounded-md border focus:outline-none focus:ring-1 shadow-sm cursor-default sm:text-sm"
+                  :class="{ 'border-red-300 text-red-900 focus:ring-red-500 focus:border-red-500': form.errors.type, 'focus:ring-blumilk-500 focus:border-blumilk-500 sm:text-sm border-gray-300': !form.errors.type }"
+                >
+                  <template v-if="form.settlementType">
+                    <span class="block truncate">
+                      <SettlementType :type="form.settlementType.value" />
+                    </span>
+                    <span class="flex absolute inset-y-0 right-0 items-center pr-2 pointer-events-none">
+                      <ChevronUpDownIcon class="w-5 h-5 text-gray-400" />
+                    </span>
+                  </template>
+                  <template v-else>
+                    Ładowanie...
+                  </template>
+                </ListboxButton>
+                <transition
+                  leave-active-class="transition ease-in duration-100"
+                  leave-from-class="opacity-100"
+                  leave-to-class="opacity-0"
+                >
+                  <ListboxOptions
+                    class="overflow-auto absolute z-10 py-1 mt-1 w-full max-w-lg max-h-60 text-base bg-white rounded-md focus:outline-none ring-1 ring-black ring-opacity-5 shadow-lg sm:text-sm"
+                  >
+                    <ListboxOption
+                      v-for="settlementType in settlementTypes"
+                      :key="settlementType.value"
+                      v-slot="{ active, selected }"
+                      as="template"
+                      :value="settlementType"
+                    >
+                      <li :class="[active ? 'bg-gray-100' : 'text-gray-900', 'cursor-default select-none relative py-2 pl-3 pr-9']">
+                        <span :class="[selected ? 'font-semibold' : 'font-normal', 'block truncate']">
+                          <SettlementType :type="settlementType.value" />
+                        </span>
+
+                        <span
+                          v-if="selected"
+                          :class="['text-blumilk-600 absolute inset-y-0 right-0 flex items-center pr-4']"
+                        >
+                          <CheckIcon class="w-5 h-5" />
+                        </span>
+                      </li>
+                    </ListboxOption>
+                  </ListboxOptions>
+                </transition>
+                <p
+                  v-if="form.errors.type"
+                  class="mt-2 text-sm text-red-600"
+                >
+                  {{ form.errors.type }}
+                </p>
+              </div>
+            </Listbox>
+            <div class="items-center py-4 sm:grid sm:grid-cols-3">
+              <label
+                for="comment"
+                class="block text-sm font-medium text-gray-700"
+              >
+                Komentarz
+                <span class="text-xs text-gray-500">
+                  (opcjonalny)
+                </span>
+              </label>
+              <div class="mt-1 sm:col-span-2 sm:mt-0">
+                <textarea
+                  id="comment"
+                  v-model="form.comment"
+                  rows="4"
+                  class="block w-full max-w-lg rounded-md border-gray-300 focus:border-blumilk-500 focus:ring-blumilk-500 shadow-sm sm:text-sm"
+                />
+              </div>
+            </div>
+          </div>
+          <div class="flex justify-end py-3">
+            <div class="space-x-3">
+              <InertiaLink
+                href="/vacation/requests"
+                class="py-2 px-4 text-sm font-medium text-gray-700 bg-white hover:bg-gray-50 rounded-md border border-gray-300 focus:outline-none focus:ring-2 focus:ring-blumilk-500 focus:ring-offset-2 shadow-sm"
+              >
+                Anuluj
+              </InertiaLink>
+              <button
+                type="submit"
+                class="inline-flex justify-center py-2 px-4 text-sm font-medium text-white bg-blumilk-600 rounded-md border border-transparent focus:outline-none focus:ring-2 focus:ring-blumilk-500 focus:ring-offset-2 shadow-sm"
+                :class="[form.processing || !isDirty ? 'disabled:opacity-60' : 'hover:bg-blumilk-700']"
+                :disabled="form.processing || !isDirty"
+              >
+                Dodaj
+              </button>
+            </div>
+          </div>
+        </div>
+      </form>
+    </div>
+  </div>
+</template>
diff --git a/resources/js/Shared/SettlementType.vue b/resources/js/Shared/SettlementType.vue
new file mode 100644
index 00000000..1d0d3992
--- /dev/null
+++ b/resources/js/Shared/SettlementType.vue
@@ -0,0 +1,23 @@
+<script setup>
+import { computed } from 'vue'
+import useSettlementTypeInfo from '@/Composables/settlementTypeInfo.js'
+
+const props = defineProps({
+  type: String,
+})
+
+const { findType } = useSettlementTypeInfo()
+
+const settlementTypeInfo = computed(() => findType(props.type))
+</script>
+
+<template>
+  <div class="flex items-center">
+    <component
+      :is="settlementTypeInfo.icon"
+      :class="[settlementTypeInfo.color ,'w-5 h-5 mr-1.5']"
+      :size="20"
+    />
+    <span>{{ settlementTypeInfo.text }}</span>
+  </div>
+</template>
diff --git a/routes/web.php b/routes/web.php
index ed81ec18..0f16e4f6 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -18,6 +18,7 @@
 use Toby\Http\Controllers\LoginController;
 use Toby\Http\Controllers\LogoutController;
 use Toby\Http\Controllers\MonthlyUsageController;
+use Toby\Http\Controllers\OvertimeRequestController;
 use Toby\Http\Controllers\PermissionController;
 use Toby\Http\Controllers\ResumeController;
 use Toby\Http\Controllers\SelectYearPeriodController;
@@ -159,6 +160,12 @@
         Route::get("/annual-summary", AnnualSummaryController::class)
             ->name("annual-summary");
     });
+    Route::prefix("/overtime")->as("vacation.")->group(function (): void {
+        Route::get("/requests/create", [OvertimeRequestController::class, "create"])
+            ->name("overtime.create");
+        Route::post("/requests", [OvertimeRequestController::class, "store"])
+            ->name("overtime.store");
+    });
 });
 
 Route::middleware("guest")->group(function (): void {

From 5cd5a1bd1c8e9d442b670795400b52498abcf564 Mon Sep 17 00:00:00 2001
From: Kamil <kamil.piech.97@gmail.com>
Date: Fri, 7 Jun 2024 14:57:46 +0200
Subject: [PATCH 02/14] #444 - wip: added full workflow for overtime

---
 .../AcceptAsTechnicalAction.php               |  26 ++
 app/Actions/OvertimeRequest/ApproveAction.php |  21 ++
 app/Actions/OvertimeRequest/CancelAction.php  |  21 ++
 app/Actions/OvertimeRequest/CreateAction.php  |   5 +-
 app/Actions/OvertimeRequest/RejectAction.php  |  21 ++
 app/Actions/OvertimeRequest/SettleAction.php  |  21 ++
 .../WaitForTechApprovalAction.php             |  22 ++
 app/Domain/OvertimeRequestStateManager.php    |   6 +
 app/Domain/OvertimeRequestStatesRetriever.php |   6 +-
 .../Controllers/OvertimeRequestController.php | 176 +++++++++
 app/Http/Requests/OvertimeRequestRequest.php  |   2 +-
 .../OvertimeRequestActivityResource.php       |  22 ++
 .../Resources/OvertimeRequestResource.php     |  52 +++
 app/Models/OvertimeRequest.php                |   8 +
 app/Models/User.php                           |   5 +
 app/Policies/OvertimeRequestPolicy.php        |  56 +++
 app/Providers/AuthServiceProvider.php         |   3 +
 ..._080039_create_overtime_requests_table.php |   4 +-
 resources/js/Composables/statusInfo.js        |  15 +
 resources/js/Pages/OvertimeRequest/Create.vue |   2 -
 resources/js/Pages/OvertimeRequest/Index.vue  | 244 +++++++++++++
 .../OvertimeRequest/IndexForApprovers.vue     | 336 ++++++++++++++++++
 resources/js/Pages/OvertimeRequest/Show.vue   | 222 ++++++++++++
 resources/js/Shared/MainMenu.vue              |  15 +
 routes/web.php                                |  27 +-
 25 files changed, 1324 insertions(+), 14 deletions(-)
 create mode 100644 app/Actions/OvertimeRequest/AcceptAsTechnicalAction.php
 create mode 100644 app/Actions/OvertimeRequest/ApproveAction.php
 create mode 100644 app/Actions/OvertimeRequest/CancelAction.php
 create mode 100644 app/Actions/OvertimeRequest/RejectAction.php
 create mode 100644 app/Actions/OvertimeRequest/SettleAction.php
 create mode 100644 app/Actions/OvertimeRequest/WaitForTechApprovalAction.php
 create mode 100644 app/Http/Resources/OvertimeRequestActivityResource.php
 create mode 100644 app/Http/Resources/OvertimeRequestResource.php
 create mode 100644 app/Policies/OvertimeRequestPolicy.php
 create mode 100644 resources/js/Pages/OvertimeRequest/Index.vue
 create mode 100644 resources/js/Pages/OvertimeRequest/IndexForApprovers.vue
 create mode 100644 resources/js/Pages/OvertimeRequest/Show.vue

diff --git a/app/Actions/OvertimeRequest/AcceptAsTechnicalAction.php b/app/Actions/OvertimeRequest/AcceptAsTechnicalAction.php
new file mode 100644
index 00000000..b5e4feac
--- /dev/null
+++ b/app/Actions/OvertimeRequest/AcceptAsTechnicalAction.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Actions\OvertimeRequest;
+
+use Toby\Domain\OvertimeRequestStateManager;
+use Toby\Domain\VacationTypeConfigRetriever;
+use Toby\Models\OvertimeRequest;
+use Toby\Models\User;
+
+class AcceptAsTechnicalAction
+{
+    public function __construct(
+        protected OvertimeRequestStateManager $stateManager,
+        protected VacationTypeConfigRetriever $configRetriever,
+        protected ApproveAction $approveAction,
+    ) {}
+
+    public function execute(OvertimeRequest $overtimeRequest, User $user): void
+    {
+        $this->stateManager->acceptAsTechnical($overtimeRequest, $user);
+
+        $this->approveAction->execute($overtimeRequest);
+    }
+}
diff --git a/app/Actions/OvertimeRequest/ApproveAction.php b/app/Actions/OvertimeRequest/ApproveAction.php
new file mode 100644
index 00000000..b42ee417
--- /dev/null
+++ b/app/Actions/OvertimeRequest/ApproveAction.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Actions\OvertimeRequest;
+
+use Toby\Domain\OvertimeRequestStateManager;
+use Toby\Models\OvertimeRequest;
+use Toby\Models\User;
+
+class ApproveAction
+{
+    public function __construct(
+        protected OvertimeRequestStateManager $stateManager,
+    ) {}
+
+    public function execute(OvertimeRequest $overtimeRequest, ?User $user = null): void
+    {
+        $this->stateManager->approve($overtimeRequest, $user);
+    }
+}
diff --git a/app/Actions/OvertimeRequest/CancelAction.php b/app/Actions/OvertimeRequest/CancelAction.php
new file mode 100644
index 00000000..66391ca2
--- /dev/null
+++ b/app/Actions/OvertimeRequest/CancelAction.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Actions\OvertimeRequest;
+
+use Toby\Domain\OvertimeRequestStateManager;
+use Toby\Models\OvertimeRequest;
+use Toby\Models\User;
+
+class CancelAction
+{
+    public function __construct(
+        protected OvertimeRequestStateManager $stateManager,
+    ) {}
+
+    public function execute(OvertimeRequest $overtimeRequest, User $user): void
+    {
+        $this->stateManager->cancel($overtimeRequest, $user);
+    }
+}
diff --git a/app/Actions/OvertimeRequest/CreateAction.php b/app/Actions/OvertimeRequest/CreateAction.php
index 4de92e7e..35c8e92d 100644
--- a/app/Actions/OvertimeRequest/CreateAction.php
+++ b/app/Actions/OvertimeRequest/CreateAction.php
@@ -5,14 +5,11 @@
 namespace Toby\Actions\OvertimeRequest;
 
 use Illuminate\Validation\ValidationException;
-use Toby\Actions\VacationRequest\ApproveAction;
-use Toby\Actions\VacationRequest\WaitForTechApprovalAction;
 use Toby\Domain\OvertimeCalculator;
 use Toby\Domain\OvertimeRequestStateManager;
 use Toby\Models\OvertimeRequest;
 use Toby\Models\User;
 use Toby\Models\VacationRequest;
-use Toby\Notifications\VacationRequestCreatedNotification;
 
 class CreateAction
 {
@@ -20,7 +17,6 @@ public function __construct(
         protected OvertimeRequestStateManager $stateManager,
         protected WaitForTechApprovalAction $waitForTechApprovalAction,
         protected OvertimeCalculator $overtimeCalculator,
-        protected ApproveAction $approveAction,
     ) {}
 
     /**
@@ -50,6 +46,7 @@ protected function createVacationRequest(array $data, User $creator): OvertimeRe
 
     protected function handleCreatedOvertimeRequest(OvertimeRequest $overtimeRequest): void
     {
+        $this->waitForTechApprovalAction->execute($overtimeRequest);
     }
 
     protected function notify(VacationRequest $vacationRequest): void
diff --git a/app/Actions/OvertimeRequest/RejectAction.php b/app/Actions/OvertimeRequest/RejectAction.php
new file mode 100644
index 00000000..8a74c2fb
--- /dev/null
+++ b/app/Actions/OvertimeRequest/RejectAction.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Actions\OvertimeRequest;
+
+use Toby\Domain\OvertimeRequestStateManager;
+use Toby\Models\OvertimeRequest;
+use Toby\Models\User;
+
+class RejectAction
+{
+    public function __construct(
+        protected OvertimeRequestStateManager $stateManager,
+    ) {}
+
+    public function execute(OvertimeRequest $overtimeRequest, User $user): void
+    {
+        $this->stateManager->reject($overtimeRequest, $user);
+    }
+}
diff --git a/app/Actions/OvertimeRequest/SettleAction.php b/app/Actions/OvertimeRequest/SettleAction.php
new file mode 100644
index 00000000..71c09b29
--- /dev/null
+++ b/app/Actions/OvertimeRequest/SettleAction.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Actions\OvertimeRequest;
+
+use Toby\Domain\OvertimeRequestStateManager;
+use Toby\Models\OvertimeRequest;
+use Toby\Models\User;
+
+class SettleAction
+{
+    public function __construct(
+        protected OvertimeRequestStateManager $stateManager,
+    ) {}
+
+    public function execute(OvertimeRequest $overtimeRequest, User $user): void
+    {
+        $this->stateManager->settle($overtimeRequest, $user);
+    }
+}
diff --git a/app/Actions/OvertimeRequest/WaitForTechApprovalAction.php b/app/Actions/OvertimeRequest/WaitForTechApprovalAction.php
new file mode 100644
index 00000000..ce0e1f60
--- /dev/null
+++ b/app/Actions/OvertimeRequest/WaitForTechApprovalAction.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Actions\OvertimeRequest;
+
+use Toby\Actions\VacationRequest\ApproveAction;
+use Toby\Domain\OvertimeRequestStateManager;
+use Toby\Models\OvertimeRequest;
+
+class WaitForTechApprovalAction
+{
+    public function __construct(
+        protected OvertimeRequestStateManager $stateManager,
+        protected ApproveAction $approveAction,
+    ) {}
+
+    public function execute(OvertimeRequest $overtimeRequest): void
+    {
+        $this->stateManager->waitForTechnical($overtimeRequest);
+    }
+}
diff --git a/app/Domain/OvertimeRequestStateManager.php b/app/Domain/OvertimeRequestStateManager.php
index aef32536..f76e2d5e 100644
--- a/app/Domain/OvertimeRequestStateManager.php
+++ b/app/Domain/OvertimeRequestStateManager.php
@@ -12,6 +12,7 @@
 use Toby\States\OvertimeRequest\Cancelled;
 use Toby\States\OvertimeRequest\OvertimeRequestState;
 use Toby\States\OvertimeRequest\Rejected;
+use Toby\States\OvertimeRequest\Settled;
 use Toby\States\OvertimeRequest\WaitingForTechnical;
 
 class OvertimeRequestStateManager
@@ -50,6 +51,11 @@ public function waitForTechnical(OvertimeRequest $overtimeRequest): void
         $this->changeState($overtimeRequest, WaitingForTechnical::class);
     }
 
+    public function settle(OvertimeRequest $overtimeRequest, User $user): void
+    {
+        $this->changeState($overtimeRequest, Settled::class, $user);
+    }
+
     protected function changeState(OvertimeRequest $overtimeRequest, string $state, ?User $user = null): void
     {
         $previousState = $overtimeRequest->state;
diff --git a/app/Domain/OvertimeRequestStatesRetriever.php b/app/Domain/OvertimeRequestStatesRetriever.php
index f2d11fb6..9dab9821 100644
--- a/app/Domain/OvertimeRequestStatesRetriever.php
+++ b/app/Domain/OvertimeRequestStatesRetriever.php
@@ -11,6 +11,7 @@
 use Toby\States\OvertimeRequest\Cancelled;
 use Toby\States\OvertimeRequest\Created;
 use Toby\States\OvertimeRequest\Rejected;
+use Toby\States\OvertimeRequest\Settled;
 use Toby\States\OvertimeRequest\WaitingForTechnical;
 
 class OvertimeRequestStatesRetriever
@@ -26,7 +27,10 @@ public static function pendingStates(): array
 
     public static function successStates(): array
     {
-        return [Approved::class];
+        return [
+            Approved::class,
+            Settled::class,
+        ];
     }
 
     public static function failedStates(): array
diff --git a/app/Http/Controllers/OvertimeRequestController.php b/app/Http/Controllers/OvertimeRequestController.php
index c9667b42..018454a0 100644
--- a/app/Http/Controllers/OvertimeRequestController.php
+++ b/app/Http/Controllers/OvertimeRequestController.php
@@ -4,14 +4,126 @@
 
 namespace Toby\Http\Controllers;
 
+use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
 use Inertia\Response;
+use Toby\Actions\OvertimeRequest\AcceptAsTechnicalAction;
+use Toby\Actions\OvertimeRequest\CancelAction;
 use Toby\Actions\OvertimeRequest\CreateAction;
+use Toby\Actions\OvertimeRequest\RejectAction;
+use Toby\Actions\OvertimeRequest\SettleAction;
+use Toby\Domain\OvertimeRequestStatesRetriever;
 use Toby\Enums\SettlementType;
+use Toby\Helpers\YearPeriodRetriever;
 use Toby\Http\Requests\OvertimeRequestRequest;
+use Toby\Http\Resources\OvertimeRequestActivityResource;
+use Toby\Http\Resources\OvertimeRequestResource;
+use Toby\Http\Resources\SimpleUserResource;
+use Toby\Models\OvertimeRequest;
+use Toby\Models\User;
 
 class OvertimeRequestController extends Controller
 {
+    public function index(Request $request, YearPeriodRetriever $yearPeriodRetriever): Response|RedirectResponse
+    {
+        if ($request->user()->can("listAllRequests")) {
+            return redirect()->route("overtime.requests.indexForApprovers");
+        }
+
+        $status = $request->get("status", "all");
+
+        $overtimeRequests = $request->user()
+            ->overtimeRequests()
+            ->with(["user.permissions", "user.profile"])
+            ->whereBelongsTo($yearPeriodRetriever->selected())
+            ->latest()
+            ->states(OvertimeRequestStatesRetriever::filterByStatusGroup($status, $request->user()))
+            ->paginate();
+
+        $pending = $request->user()
+            ->overtimeRequests()
+            ->whereBelongsTo($yearPeriodRetriever->selected())
+            ->states(OvertimeRequestStatesRetriever::pendingStates())
+            ->count();
+
+        $success = $request->user()
+            ->overtimeRequests()
+            ->whereBelongsTo($yearPeriodRetriever->selected())
+            ->states(OvertimeRequestStatesRetriever::successStates())
+            ->count();
+
+        $failed = $request->user()
+            ->overtimeRequests()
+            ->whereBelongsTo($yearPeriodRetriever->selected())
+            ->states(OvertimeRequestStatesRetriever::failedStates())
+            ->count();
+
+        return inertia("OvertimeRequest/Index", [
+            "requests" => OvertimeRequestResource::collection($overtimeRequests),
+            "stats" => [
+                "all" => $pending + $success + $failed,
+                "pending" => $pending,
+                "success" => $success,
+                "failed" => $failed,
+            ],
+            "filters" => [
+                "status" => $status,
+            ],
+        ]);
+    }
+
+    public function indexForApprovers(
+        Request $request,
+        YearPeriodRetriever $yearPeriodRetriever,
+    ): RedirectResponse|Response {
+        if ($request->user()->cannot("listAllRequests")) {
+            return redirect()->route("overtime.requests.index");
+        }
+
+        $yearPeriod = $yearPeriodRetriever->selected();
+        $status = $request->get("status", "all");
+        $user = $request->get("user");
+
+        $overtimeRequests = OvertimeRequest::query()
+            ->with(["user.permissions", "user.profile"])
+            ->whereBelongsTo($yearPeriod)
+            ->when($user !== null, fn(Builder $query): Builder => $query->where("user_id", $user))
+            ->states(OvertimeRequestStatesRetriever::filterByStatusGroup($status, $request->user()))
+            ->latest()
+            ->paginate();
+
+        $users = User::query()
+            ->orderByProfileField("last_name")
+            ->orderByProfileField("first_name")
+            ->get();
+
+        return inertia("OvertimeRequest/IndexForApprovers", [
+            "requests" => OvertimeRequestResource::collection($overtimeRequests),
+            "users" => SimpleUserResource::collection($users),
+            "filters" => [
+                "status" => $status,
+                "user" => (int)$user,
+            ],
+        ]);
+    }
+
+    /**
+     * @throws AuthorizationException
+     */
+    public function show(OvertimeRequest $overtimeRequest): Response
+    {
+        $this->authorize("show", $overtimeRequest);
+
+        $overtimeRequest->load(["user.permissions", "user.profile", "activities.user.profile"]);
+
+        return inertia("OvertimeRequest/Show", [
+            "request" => new OvertimeRequestResource($overtimeRequest),
+            "activities" => OvertimeRequestActivityResource::collection($overtimeRequest->activities),
+        ]);
+    }
+
     public function create(): Response
     {
         return inertia("OvertimeRequest/Create", [
@@ -27,4 +139,68 @@ public function store(OvertimeRequestRequest $request, CreateAction $createActio
             ->route("overtime.requests.show", $overtimeRequest)
             ->with("success", __("Request created."));
     }
+
+    /**
+     * @throws AuthorizationException
+     */
+    public function reject(
+        Request $request,
+        OvertimeRequest $overtimeRequest,
+        RejectAction $rejectAction,
+    ): RedirectResponse {
+        $this->authorize("reject", $overtimeRequest);
+
+        $rejectAction->execute($overtimeRequest, $request->user());
+
+        return redirect()->back()
+            ->with("success", __("Request rejected."));
+    }
+
+    /**
+     * @throws AuthorizationException
+     */
+    public function cancel(
+        Request $request,
+        OvertimeRequest $overtimeRequest,
+        CancelAction $cancelAction,
+    ): RedirectResponse {
+        $this->authorize("cancel", $overtimeRequest);
+
+        $cancelAction->execute($overtimeRequest, $request->user());
+
+        return redirect()->back()
+            ->with("success", __("Request cancelled."));
+    }
+
+    /**
+     * @throws AuthorizationException
+     */
+    public function acceptAsTechnical(
+        Request $request,
+        OvertimeRequest $overtimeRequest,
+        AcceptAsTechnicalAction $acceptAsTechnicalAction,
+    ): RedirectResponse {
+        $this->authorize("acceptAsTechApprover", $overtimeRequest);
+
+        $acceptAsTechnicalAction->execute($overtimeRequest, $request->user());
+
+        return redirect()->back()
+            ->with("success", __("Request accepted."));
+    }
+
+    /**
+     * @throws AuthorizationException
+     */
+    public function settle(
+        Request $request,
+        OvertimeRequest $overtimeRequest,
+        SettleAction $settleAction,
+    ): RedirectResponse {
+        $this->authorize("settle", $overtimeRequest);
+
+        $settleAction->execute($overtimeRequest, $request->user());
+
+        return redirect()->back()
+            ->with("success", __("Request settled."));
+    }
 }
diff --git a/app/Http/Requests/OvertimeRequestRequest.php b/app/Http/Requests/OvertimeRequestRequest.php
index 9f5f0bdb..734203bd 100644
--- a/app/Http/Requests/OvertimeRequestRequest.php
+++ b/app/Http/Requests/OvertimeRequestRequest.php
@@ -18,7 +18,7 @@ public function rules(): array
         return [
             "user" => ["required", "exists:users,id"],
             "from" => ["required", "date_format:Y-m-d H:i", new YearPeriodExists()],
-            "to" => ["required", "date_format:Y-m-d H:i", new YearPeriodExists()],
+            "to" => ["required", "date_format:Y-m-d H:i", "after:from", new YearPeriodExists()],
             "type" => ["required", new Enum(SettlementType::class)],
             "comment" => ["nullable"],
         ];
diff --git a/app/Http/Resources/OvertimeRequestActivityResource.php b/app/Http/Resources/OvertimeRequestActivityResource.php
new file mode 100644
index 00000000..f21831fd
--- /dev/null
+++ b/app/Http/Resources/OvertimeRequestActivityResource.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class OvertimeRequestActivityResource extends JsonResource
+{
+    public static $wrap = null;
+
+    public function toArray($request): array
+    {
+        return [
+            "date" => $this->created_at->toDisplayString(),
+            "time" => $this->created_at->format("H:i"),
+            "user" => $this->user ? $this->user->profile->full_name : __("System"),
+            "state" => $this->to,
+        ];
+    }
+}
diff --git a/app/Http/Resources/OvertimeRequestResource.php b/app/Http/Resources/OvertimeRequestResource.php
new file mode 100644
index 00000000..a7daa406
--- /dev/null
+++ b/app/Http/Resources/OvertimeRequestResource.php
@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+use Toby\States\OvertimeRequest\AcceptedByTechnical;
+use Toby\States\OvertimeRequest\Cancelled;
+use Toby\States\OvertimeRequest\Rejected;
+use Toby\States\OvertimeRequest\Settled;
+
+class OvertimeRequestResource extends JsonResource
+{
+    public static $wrap = null;
+
+    public function toArray($request): array
+    {
+        $user = $request->user();
+
+        return [
+            "id" => $this->id,
+            "name" => $this->name,
+            "user" => new SimpleUserResource($this->user),
+            "state" => $this->state,
+            "from" => $this->from->format("Y-m-d H:i"),
+            "to" => $this->to->format("Y-m-d H:i"),
+            "hours" => $this->hours,
+            "settlementType" => $this->settlement_type,
+            "settled" => $this->settled,
+            "displayDate" => $this->getDate($this->from->toDisplayString(), $this->to->toDisplayString()),
+            "comment" => $this->comment,
+            "can" => [
+                "acceptAsTechnical" => $this->resource->state->canTransitionTo(AcceptedByTechnical::class)
+                    && $user->can("acceptAsTechApprover", $this->resource),
+                "reject" => $this->resource->state->canTransitionTo(Rejected::class)
+                    && $user->can("reject", $this->resource),
+                "cancel" => $this->resource->state->canTransitionTo(Cancelled::class)
+                    && $user->can("cancel", $this->resource),
+                "settle" => $this->resource->state->canTransitionTo(Settled::class)
+                    && $user->can("settle", $this->resource),
+            ],
+        ];
+    }
+
+    private function getDate(string $from, string $to): string
+    {
+        return ($from !== $to)
+            ? "{$from} - {$to}"
+            : $from;
+    }
+}
diff --git a/app/Models/OvertimeRequest.php b/app/Models/OvertimeRequest.php
index 0c7293e5..c38c8a4e 100644
--- a/app/Models/OvertimeRequest.php
+++ b/app/Models/OvertimeRequest.php
@@ -5,11 +5,13 @@
 namespace Toby\Models;
 
 use Database\Factories\OvertimeRequestFactory;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Collection;
 use Spatie\ModelStates\HasStates;
 use Toby\Enums\SettlementType;
 use Toby\States\OvertimeRequest\OvertimeRequestState;
@@ -27,6 +29,7 @@
  * @property User $user
  * @property User $creator
  * @property YearPeriod $yearPeriod
+ * @property Collection $activities
  * @property Carbon $created_at
  * @property Carbon $updated_at
  */
@@ -66,6 +69,11 @@ public function activities(): HasMany
         return $this->hasMany(OvertimeRequestActivity::class);
     }
 
+    public function scopeStates(Builder $query, OvertimeRequestState|array $states): Builder
+    {
+        return $query->whereState("state", $states);
+    }
+
     protected static function newFactory(): OvertimeRequestFactory
     {
         return OvertimeRequestFactory::new();
diff --git a/app/Models/User.php b/app/Models/User.php
index 4266fb00..d214b7bb 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -70,6 +70,11 @@ public function vacationRequests(): HasMany
         return $this->hasMany(VacationRequest::class);
     }
 
+    public function overtimeRequests(): HasMany
+    {
+        return $this->hasMany(OvertimeRequest::class);
+    }
+
     public function createdVacationRequests(): HasMany
     {
         return $this->hasMany(VacationRequest::class, "creator_id");
diff --git a/app/Policies/OvertimeRequestPolicy.php b/app/Policies/OvertimeRequestPolicy.php
new file mode 100644
index 00000000..622e913a
--- /dev/null
+++ b/app/Policies/OvertimeRequestPolicy.php
@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Policies;
+
+use Toby\Models\OvertimeRequest;
+use Toby\Models\User;
+use Toby\States\OvertimeRequest\Approved;
+use Toby\States\OvertimeRequest\Created;
+use Toby\States\OvertimeRequest\WaitingForTechnical;
+
+class OvertimeRequestPolicy
+{
+    public function acceptAsTechApprover(User $user): bool
+    {
+        return $user->hasPermissionTo("manageRequestsAsTechnicalApprover");
+    }
+
+    public function reject(User $user): bool
+    {
+        return $user->hasPermissionTo("manageRequestsAsTechnicalApprover");
+    }
+
+    public function cancel(User $user, OvertimeRequest $overtimeRequest): bool
+    {
+        if ($overtimeRequest->user->is($user) && $overtimeRequest->state->equals(
+            Created::class,
+            WaitingForTechnical::class,
+        )) {
+            return true;
+        }
+
+        return $user->hasPermissionTo("manageRequestsAsTechnicalApprover");
+    }
+
+    public function settle(User $user, OvertimeRequest $overtimeRequest): bool
+    {
+        if ($overtimeRequest->user->is($user) && $overtimeRequest->state->equals(
+            Approved::class,
+        )) {
+            return true;
+        }
+
+        return $user->hasPermissionTo("manageRequestsAsTechnicalApprover");
+    }
+
+    public function show(User $user, OvertimeRequest $overtimeRequest): bool
+    {
+        if ($overtimeRequest->user->is($user)) {
+            return true;
+        }
+
+        return $user->hasPermissionTo("manageRequestsAsTechnicalApprover");
+    }
+}
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
index b31603e1..da545c00 100644
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -6,13 +6,16 @@
 
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
 use Toby\Models\Key;
+use Toby\Models\OvertimeRequest;
 use Toby\Models\VacationRequest;
 use Toby\Policies\KeyPolicy;
+use Toby\Policies\OvertimeRequestPolicy;
 use Toby\Policies\VacationRequestPolicy;
 
 class AuthServiceProvider extends ServiceProvider
 {
     protected $policies = [
+        OvertimeRequest::class => OvertimeRequestPolicy::class,
         VacationRequest::class => VacationRequestPolicy::class,
         Key::class => KeyPolicy::class,
     ];
diff --git a/database/migrations/2024_06_06_080039_create_overtime_requests_table.php b/database/migrations/2024_06_06_080039_create_overtime_requests_table.php
index aaa50b5f..5967cd4d 100644
--- a/database/migrations/2024_06_06_080039_create_overtime_requests_table.php
+++ b/database/migrations/2024_06_06_080039_create_overtime_requests_table.php
@@ -20,8 +20,8 @@ public function up(): void
             $table->string("state")->nullable();
             $table->string("settlement_type");
             $table->boolean("settled")->default(false);
-            $table->date("from");
-            $table->date("to");
+            $table->dateTime("from");
+            $table->dateTime("to");
             $table->integer("hours");
             $table->text("comment")->nullable();
             $table->timestamps();
diff --git a/resources/js/Composables/statusInfo.js b/resources/js/Composables/statusInfo.js
index cd625956..06b039b5 100644
--- a/resources/js/Composables/statusInfo.js
+++ b/resources/js/Composables/statusInfo.js
@@ -5,6 +5,7 @@ import {
   HandThumbDownIcon as OutlineHandThumbDownIcon,
   HandThumbUpIcon as OutlineHandThumbUpIcon,
   XMarkIcon as OutlineXMarkIcon,
+  BanknotesIcon as OutlineBanknotesIcon,
 } from '@heroicons/vue/24/outline'
 
 import {
@@ -14,6 +15,7 @@ import {
   HandThumbDownIcon as SolidHandThumbDownIcon,
   HandThumbUpIcon as SolidHandThumbUpIcon,
   XMarkIcon as SolidXMarkIcon,
+  BanknotesIcon as BanknotesIcon,
 } from '@heroicons/vue/24/solid'
 
 const statuses = [
@@ -121,6 +123,19 @@ const statuses = [
       color: 'text-gray-900',
     },
   },
+  {
+    text: 'Rozliczony',
+    value: 'settled',
+    outline: {
+      icon: OutlineBanknotesIcon,
+      foreground: 'text-white',
+      background: 'bg-green-500',
+    },
+    solid: {
+      icon: BanknotesIcon,
+      color: 'text-green-500',
+    },
+  },
 ]
 
 export function useStatusInfo() {
diff --git a/resources/js/Pages/OvertimeRequest/Create.vue b/resources/js/Pages/OvertimeRequest/Create.vue
index 9c7a5b2c..b95a8ab7 100644
--- a/resources/js/Pages/OvertimeRequest/Create.vue
+++ b/resources/js/Pages/OvertimeRequest/Create.vue
@@ -3,10 +3,8 @@ import { useForm } from '@inertiajs/inertia-vue3'
 import FlatPickr from 'vue-flatpickr-component'
 import { CheckIcon, ChevronUpDownIcon, XCircleIcon } from '@heroicons/vue/24/solid'
 import { reactive, ref, watch } from 'vue'
-import axios from 'axios'
 import useCurrentYearPeriodInfo from '@/Composables/yearPeriodInfo.js'
 import { Listbox, ListboxButton, ListboxLabel, ListboxOption, ListboxOptions } from '@headlessui/vue'
-import VacationType from '@/Shared/VacationType.vue'
 import SettlementType from '@/Shared/SettlementType.vue'
 
 const props = defineProps({
diff --git a/resources/js/Pages/OvertimeRequest/Index.vue b/resources/js/Pages/OvertimeRequest/Index.vue
new file mode 100644
index 00000000..536ce789
--- /dev/null
+++ b/resources/js/Pages/OvertimeRequest/Index.vue
@@ -0,0 +1,244 @@
+<script setup>
+import { ChevronRightIcon, ChevronUpDownIcon, CheckIcon } from '@heroicons/vue/24/solid'
+import Status from '@/Shared/Status.vue'
+import Pagination from '@/Shared/Pagination.vue'
+import { Listbox, ListboxButton, ListboxLabel, ListboxOption, ListboxOptions } from '@headlessui/vue'
+import { reactive, watch } from 'vue'
+import { debounce } from 'lodash'
+import { Inertia } from '@inertiajs/inertia'
+import EmptyState from '@/Shared/Feedbacks/EmptyState.vue'
+import SettlementType from '@/Shared/SettlementType.vue'
+
+const props = defineProps({
+  requests: Object,
+  stats: Object,
+  filters: Object,
+})
+
+const statuses = [
+  {
+    name: 'Wszystkie',
+    value: 'all',
+  },
+  {
+    name: 'W trakcie',
+    value: 'pending',
+  },
+  {
+    name: 'Zatwierdzone',
+    value: 'success',
+  },
+  {
+    name: 'Odrzucone/anulowane',
+    value: 'failed',
+  },
+]
+
+const form = reactive({
+  status: statuses.find(status => status.value === props.filters.status) ?? statuses[0],
+  withoutRemote: props.filters.withoutRemote ?? false,
+})
+
+watch(form, debounce(() => {
+  Inertia.get('/overtime/requests/me', { status: form.status.value, withoutRemote: form.withoutRemote }, {
+    preserveState: true,
+    replace: false,
+  })
+}, 300))
+
+</script>
+
+<template>
+  <InertiaHead title="Moje wnioski" />
+  <div class="bg-white shadow-md">
+    <div class="flex justify-between items-center p-4 sm:px-6">
+      <h2 class="text-lg font-medium leading-6 text-gray-900">
+        Moje nadgodziny
+      </h2>
+      <div>
+        <InertiaLink
+          href="/overtime/requests/create"
+          class="inline-flex items-center py-3 px-4 text-sm font-medium leading-4 text-white bg-blumilk-600 hover:bg-blumilk-700 rounded-md border border-transparent focus:outline-none focus:ring-2 focus:ring-blumilk-500 focus:ring-offset-2 shadow-sm"
+        >
+          Dodaj wniosek
+        </InertiaLink>
+      </div>
+    </div>
+    <div class="border-t border-gray-200">
+      <div class="hidden relative divide-x divide-gray-200 shadow md:flex">
+        <button
+          v-for="(status, index) in statuses"
+          :key="index"
+          :class="[status.value === filters.status ? 'text-blumilk-600 font-semibold' : 'hover:bg-blumilk-25 text-gray-700 focus:z-10', 'group relative min-w-0 flex-1 overflow-hidden focus:outline-blumilk-500 bg-white py-4 px-4 text-sm font-medium text-center']"
+          @click="form.status = status"
+        >
+          <span>{{ status.name }}</span>
+          <span
+            v-if="stats[status.value]"
+            :class="[status.value === filters.status ? 'bg-blumilk-50 text-blumilk-600' : 'bg-gray-100 text-gray-600', 'hidden ml-3 py-0.5 px-2.5 rounded-full text-xs font-semibold 2xl:inline-block']"
+          >
+            {{ stats[status.value] }}
+          </span>
+          <span
+            :class="[status.value === filters.status ? 'bg-blumilk-500' : 'bg-transparent', 'absolute inset-x-0 bottom-0 h-0.5']"
+          />
+        </button>
+      </div>
+      <div class="grid grid-cols-1 gap-2 p-4 md:hidden md:grid-cols-2 md:gap-4">
+        <Listbox
+          v-model="form.status"
+          as="div"
+        >
+          <ListboxLabel class="block mb-2 text-sm font-medium text-gray-700">
+            Status
+          </ListboxLabel>
+          <div class="relative mt-1 sm:mt-0">
+            <ListboxButton
+              class="relative py-2 pr-10 pl-3 w-full max-w-lg h-10 text-left bg-white rounded-md border border-gray-300 focus:border-blumilk-500 focus:outline-none focus:ring-1 focus:ring-blumilk-500 shadow-sm cursor-default sm:text-sm"
+            >
+              <span class="flex items-center">
+                {{ form.status.name }}
+              </span>
+              <span class="flex absolute inset-y-0 right-0 items-center pr-2 pointer-events-none">
+                <ChevronUpDownIcon class="w-5 h-5 text-gray-400" />
+              </span>
+            </ListboxButton>
+
+            <transition
+              leave-active-class="transition ease-in duration-100"
+              leave-from-class="opacity-100"
+              leave-to-class="opacity-0"
+            >
+              <ListboxOptions
+                class="overflow-auto absolute z-10 py-1 mt-1 w-full max-w-lg max-h-60 text-base bg-white rounded-md focus:outline-none ring-1 ring-black ring-opacity-5 shadow-lg sm:text-sm"
+              >
+                <ListboxOption
+                  v-for="status in statuses"
+                  :key="status.value"
+                  v-slot="{ active, selected }"
+                  as="template"
+                  :value="status"
+                >
+                  <li
+                    :class="[active ? 'bg-gray-100' : 'text-gray-900', 'cursor-default truncate select-none relative py-2 pl-3 pr-9']"
+                  >
+                    {{ status.name }}
+
+                    <span
+                      v-if="selected"
+                      :class="['text-blumilk-600 absolute inset-y-0 right-0 flex items-center pr-4']"
+                    >
+                      <CheckIcon class="w-5 h-5" />
+                    </span>
+                  </li>
+                </ListboxOption>
+              </ListboxOptions>
+            </transition>
+          </div>
+        </Listbox>
+      </div>
+    </div>
+    <div class="overflow-auto xl:overflow-visible">
+      <table class="min-w-full divide-y divide-gray-200">
+        <thead class="bg-gray-50">
+          <tr>
+            <th
+              scope="col"
+              class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
+            >
+              Numer
+            </th>
+            <th
+              scope="col"
+              class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
+            >
+              Od
+            </th>
+            <th
+              scope="col"
+              class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
+            >
+              Do
+            </th>
+            <th
+              scope="col"
+              class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
+            >
+              Liczba godzin
+            </th>
+            <th
+              scope="col"
+              class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
+            >
+              Sposób rozliczenia
+            </th>
+            <th
+              scope="col"
+              class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
+            >
+              Status
+            </th>
+            <th scope="col" />
+          </tr>
+        </thead>
+        <tbody class="bg-white divide-y divide-gray-100">
+          <InertiaLink
+            v-for="request in requests.data"
+            :key="request.id"
+            :href="`/overtime/requests/${request.id}`"
+            as="tr"
+            class="relative hover:bg-blumilk-25"
+          >
+            <td class="p-4 text-sm text-gray-500 whitespace-nowrap">
+              <InertiaLink
+                :href="`/overtime/requests/${request.id}`"
+                class="font-semibold text-blumilk-600 hover:text-blumilk-500 hover:underline focus:outline-blumilk-500"
+              >
+                {{ request.name }}
+              </InertiaLink>
+            </td>
+            <td class="p-4 text-sm text-gray-500 whitespace-nowrap">
+              {{ request.from }}
+            </td>
+            <td class="p-4 text-sm text-gray-500 whitespace-nowrap">
+              {{ request.to }}
+            </td>
+            <td class="p-4 text-sm text-gray-500 whitespace-nowrap">
+              {{ request.hours }}
+            </td>
+            <td class="p-4 text-sm text-gray-500 whitespace-nowrap">
+              <SettlementType :type="request.settlementType" />
+            </td>
+            <td class="p-4 text-sm text-gray-500 whitespace-nowrap">
+              <Status :status="request.state" />
+            </td>
+            <td class="p-4 text-sm text-gray-500 whitespace-nowrap">
+              <InertiaLink
+                :href="`/overtime/requests/${request.id}`"
+                class="flex justify-around focus:outline-blumilk-500"
+              >
+                <ChevronRightIcon class="block w-6 h-6 fill-blumilk-500" />
+              </InertiaLink>
+            </td>
+          </InertiaLink>
+          <tr v-if="! requests.data.length">
+            <td
+              colspan="100%"
+              class="py-4 text-xl leading-5 text-center text-gray-700"
+            >
+              <EmptyState>
+                <template #title>
+                  Brak wniosków
+                </template>
+                <template #text>
+                  Nie znaleziono wniosków o danym statusie
+                </template>
+              </EmptyState>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <Pagination :pagination="requests.meta" />
+  </div>
+</template>
diff --git a/resources/js/Pages/OvertimeRequest/IndexForApprovers.vue b/resources/js/Pages/OvertimeRequest/IndexForApprovers.vue
new file mode 100644
index 00000000..2ae4dfa8
--- /dev/null
+++ b/resources/js/Pages/OvertimeRequest/IndexForApprovers.vue
@@ -0,0 +1,336 @@
+<script setup>
+import { CheckIcon, ChevronRightIcon, ChevronUpDownIcon } from '@heroicons/vue/24/solid'
+import Status from '@/Shared/Status.vue'
+import { watch, reactive } from 'vue'
+import { debounce } from 'lodash'
+import { Inertia } from '@inertiajs/inertia'
+import { Listbox, ListboxButton, ListboxLabel, ListboxOption, ListboxOptions } from '@headlessui/vue'
+import Pagination from '@/Shared/Pagination.vue'
+import EmptyState from '@/Shared/Feedbacks/EmptyState.vue'
+import SettlementType from '@/Shared/SettlementType.vue'
+
+const props = defineProps({
+  requests: Object,
+  users: Object,
+  filters: Object,
+})
+
+const statuses = [
+  {
+    name: 'Wszystkie',
+    value: 'all',
+  },
+  {
+    name: 'Oczekujące na akcje',
+    value: 'waiting_for_action',
+  },
+  {
+    name: 'W trakcie',
+    value: 'pending',
+  },
+  {
+    name: 'Zatwierdzone',
+    value: 'success',
+  },
+  {
+    name: 'Odrzucone/anulowane',
+    value: 'failed',
+  },
+]
+
+const form = reactive({
+  user: props.users.data.find(user => user.id === props.filters.user) ?? null,
+  status: statuses.find(status => status.value === props.filters.status) ?? statuses[0],
+})
+
+watch(form, debounce(() => {
+  Inertia.get('/overtime/requests', {
+    user: form.user?.id,
+    status: form.status.value,
+  }, {
+    preserveState: true,
+    replace: true,
+  })
+}, 150))
+</script>
+
+<template>
+  <InertiaHead title="Wnioski" />
+  <div class="bg-white shadow-md">
+    <div class="flex justify-between items-center p-4 sm:px-6">
+      <div>
+        <h2 class="text-lg font-medium leading-6 text-gray-900">
+          Lista wniosków
+        </h2>
+      </div>
+    </div>
+    <div class="border-t border-gray-200">
+      <div class="grid grid-cols-1 gap-2 p-4 md:grid-cols-3 md:gap-4">
+        <Listbox
+          v-model="form.user"
+          as="div"
+        >
+          <ListboxLabel class="block mb-2 text-sm font-medium text-gray-700">
+            Pracownik
+          </ListboxLabel>
+          <div class="relative mt-1 sm:mt-0">
+            <ListboxButton
+              class="relative py-2 pr-10 pl-3 w-full max-w-lg h-10 text-left bg-white rounded-md border border-gray-300 focus:border-blumilk-500 focus:outline-none focus:ring-1 focus:ring-blumilk-500 shadow-sm cursor-default sm:text-sm"
+            >
+              <span v-if="form.user === null">
+                Wszyscy
+              </span>
+              <span
+                v-else
+                class="flex items-center"
+              >
+                <img
+                  :src="form.user.avatar"
+                  class="shrink-0 w-6 h-6 rounded-full"
+                >
+                <span class="block ml-3 truncate">{{ form.user.name }}</span>
+              </span>
+              <span class="flex absolute inset-y-0 right-0 items-center pr-2 pointer-events-none">
+                <ChevronUpDownIcon class="w-5 h-5 text-gray-400" />
+              </span>
+            </ListboxButton>
+
+            <transition
+              leave-active-class="transition ease-in duration-100"
+              leave-from-class="opacity-100"
+              leave-to-class="opacity-0"
+            >
+              <ListboxOptions
+                class="overflow-auto absolute z-10 py-1 mt-1 w-full max-w-lg max-h-60 text-base bg-white rounded-md focus:outline-none ring-1 ring-black ring-opacity-5 shadow-lg sm:text-sm"
+              >
+                <ListboxOption
+                  v-slot="{ active }"
+                  as="template"
+                  :value="null"
+                >
+                  <li
+                    :class="[active ? 'bg-gray-100' : 'text-gray-900', 'cursor-default select-none relative py-2 pl-3 pr-9']"
+                  >
+                    <div class="flex items-center">
+                      Wszyscy
+                    </div>
+
+                    <span
+                      v-if="form.user === null"
+                      :class="['text-blumilk-600 absolute inset-y-0 right-0 flex items-center pr-4']"
+                    >
+                      <CheckIcon class="w-5 h-5" />
+                    </span>
+                  </li>
+                </ListboxOption>
+                <ListboxOption
+                  v-for="user in users.data"
+                  :key="user.id"
+                  v-slot="{ active }"
+                  as="template"
+                  :value="user"
+                >
+                  <li
+                    :class="[active ? 'bg-gray-100' : 'text-gray-900', 'cursor-default select-none relative py-2 pl-3 pr-9']"
+                  >
+                    <div class="flex items-center">
+                      <img
+                        :src="user.avatar"
+                        class="shrink-0 w-6 h-6 rounded-full"
+                      >
+                      <span
+                        :class="[form.user?.id === user.id ? 'font-semibold' : 'font-normal', 'ml-3 block truncate']"
+                      >
+                        {{ user.name }}
+                      </span>
+                    </div>
+                    <span
+                      v-if="form.user?.id === user.id"
+                      :class="['text-blumilk-600 absolute inset-y-0 right-0 flex items-center pr-4']"
+                    >
+                      <CheckIcon class="w-5 h-5" />
+                    </span>
+                  </li>
+                </ListboxOption>
+              </ListboxOptions>
+            </transition>
+          </div>
+        </Listbox>
+        <Listbox
+          v-model="form.status"
+          as="div"
+        >
+          <ListboxLabel class="block mb-2 text-sm font-medium text-gray-700">
+            Status
+          </ListboxLabel>
+          <div class="relative mt-1 sm:mt-0">
+            <ListboxButton
+              class="relative py-2 pr-10 pl-3 w-full max-w-lg h-10 text-left bg-white rounded-md border border-gray-300 focus:border-blumilk-500 focus:outline-none focus:ring-1 focus:ring-blumilk-500 shadow-sm cursor-default sm:text-sm"
+            >
+              <span class="flex items-center">
+                {{ form.status.name }}
+              </span>
+              <span class="flex absolute inset-y-0 right-0 items-center pr-2 pointer-events-none">
+                <ChevronUpDownIcon class="w-5 h-5 text-gray-400" />
+              </span>
+            </ListboxButton>
+
+            <transition
+              leave-active-class="transition ease-in duration-100"
+              leave-from-class="opacity-100"
+              leave-to-class="opacity-0"
+            >
+              <ListboxOptions
+                class="overflow-auto absolute z-10 py-1 mt-1 w-full max-w-lg max-h-60 text-base bg-white rounded-md focus:outline-none ring-1 ring-black ring-opacity-5 shadow-lg sm:text-sm"
+              >
+                <ListboxOption
+                  v-for="status in statuses"
+                  :key="status.value"
+                  v-slot="{ active, selected }"
+                  as="template"
+                  :value="status"
+                >
+                  <li
+                    :class="[active ? 'bg-gray-100' : 'text-gray-900', 'cursor-default truncate select-none relative py-2 pl-3 pr-9']"
+                  >
+                    {{ status.name }}
+
+                    <span
+                      v-if="selected"
+                      :class="['text-blumilk-600 absolute inset-y-0 right-0 flex items-center pr-4']"
+                    >
+                      <CheckIcon class="w-5 h-5" />
+                    </span>
+                  </li>
+                </ListboxOption>
+              </ListboxOptions>
+            </transition>
+          </div>
+        </Listbox>
+      </div>
+    </div>
+    <div class="overflow-auto xl:overflow-visible">
+      <table class="min-w-full divide-y divide-gray-200">
+        <thead class="bg-gray-50">
+          <tr>
+            <th
+              scope="col"
+              class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
+            >
+              Numer
+            </th>
+            <th
+              scope="col"
+              class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
+            >
+              Pracownik
+            </th>
+            <th
+              scope="col"
+              class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
+            >
+              Od
+            </th>
+            <th
+              scope="col"
+              class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
+            >
+              Do
+            </th>
+            <th
+              scope="col"
+              class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
+            >
+              Liczba godzin
+            </th>
+            <th
+              scope="col"
+              class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
+            >
+              Sposób rozliczenia
+            </th>
+            <th
+              scope="col"
+              class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
+            >
+              Status
+            </th>
+            <th scope="col" />
+          </tr>
+        </thead>
+        <tbody class="bg-white divide-y divide-gray-100">
+          <InertiaLink
+            v-for="request in requests.data"
+            :key="request.id"
+            as="tr"
+            :href="`/overtime/requests/${request.id}`"
+            class="relative hover:bg-blumilk-25 hover:cursor-pointer"
+          >
+            <td class="p-4 text-sm text-gray-500 whitespace-nowrap">
+              <InertiaLink
+                :href="`/overtime/requests/${request.id}`"
+                class="font-semibold text-blumilk-600 hover:text-blumilk-500 hover:underline focus:outline-blumilk-500"
+              >
+                {{ request.name }}
+              </InertiaLink>
+            </td>
+            <td class="p-4 text-sm font-medium text-gray-500 whitespace-nowrap">
+              <div class="flex">
+                <div class="w-10 h-10 rounded-full">
+                  <img :src="request.user.avatar">
+                </div>
+                <div class="ml-3">
+                  <p class="text-sm font-medium text-gray-900">
+                    {{ request.user.name }}
+                  </p>
+                  <p class="text-sm text-gray-500">
+                    {{ request.user.email }}
+                  </p>
+                </div>
+              </div>
+            </td>
+            <td class="p-4 text-sm text-gray-500 whitespace-nowrap">
+              {{ request.from }}
+            </td>
+            <td class="p-4 text-sm text-gray-500 whitespace-nowrap">
+              {{ request.to }}
+            </td>
+            <td class="p-4 text-sm text-gray-500 whitespace-nowrap">
+              {{ request.hours }}
+            </td>
+            <td class="p-4 text-sm text-gray-500 whitespace-nowrap">
+              <SettlementType :type="request.settlementType" />
+            </td>
+            <td class="p-4 text-sm text-gray-500 whitespace-nowrap">
+              <Status :status="request.state" />
+            </td>
+            <td class="p-4 text-sm text-gray-500 whitespace-nowrap">
+              <InertiaLink
+                :href="`/vacation/requests/${request.id}`"
+                class="flex justify-around focus:outline-blumilk-500"
+              >
+                <ChevronRightIcon class="block w-6 h-6 fill-blumilk-500" />
+              </InertiaLink>
+            </td>
+          </InertiaLink>
+          <tr v-if="! requests.data.length">
+            <td
+              colspan="100%"
+              class="py-4 text-xl leading-5 text-center text-gray-700"
+            >
+              <EmptyState>
+                <template #title>
+                  Brak wniosków
+                </template>
+                <template #text>
+                  Spróbuj sformułować zapytanie inaczej
+                </template>
+              </EmptyState>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <Pagination :pagination="requests.meta" />
+  </div>
+</template>
diff --git a/resources/js/Pages/OvertimeRequest/Show.vue b/resources/js/Pages/OvertimeRequest/Show.vue
new file mode 100644
index 00000000..f132d509
--- /dev/null
+++ b/resources/js/Pages/OvertimeRequest/Show.vue
@@ -0,0 +1,222 @@
+<script setup>
+import Activity from '@/Shared/Activity.vue'
+import Status from '@/Shared/Status.vue'
+
+defineProps({
+  request: Object,
+  activities: Object,
+  stats: Object,
+  auth: Object,
+})
+</script>
+
+<template>
+  <InertiaHead :title="`Wniosek ${request.name}`" />
+  <div class="grid grid-cols-1 gap-6 xl:grid-cols-3 xl:grid-flow-col-dense">
+    <div class="space-y-6 xl:col-span-2 xl:col-start-1">
+      <div class="bg-white shadow-md">
+        <div class="py-5 px-4 sm:px-6">
+          <h3 class="text-lg font-medium leading-6 text-gray-900">
+            Informacje na temat wniosku
+          </h3>
+        </div>
+        <div class="py-5 px-4 border-t border-gray-200 sm:p-0">
+          <dl class="sm:divide-y sm:divide-gray-200">
+            <div class="py-4 sm:grid sm:grid-cols-3 sm:gap-4 sm:py-5 sm:px-6">
+              <dt class="text-sm font-medium text-gray-500">
+                Nr wniosku
+              </dt>
+              <dd class="mt-1 text-sm text-gray-900 sm:col-span-2 sm:mt-0">
+                {{ request.name }}
+              </dd>
+            </div>
+            <div class="py-4 sm:grid sm:grid-cols-3 sm:gap-4 sm:py-5 sm:px-6">
+              <dt class="flex items-center text-sm font-medium text-gray-500">
+                Pracownik
+              </dt>
+              <dd class="mt-1 text-sm text-gray-900 sm:col-span-2 sm:mt-0">
+                <div class="flex">
+                  <img
+                    class="w-10 h-10 rounded-full"
+                    :src="request.user.avatar"
+                  >
+                  <div class="ml-3">
+                    <p class="text-sm font-medium text-gray-900">
+                      {{ request.user.name }}
+                    </p>
+                    <p class="text-sm text-gray-500">
+                      {{ request.user.email }}
+                    </p>
+                  </div>
+                </div>
+              </dd>
+            </div>
+            <div class="py-4 sm:grid sm:grid-cols-3 sm:gap-4 sm:py-5 sm:px-6">
+              <dt class="text-sm font-medium text-gray-500">
+                Obecny status
+              </dt>
+              <dd class="mt-1 text-sm text-gray-900 sm:col-span-2 sm:mt-0">
+                <Status :status="request.state" />
+              </dd>
+            </div>
+            <div class="py-4 sm:grid sm:grid-cols-3 sm:gap-4 sm:py-5 sm:px-6">
+              <dt class="text-sm font-medium text-gray-500">
+                Data
+              </dt>
+              <dd class="mt-1 text-sm text-gray-900 sm:col-span-2 sm:mt-0">
+                {{ request.from }} - {{ request.to }}
+                <span class="font-semibold">
+                  [Liczba godzin: {{ request.hours }}]
+                </span>
+              </dd>
+            </div>
+            <div class="py-4 sm:grid sm:grid-cols-3 sm:gap-4 sm:py-5 sm:px-6">
+              <dt class="text-sm font-medium text-gray-500">
+                Komentarz
+              </dt>
+              <dd
+                v-if="request.comment != null"
+                class="mt-1 text-sm text-gray-900 break-all sm:col-span-2 sm:mt-0"
+              >
+                {{ request.comment }}
+              </dd>
+              <dd
+                v-else
+                class="mt-1 text-sm text-gray-900 sm:col-span-2 sm:mt-0"
+              >
+                -
+              </dd>
+            </div>
+          </dl>
+        </div>
+      </div>
+      <div
+        v-if="request.can.acceptAsTechnical"
+        class="bg-white shadow"
+      >
+        <div class="py-5 px-4 sm:p-6">
+          <h3 class="text-lg font-medium leading-6 text-gray-900">
+            Zaakceptuj wniosek jako osoba techniczna
+          </h3>
+          <div class="mt-2 max-w-xl text-sm text-gray-500">
+            <p>
+              W zależności od typu wniosku, zostanie on zatwierdzony lub osoba administracyjna będzie
+              musiała go zaakceptować.
+            </p>
+          </div>
+          <div class="mt-5">
+            <InertiaLink
+              :href="`/overtime/requests/${request.id}/accept-as-technical`"
+              method="post"
+              as="button"
+              preserve-scroll
+              class="inline-flex justify-center py-2 px-4 text-sm font-medium text-white bg-blumilk-600 hover:bg-blumilk-700 rounded-md border border-transparent focus:outline-none focus:ring-2 focus:ring-blumilk-500 focus:ring-offset-2 shadow-sm"
+            >
+              Zaakceptuj wniosek
+            </InertiaLink>
+          </div>
+        </div>
+      </div>
+      <div
+        v-if="request.can.reject"
+        class="bg-white shadow"
+      >
+        <div class="py-5 px-4 sm:p-6">
+          <h3 class="text-lg font-medium leading-6 text-gray-900">
+            Odrzuć wniosek
+          </h3>
+          <div class="mt-2 max-w-xl text-sm text-gray-500">
+            <p>
+              Odrzuconego wniosku nie można przywracać - należy zrobić nowy.
+            </p>
+          </div>
+          <div class="mt-5">
+            <InertiaLink
+              :href="`/overtime/requests/${request.id}/reject`"
+              method="post"
+              as="button"
+              preserve-scroll
+              class="inline-flex justify-center items-center py-2 px-4 font-medium text-red-700 bg-red-100 hover:bg-red-200 rounded-md border border-transparent focus:outline-none focus:ring-2 focus:ring-red-500 focus:ring-offset-2 sm:text-sm"
+            >
+              Odrzuć wniosek
+            </InertiaLink>
+          </div>
+        </div>
+      </div>
+      <div
+        v-if="request.can.cancel"
+        class="bg-white border border-red-500 shadow"
+      >
+        <div class="py-5 px-4 sm:p-6">
+          <h3 class="text-lg font-medium leading-6 text-gray-900">
+            Anuluj wniosek
+          </h3>
+          <div class="mt-2 max-w-xl text-sm text-gray-500">
+            <p>
+              Anulowanego wniosku nie można przywrócić - należy utworzyć nowy.
+            </p>
+          </div>
+          <div class="mt-5">
+            <InertiaLink
+              :href="`/overtime/requests/${request.id}/cancel`"
+              method="post"
+              as="button"
+              preserve-scroll
+              class="inline-flex justify-center items-center py-2 px-4 font-medium text-red-700 bg-red-100 hover:bg-red-200 rounded-md border border-transparent focus:outline-none focus:ring-2 focus:ring-red-500 focus:ring-offset-2 sm:text-sm"
+            >
+              Anuluj wniosek
+            </InertiaLink>
+          </div>
+        </div>
+      </div>
+      <div
+        v-if="request.can.settle"
+        class="bg-white border border-blue-500 shadow"
+      >
+        <div class="py-5 px-4 sm:p-6">
+          <h3 class="text-lg font-medium leading-6 text-gray-900">
+            Rozlicz nadgodziny
+          </h3>
+          <div class="mt-2 max-w-xl text-sm text-gray-500">
+            <p>
+              Rozliczenie nadgodzin oznaczy nadgodziny jako rozliczone.
+            </p>
+          </div>
+          <div class="mt-5">
+            <InertiaLink
+              :href="`/overtime/requests/${request.id}/settle`"
+              method="post"
+              as="button"
+              preserve-scroll
+              class="inline-flex justify-center items-center py-2 px-4 font-medium text-blue-700 bg-blue-100 hover:bg-blue-200 rounded-md border border-transparent focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-2 sm:text-sm"
+            >
+              Rozlicz nadogdziny
+            </InertiaLink>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="space-y-6 xl:col-span-1 xl:col-start-3">
+      <div class="bg-white shadow-md">
+        <div class="py-5 px-4 sm:px-6">
+          <h3 class="text-lg font-medium leading-6 text-gray-900">
+            Historia wniosku
+          </h3>
+        </div>
+        <div class="p-4 border-t border-gray-200">
+          <ul>
+            <li
+              v-for="(activity, index) in activities.data"
+              :key="index"
+            >
+              <Activity
+                :activity="activity"
+                :last="index !== activities.data.length - 1"
+              />
+            </li>
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/resources/js/Shared/MainMenu.vue b/resources/js/Shared/MainMenu.vue
index 27249cbf..b83c4f52 100644
--- a/resources/js/Shared/MainMenu.vue
+++ b/resources/js/Shared/MainMenu.vue
@@ -31,6 +31,7 @@ import {
   SunIcon,
   UserGroupIcon,
   XMarkIcon,
+  ClockIcon,
 } from '@heroicons/vue/24/outline'
 import { CheckIcon, ChevronDownIcon } from '@heroicons/vue/24/solid'
 
@@ -53,6 +54,13 @@ const vacationNavigation = computed(() =>
       icon: DocumentTextIcon,
       can: !props.auth.can.listAllRequests,
     },
+    {
+      name: 'Moje nadgodziny',
+      href: '/overtime/requests/me',
+      section: 'OvertimeRequest',
+      icon: ClockIcon,
+      can: !props.auth.can.listAllRequests,
+    },
     {
       name: 'Wnioski',
       href: '/vacation/requests',
@@ -61,6 +69,13 @@ const vacationNavigation = computed(() =>
       can: props.auth.can.listAllRequests,
       badge: props.vacationRequestsCount,
     },
+    {
+      name: 'Nadgodziny',
+      href: '/overtime/requests',
+      section: 'OvertimeRequest',
+      icon: ClockIcon,
+      can: props.auth.can.listAllRequests,
+    },
     {
       name: 'Kalendarz',
       href: '/calendar',
diff --git a/routes/web.php b/routes/web.php
index 0f16e4f6..dea6cf00 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -160,11 +160,30 @@
         Route::get("/annual-summary", AnnualSummaryController::class)
             ->name("annual-summary");
     });
-    Route::prefix("/overtime")->as("vacation.")->group(function (): void {
-        Route::get("/requests/create", [OvertimeRequestController::class, "create"])
-            ->name("overtime.create");
+    Route::prefix("/overtime")->as("overtime.")->group(function (): void {
+        Route::get("/requests", [OvertimeRequestController::class, "indexForApprovers"])
+            ->name("requests.indexForApprovers");
         Route::post("/requests", [OvertimeRequestController::class, "store"])
-            ->name("overtime.store");
+            ->name("requests.store");
+        Route::get("/requests/me", [OvertimeRequestController::class, "index"])
+            ->name("requests.index");
+        Route::get("/requests/create", [OvertimeRequestController::class, "create"])
+            ->name("requests.create");
+        Route::get("/requests/{overtimeRequest}", [OvertimeRequestController::class, "show"])
+            ->whereNumber("overtimeRequest")
+            ->name("requests.show");
+        Route::post("/requests/{overtimeRequest}/reject", [OvertimeRequestController::class, "reject"])
+            ->whereNumber("overtimeRequest")
+            ->name("requests.reject");
+        Route::post("/requests/{overtimeRequest}/cancel", [OvertimeRequestController::class, "cancel"])
+            ->whereNumber("overtimeRequest")
+            ->name("requests.cancel");
+        Route::post("/requests/{overtimeRequest}/settle", [OvertimeRequestController::class, "settle"])
+            ->whereNumber("overtimeRequest")
+            ->name("requests.settle");
+        Route::post("/requests/{overtimeRequest}/accept-as-technical", [OvertimeRequestController::class, "acceptAsTechnical"])
+            ->whereNumber("overtimeRequest")
+            ->name("requests.accept-as-technical");
     });
 });
 

From 1fb1702502054353bce8556977ed9027e562af0c Mon Sep 17 00:00:00 2001
From: Kamil <kamil.piech.97@gmail.com>
Date: Mon, 10 Jun 2024 08:46:06 +0200
Subject: [PATCH 03/14] #444 - fixes

---
 app/Domain/OvertimeRequestStatesRetriever.php   | 17 ++++++++---------
 .../Controllers/OvertimeRequestController.php   | 11 +++++++++--
 lang/pl.json                                    |  1 +
 resources/js/Pages/OvertimeRequest/Index.vue    |  5 ++++-
 .../Pages/OvertimeRequest/IndexForApprovers.vue |  6 +++++-
 5 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/app/Domain/OvertimeRequestStatesRetriever.php b/app/Domain/OvertimeRequestStatesRetriever.php
index 9dab9821..abf4a072 100644
--- a/app/Domain/OvertimeRequestStatesRetriever.php
+++ b/app/Domain/OvertimeRequestStatesRetriever.php
@@ -27,10 +27,12 @@ public static function pendingStates(): array
 
     public static function successStates(): array
     {
-        return [
-            Approved::class,
-            Settled::class,
-        ];
+        return [Approved::class];
+    }
+
+    public static function settledStates(): array
+    {
+        return [Settled::class];
     }
 
     public static function failedStates(): array
@@ -41,11 +43,6 @@ public static function failedStates(): array
         ];
     }
 
-    public static function notFailedStates(): array
-    {
-        return array_merge(static::successStates(), static::pendingStates());
-    }
-
     public static function waitingForUserActionStates(User $user): array
     {
         return match ($user->role) {
@@ -60,6 +57,7 @@ public static function all(): array
             ...self::pendingStates(),
             ...self::successStates(),
             ...self::failedStates(),
+            ...self::settledStates(),
         ];
     }
 
@@ -70,6 +68,7 @@ public static function filterByStatusGroup(string $filter, ?User $user = null):
             "success" => self::successStates(),
             "failed" => self::failedStates(),
             "waiting_for_action" => self::waitingForUserActionStates($user),
+            "settled" => self::settledStates(),
             default => self::all(),
         };
     }
diff --git a/app/Http/Controllers/OvertimeRequestController.php b/app/Http/Controllers/OvertimeRequestController.php
index 018454a0..2cd6c967 100644
--- a/app/Http/Controllers/OvertimeRequestController.php
+++ b/app/Http/Controllers/OvertimeRequestController.php
@@ -60,13 +60,20 @@ public function index(Request $request, YearPeriodRetriever $yearPeriodRetriever
             ->states(OvertimeRequestStatesRetriever::failedStates())
             ->count();
 
+        $settled = $request->user()
+            ->overtimeRequests()
+            ->whereBelongsTo($yearPeriodRetriever->selected())
+            ->states(OvertimeRequestStatesRetriever::settledStates())
+            ->count();
+
         return inertia("OvertimeRequest/Index", [
             "requests" => OvertimeRequestResource::collection($overtimeRequests),
             "stats" => [
-                "all" => $pending + $success + $failed,
+                "all" => $pending + $success + $failed + $settled,
                 "pending" => $pending,
                 "success" => $success,
                 "failed" => $failed,
+                "settled" => $settled,
             ],
             "filters" => [
                 "status" => $status,
@@ -201,6 +208,6 @@ public function settle(
         $settleAction->execute($overtimeRequest, $request->user());
 
         return redirect()->back()
-            ->with("success", __("Request settled."));
+            ->with("success", __("Overtime settled."));
     }
 }
diff --git a/lang/pl.json b/lang/pl.json
index c17ba212..529b872d 100644
--- a/lang/pl.json
+++ b/lang/pl.json
@@ -43,6 +43,7 @@
   "Request accepted.": "Wniosek zaakceptowany.",
   "Request rejected.": "Wniosek odrzucony.",
   "Request cancelled.": "Wniosek anulowany.",
+  "Overtime settled.": "Nadgodziny rozliczone.",
   "Sum:": "Suma:",
   "Date": "Data",
   "Day of week": "Dzień tygodnia",
diff --git a/resources/js/Pages/OvertimeRequest/Index.vue b/resources/js/Pages/OvertimeRequest/Index.vue
index 536ce789..83740d78 100644
--- a/resources/js/Pages/OvertimeRequest/Index.vue
+++ b/resources/js/Pages/OvertimeRequest/Index.vue
@@ -32,11 +32,14 @@ const statuses = [
     name: 'Odrzucone/anulowane',
     value: 'failed',
   },
+  {
+    name: 'Rozliczone',
+    value: 'settled',
+  },
 ]
 
 const form = reactive({
   status: statuses.find(status => status.value === props.filters.status) ?? statuses[0],
-  withoutRemote: props.filters.withoutRemote ?? false,
 })
 
 watch(form, debounce(() => {
diff --git a/resources/js/Pages/OvertimeRequest/IndexForApprovers.vue b/resources/js/Pages/OvertimeRequest/IndexForApprovers.vue
index 2ae4dfa8..1eeb4838 100644
--- a/resources/js/Pages/OvertimeRequest/IndexForApprovers.vue
+++ b/resources/js/Pages/OvertimeRequest/IndexForApprovers.vue
@@ -36,6 +36,10 @@ const statuses = [
     name: 'Odrzucone/anulowane',
     value: 'failed',
   },
+  {
+    name: 'Rozliczone',
+    value: 'settled',
+  },
 ]
 
 const form = reactive({
@@ -306,7 +310,7 @@ watch(form, debounce(() => {
             </td>
             <td class="p-4 text-sm text-gray-500 whitespace-nowrap">
               <InertiaLink
-                :href="`/vacation/requests/${request.id}`"
+                :href="`/overtime/requests/${request.id}`"
                 class="flex justify-around focus:outline-blumilk-500"
               >
                 <ChevronRightIcon class="block w-6 h-6 fill-blumilk-500" />

From 01d679fd862914790e110d22f111977607a44632 Mon Sep 17 00:00:00 2001
From: Kamil <kamil.piech.97@gmail.com>
Date: Mon, 10 Jun 2024 12:28:11 +0200
Subject: [PATCH 04/14] #444 - added tests

---
 app/Actions/OvertimeRequest/CreateAction.php  |   7 +
 app/Domain/OvertimeCalculator.php             |   4 +-
 .../Api/CalculateOvertimeHoursController.php  |  20 ++
 .../Controllers/OvertimeRequestController.php |   3 +-
 .../Api/CalculateOvertimeHoursRequest.php     |  36 +++
 app/Models/OvertimeRequest.php                |   6 +
 app/Validation/OvertimeRequestValidator.php   |  43 +++
 .../NoPendingOvertimeRequestInRange.php       |  26 ++
 .../OvertimeRequest/OvertimeRequestRule.php   |  14 +
 .../DoesNotExceedLimitRule.php                |   2 +-
 .../MinimumOneVacationDayRule.php             |   2 +-
 .../NoApprovedVacationRequestsInRange.php     |   2 +-
 .../NoPendingVacationRequestInRange.php       |   2 +-
 .../VacationRangeIsInTheSameYearRule.php      |   2 +-
 .../VacationRequestRule.php                   |   2 +-
 .../VacationTypeCanBeSelected.php             |   2 +-
 app/Validation/VacationRequestValidator.php   |  14 +-
 database/factories/OvertimeRequestFactory.php |   2 +
 resources/js/Pages/OvertimeRequest/Create.vue |  50 +++-
 routes/api.php                                |   2 +
 tests/Feature/OvertimeRequestTest.php         | 266 ++++++++++++++++++
 21 files changed, 484 insertions(+), 23 deletions(-)
 create mode 100644 app/Http/Controllers/Api/CalculateOvertimeHoursController.php
 create mode 100644 app/Http/Requests/Api/CalculateOvertimeHoursRequest.php
 create mode 100644 app/Validation/OvertimeRequestValidator.php
 create mode 100644 app/Validation/Rules/OvertimeRequest/NoPendingOvertimeRequestInRange.php
 create mode 100644 app/Validation/Rules/OvertimeRequest/OvertimeRequestRule.php
 rename app/Validation/Rules/{ => VacationRequest}/DoesNotExceedLimitRule.php (97%)
 rename app/Validation/Rules/{ => VacationRequest}/MinimumOneVacationDayRule.php (92%)
 rename app/Validation/Rules/{ => VacationRequest}/NoApprovedVacationRequestsInRange.php (92%)
 rename app/Validation/Rules/{ => VacationRequest}/NoPendingVacationRequestInRange.php (92%)
 rename app/Validation/Rules/{ => VacationRequest}/VacationRangeIsInTheSameYearRule.php (89%)
 rename app/Validation/Rules/{ => VacationRequest}/VacationRequestRule.php (81%)
 rename app/Validation/Rules/{ => VacationRequest}/VacationTypeCanBeSelected.php (94%)
 create mode 100644 tests/Feature/OvertimeRequestTest.php

diff --git a/app/Actions/OvertimeRequest/CreateAction.php b/app/Actions/OvertimeRequest/CreateAction.php
index 35c8e92d..2af62242 100644
--- a/app/Actions/OvertimeRequest/CreateAction.php
+++ b/app/Actions/OvertimeRequest/CreateAction.php
@@ -10,6 +10,7 @@
 use Toby\Models\OvertimeRequest;
 use Toby\Models\User;
 use Toby\Models\VacationRequest;
+use Toby\Validation\OvertimeRequestValidator;
 
 class CreateAction
 {
@@ -17,6 +18,7 @@ public function __construct(
         protected OvertimeRequestStateManager $stateManager,
         protected WaitForTechApprovalAction $waitForTechApprovalAction,
         protected OvertimeCalculator $overtimeCalculator,
+        protected OvertimeRequestValidator $overtimeRequestValidator,
     ) {}
 
     /**
@@ -31,12 +33,17 @@ public function execute(array $data, User $creator): OvertimeRequest
         return $overtimeRequest;
     }
 
+    /**
+     * @throws ValidationException
+     */
     protected function createVacationRequest(array $data, User $creator): OvertimeRequest
     {
         /** @var OvertimeRequest $overtimeRequest */
         $overtimeRequest = $creator->createdOvertimeRequests()->make($data);
         $overtimeRequest->hours = $this->overtimeCalculator->calculateHours($overtimeRequest->from, $overtimeRequest->to);
 
+        $this->overtimeRequestValidator->validate($overtimeRequest);
+
         $overtimeRequest->save();
 
         $this->stateManager->markAsCreated($overtimeRequest);
diff --git a/app/Domain/OvertimeCalculator.php b/app/Domain/OvertimeCalculator.php
index c74108f1..14c8f500 100644
--- a/app/Domain/OvertimeCalculator.php
+++ b/app/Domain/OvertimeCalculator.php
@@ -11,8 +11,8 @@ class OvertimeCalculator
 {
     public function calculateHours(CarbonInterface $from, CarbonInterface $to): int
     {
-        $hours = Carbon::create($from)->diffInHours($to);
+        $hours = Carbon::create($from)->diffInMinutes($to, true);
 
-        return (int)$hours;
+        return (int)ceil($hours / 60);
     }
 }
diff --git a/app/Http/Controllers/Api/CalculateOvertimeHoursController.php b/app/Http/Controllers/Api/CalculateOvertimeHoursController.php
new file mode 100644
index 00000000..3ca0c152
--- /dev/null
+++ b/app/Http/Controllers/Api/CalculateOvertimeHoursController.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Http\Controllers\Api;
+
+use Illuminate\Http\JsonResponse;
+use Toby\Domain\OvertimeCalculator;
+use Toby\Http\Controllers\Controller;
+use Toby\Http\Requests\Api\CalculateOvertimeHoursRequest;
+
+class CalculateOvertimeHoursController extends Controller
+{
+    public function __invoke(CalculateOvertimeHoursRequest $request, OvertimeCalculator $overtimeCalculator): JsonResponse
+    {
+        $hours = $overtimeCalculator->calculateHours($request->from(), $request->to());
+
+        return new JsonResponse($hours);
+    }
+}
diff --git a/app/Http/Controllers/OvertimeRequestController.php b/app/Http/Controllers/OvertimeRequestController.php
index 2cd6c967..997e4cad 100644
--- a/app/Http/Controllers/OvertimeRequestController.php
+++ b/app/Http/Controllers/OvertimeRequestController.php
@@ -131,10 +131,11 @@ public function show(OvertimeRequest $overtimeRequest): Response
         ]);
     }
 
-    public function create(): Response
+    public function create(Request $request): Response
     {
         return inertia("OvertimeRequest/Create", [
             "settlementTypes" => SettlementType::casesToSelect(),
+            "overtimeFromDate" => $request->get("from_date"),
         ]);
     }
 
diff --git a/app/Http/Requests/Api/CalculateOvertimeHoursRequest.php b/app/Http/Requests/Api/CalculateOvertimeHoursRequest.php
new file mode 100644
index 00000000..103f989b
--- /dev/null
+++ b/app/Http/Requests/Api/CalculateOvertimeHoursRequest.php
@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Http\Requests\Api;
+
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Carbon;
+use Toby\Http\Rules\YearPeriodExists;
+use Toby\Models\YearPeriod;
+
+class CalculateOvertimeHoursRequest extends FormRequest
+{
+    public function rules(): array
+    {
+        return [
+            "from" => ["required", "date_format:Y-m-d H:i", new YearPeriodExists()],
+            "to" => ["required", "date_format:Y-m-d H:i", new YearPeriodExists()],
+        ];
+    }
+
+    public function from(): Carbon
+    {
+        return Carbon::create($this->request->get("from"));
+    }
+
+    public function to(): Carbon
+    {
+        return Carbon::create($this->request->get("to"));
+    }
+
+    public function yearPeriod(): YearPeriod
+    {
+        return YearPeriod::findByYear(Carbon::create($this->request->get("from"))->year);
+    }
+}
diff --git a/app/Models/OvertimeRequest.php b/app/Models/OvertimeRequest.php
index c38c8a4e..57225292 100644
--- a/app/Models/OvertimeRequest.php
+++ b/app/Models/OvertimeRequest.php
@@ -74,6 +74,12 @@ public function scopeStates(Builder $query, OvertimeRequestState|array $states):
         return $query->whereState("state", $states);
     }
 
+    public function scopeOverlapsWith(Builder $query, self $overtimeRequest): Builder
+    {
+        return $query->where("from", "<=", $overtimeRequest->to)
+            ->where("to", ">=", $overtimeRequest->from);
+    }
+
     protected static function newFactory(): OvertimeRequestFactory
     {
         return OvertimeRequestFactory::new();
diff --git a/app/Validation/OvertimeRequestValidator.php b/app/Validation/OvertimeRequestValidator.php
new file mode 100644
index 00000000..25395a30
--- /dev/null
+++ b/app/Validation/OvertimeRequestValidator.php
@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Validation;
+
+use Illuminate\Contracts\Container\Container;
+use Illuminate\Validation\ValidationException;
+use Toby\Models\OvertimeRequest;
+use Toby\Validation\Rules\OvertimeRequest\NoPendingOvertimeRequestInRange;
+use Toby\Validation\Rules\OvertimeRequest\OvertimeRequestRule;
+
+class OvertimeRequestValidator
+{
+    protected array $rules = [
+        NoPendingOvertimeRequestInRange::class,
+    ];
+
+    public function __construct(
+        protected Container $container,
+    ) {}
+
+    /**
+     * @throws ValidationException
+     */
+    public function validate(OvertimeRequest $overtimeRequest): void
+    {
+        foreach ($this->rules as $rule) {
+            $rule = $this->makeRule($rule);
+
+            if (!$rule->check($overtimeRequest)) {
+                throw ValidationException::withMessages([
+                    "overtimeRequest" => $rule->errorMessage(),
+                ]);
+            }
+        }
+    }
+
+    protected function makeRule(string $class): OvertimeRequestRule
+    {
+        return $this->container->make($class);
+    }
+}
diff --git a/app/Validation/Rules/OvertimeRequest/NoPendingOvertimeRequestInRange.php b/app/Validation/Rules/OvertimeRequest/NoPendingOvertimeRequestInRange.php
new file mode 100644
index 00000000..2a6ef523
--- /dev/null
+++ b/app/Validation/Rules/OvertimeRequest/NoPendingOvertimeRequestInRange.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Validation\Rules\OvertimeRequest;
+
+use Toby\Domain\OvertimeRequestStatesRetriever;
+use Toby\Models\OvertimeRequest;
+
+class NoPendingOvertimeRequestInRange implements OvertimeRequestRule
+{
+    public function check(OvertimeRequest $overtimeRequest): bool
+    {
+        return !$overtimeRequest
+            ->user
+            ->overtimeRequests()
+            ->overlapsWith($overtimeRequest)
+            ->states(OvertimeRequestStatesRetriever::pendingStates())
+            ->exists();
+    }
+
+    public function errorMessage(): string
+    {
+        return __("You have a pending request in this date range.");
+    }
+}
diff --git a/app/Validation/Rules/OvertimeRequest/OvertimeRequestRule.php b/app/Validation/Rules/OvertimeRequest/OvertimeRequestRule.php
new file mode 100644
index 00000000..8966d5f7
--- /dev/null
+++ b/app/Validation/Rules/OvertimeRequest/OvertimeRequestRule.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Validation\Rules\OvertimeRequest;
+
+use Toby\Models\OvertimeRequest;
+
+interface OvertimeRequestRule
+{
+    public function check(OvertimeRequest $overtimeRequest): bool;
+
+    public function errorMessage(): string;
+}
diff --git a/app/Validation/Rules/DoesNotExceedLimitRule.php b/app/Validation/Rules/VacationRequest/DoesNotExceedLimitRule.php
similarity index 97%
rename from app/Validation/Rules/DoesNotExceedLimitRule.php
rename to app/Validation/Rules/VacationRequest/DoesNotExceedLimitRule.php
index fe87469a..fab4db12 100644
--- a/app/Validation/Rules/DoesNotExceedLimitRule.php
+++ b/app/Validation/Rules/VacationRequest/DoesNotExceedLimitRule.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Toby\Validation\Rules;
+namespace Toby\Validation\Rules\VacationRequest;
 
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Collection;
diff --git a/app/Validation/Rules/MinimumOneVacationDayRule.php b/app/Validation/Rules/VacationRequest/MinimumOneVacationDayRule.php
similarity index 92%
rename from app/Validation/Rules/MinimumOneVacationDayRule.php
rename to app/Validation/Rules/VacationRequest/MinimumOneVacationDayRule.php
index 8d6fed41..86a4414c 100644
--- a/app/Validation/Rules/MinimumOneVacationDayRule.php
+++ b/app/Validation/Rules/VacationRequest/MinimumOneVacationDayRule.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Toby\Validation\Rules;
+namespace Toby\Validation\Rules\VacationRequest;
 
 use Toby\Domain\WorkDaysCalculator;
 use Toby\Models\VacationRequest;
diff --git a/app/Validation/Rules/NoApprovedVacationRequestsInRange.php b/app/Validation/Rules/VacationRequest/NoApprovedVacationRequestsInRange.php
similarity index 92%
rename from app/Validation/Rules/NoApprovedVacationRequestsInRange.php
rename to app/Validation/Rules/VacationRequest/NoApprovedVacationRequestsInRange.php
index 501e3808..b6a11494 100644
--- a/app/Validation/Rules/NoApprovedVacationRequestsInRange.php
+++ b/app/Validation/Rules/VacationRequest/NoApprovedVacationRequestsInRange.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Toby\Validation\Rules;
+namespace Toby\Validation\Rules\VacationRequest;
 
 use Toby\Domain\VacationRequestStatesRetriever;
 use Toby\Models\VacationRequest;
diff --git a/app/Validation/Rules/NoPendingVacationRequestInRange.php b/app/Validation/Rules/VacationRequest/NoPendingVacationRequestInRange.php
similarity index 92%
rename from app/Validation/Rules/NoPendingVacationRequestInRange.php
rename to app/Validation/Rules/VacationRequest/NoPendingVacationRequestInRange.php
index 8a92bcb0..5c5224b2 100644
--- a/app/Validation/Rules/NoPendingVacationRequestInRange.php
+++ b/app/Validation/Rules/VacationRequest/NoPendingVacationRequestInRange.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Toby\Validation\Rules;
+namespace Toby\Validation\Rules\VacationRequest;
 
 use Toby\Domain\VacationRequestStatesRetriever;
 use Toby\Models\VacationRequest;
diff --git a/app/Validation/Rules/VacationRangeIsInTheSameYearRule.php b/app/Validation/Rules/VacationRequest/VacationRangeIsInTheSameYearRule.php
similarity index 89%
rename from app/Validation/Rules/VacationRangeIsInTheSameYearRule.php
rename to app/Validation/Rules/VacationRequest/VacationRangeIsInTheSameYearRule.php
index 72b33192..32ea4dde 100644
--- a/app/Validation/Rules/VacationRangeIsInTheSameYearRule.php
+++ b/app/Validation/Rules/VacationRequest/VacationRangeIsInTheSameYearRule.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Toby\Validation\Rules;
+namespace Toby\Validation\Rules\VacationRequest;
 
 use Toby\Models\VacationRequest;
 
diff --git a/app/Validation/Rules/VacationRequestRule.php b/app/Validation/Rules/VacationRequest/VacationRequestRule.php
similarity index 81%
rename from app/Validation/Rules/VacationRequestRule.php
rename to app/Validation/Rules/VacationRequest/VacationRequestRule.php
index efe8e5f5..f8765370 100644
--- a/app/Validation/Rules/VacationRequestRule.php
+++ b/app/Validation/Rules/VacationRequest/VacationRequestRule.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Toby\Validation\Rules;
+namespace Toby\Validation\Rules\VacationRequest;
 
 use Toby\Models\VacationRequest;
 
diff --git a/app/Validation/Rules/VacationTypeCanBeSelected.php b/app/Validation/Rules/VacationRequest/VacationTypeCanBeSelected.php
similarity index 94%
rename from app/Validation/Rules/VacationTypeCanBeSelected.php
rename to app/Validation/Rules/VacationRequest/VacationTypeCanBeSelected.php
index 21dfdd2e..a8fa3734 100644
--- a/app/Validation/Rules/VacationTypeCanBeSelected.php
+++ b/app/Validation/Rules/VacationRequest/VacationTypeCanBeSelected.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Toby\Validation\Rules;
+namespace Toby\Validation\Rules\VacationRequest;
 
 use Toby\Domain\VacationTypeConfigRetriever;
 use Toby\Enums\VacationType;
diff --git a/app/Validation/VacationRequestValidator.php b/app/Validation/VacationRequestValidator.php
index f8513143..672f1b70 100644
--- a/app/Validation/VacationRequestValidator.php
+++ b/app/Validation/VacationRequestValidator.php
@@ -7,13 +7,13 @@
 use Illuminate\Contracts\Container\Container;
 use Illuminate\Validation\ValidationException;
 use Toby\Models\VacationRequest;
-use Toby\Validation\Rules\DoesNotExceedLimitRule;
-use Toby\Validation\Rules\MinimumOneVacationDayRule;
-use Toby\Validation\Rules\NoApprovedVacationRequestsInRange;
-use Toby\Validation\Rules\NoPendingVacationRequestInRange;
-use Toby\Validation\Rules\VacationRangeIsInTheSameYearRule;
-use Toby\Validation\Rules\VacationRequestRule;
-use Toby\Validation\Rules\VacationTypeCanBeSelected;
+use Toby\Validation\Rules\VacationRequest\DoesNotExceedLimitRule;
+use Toby\Validation\Rules\VacationRequest\MinimumOneVacationDayRule;
+use Toby\Validation\Rules\VacationRequest\NoApprovedVacationRequestsInRange;
+use Toby\Validation\Rules\VacationRequest\NoPendingVacationRequestInRange;
+use Toby\Validation\Rules\VacationRequest\VacationRangeIsInTheSameYearRule;
+use Toby\Validation\Rules\VacationRequest\VacationRequestRule;
+use Toby\Validation\Rules\VacationRequest\VacationTypeCanBeSelected;
 
 class VacationRequestValidator
 {
diff --git a/database/factories/OvertimeRequestFactory.php b/database/factories/OvertimeRequestFactory.php
index e822b282..37e665cb 100644
--- a/database/factories/OvertimeRequestFactory.php
+++ b/database/factories/OvertimeRequestFactory.php
@@ -7,6 +7,7 @@
 use Carbon\CarbonImmutable;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Toby\Domain\OvertimeRequestStatesRetriever;
+use Toby\Enums\SettlementType;
 use Toby\Models\OvertimeRequest;
 use Toby\Models\User;
 use Toby\Models\YearPeriod;
@@ -29,6 +30,7 @@ public function definition(): array
             "from" => $from,
             "to" => $to,
             "hours" => $hours,
+            "settlement_type" => $this->faker->randomElement(SettlementType::cases())->value,
             "comment" => $this->faker->boolean ? $this->faker->paragraph() : null,
         ];
     }
diff --git a/resources/js/Pages/OvertimeRequest/Create.vue b/resources/js/Pages/OvertimeRequest/Create.vue
index b95a8ab7..2afbf9f1 100644
--- a/resources/js/Pages/OvertimeRequest/Create.vue
+++ b/resources/js/Pages/OvertimeRequest/Create.vue
@@ -6,18 +6,18 @@ import { reactive, ref, watch } from 'vue'
 import useCurrentYearPeriodInfo from '@/Composables/yearPeriodInfo.js'
 import { Listbox, ListboxButton, ListboxLabel, ListboxOption, ListboxOptions } from '@headlessui/vue'
 import SettlementType from '@/Shared/SettlementType.vue'
+import axios from 'axios'
 
 const props = defineProps({
   auth: Object,
-  vacationUserId: [Number, null],
-  vacationFromDate: [String, null],
+  overtimeFromDate: [String, null],
   settlementTypes: Array,
 })
 
 const form = useForm({
   user: props.auth.user,
-  from: props.vacationFromDate,
-  to: props.vacationFromDate,
+  from: props.overtimeFromDate,
+  to: props.overtimeFromDate,
   settlementType: props.settlementTypes[0],
   comment: null,
 })
@@ -29,7 +29,9 @@ watch(form, formData => {
   isDirty.value = formData.isDirty || from !== null || to !== null
 }, { immediate: true, deep: true })
 
-const estimatedDays = ref([])
+refreshEstimatedHours(form.from, form.to)
+
+const estimatedHours = ref(0)
 
 const { minDate, maxDate } = useCurrentYearPeriodInfo()
 
@@ -58,6 +60,40 @@ function createForm() {
     }))
     .post('/overtime/requests')
 }
+
+function onFromChange(selectedDates, dateStr) {
+  if (form.to === null) {
+    form.to = dateStr
+
+    return
+  }
+}
+
+function onToChange(selectedDates, dateStr) {
+  if (form.from === null) {
+    form.from = dateStr
+
+    return
+  }
+}
+
+watch(() => form.to, () => {
+  refreshEstimatedHours(form.from, form.to)
+})
+
+watch(() => form.from, () => {
+  refreshEstimatedHours(form.from, form.to)
+})
+async function refreshEstimatedHours(from, to) {
+  if (from && to) {
+    const res = await axios.post(
+      '/api/overtime/calculate-hours',
+      { from: from, to: to },
+    )
+
+    estimatedHours.value = res.data
+  }
+}
 </script>
 
 <template>
@@ -130,6 +166,7 @@ function createForm() {
                   :config="fromInputConfig"
                   class="block w-full max-w-lg rounded-md shadow-sm sm:text-sm"
                   :class="{ 'border-red-300 text-red-900 focus:outline-none focus:ring-red-500 focus:border-red-500': form.errors.from, 'focus:ring-blumilk-500 focus:border-blumilk-500 sm:text-sm border-gray-300': !form.errors.from }"
+                  @on-change="onFromChange"
                 />
                 <p
                   v-if="form.errors.from"
@@ -153,6 +190,7 @@ function createForm() {
                   :config="toInputConfig"
                   class="block w-full max-w-lg rounded-md shadow-sm sm:text-sm"
                   :class="{ 'border-red-300 text-red-900 focus:outline-none focus:ring-red-500 focus:border-red-500': form.errors.to, 'focus:ring-blumilk-500 focus:border-blumilk-500 sm:text-sm border-gray-300': !form.errors.to }"
+                  @on-change="onToChange"
                 />
                 <p
                   v-if="form.errors.to"
@@ -167,7 +205,7 @@ function createForm() {
               <div
                 class="inline-flex items-center py-2 px-4 mt-1 w-full max-w-lg text-gray-500 bg-gray-50 rounded-md border border-gray-300 sm:col-span-2 sm:mt-0 sm:text-sm"
               >
-                {{ estimatedDays.length }}
+                {{ estimatedHours }}
               </div>
             </div>
             <Listbox
diff --git a/routes/api.php b/routes/api.php
index 82a35ff1..10ff404a 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use Illuminate\Support\Facades\Route;
+use Toby\Http\Controllers\Api\CalculateOvertimeHoursController;
 use Toby\Http\Controllers\Api\CalculateUserUnavailableDaysController;
 use Toby\Http\Controllers\Api\CalculateUserVacationStatsController;
 use Toby\Http\Controllers\Api\CalculateVacationDaysController;
@@ -19,5 +20,6 @@
     Route::post("vacation/calculate-stats", CalculateUserVacationStatsController::class);
     Route::post("vacation/calculate-unavailable-days", CalculateUserUnavailableDaysController::class);
     Route::post("vacation/get-available-vacation-types", GetAvailableVacationTypesController::class);
+    Route::post("overtime/calculate-hours", CalculateOvertimeHoursController::class);
     Route::get("last-update", LastUpdateController::class);
 });
diff --git a/tests/Feature/OvertimeRequestTest.php b/tests/Feature/OvertimeRequestTest.php
new file mode 100644
index 00000000..93c41e9b
--- /dev/null
+++ b/tests/Feature/OvertimeRequestTest.php
@@ -0,0 +1,266 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Feature;
+
+use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Support\Carbon;
+use Inertia\Testing\AssertableInertia as Assert;
+use Tests\FeatureTestCase;
+use Toby\Enums\EmploymentForm;
+use Toby\Enums\SettlementType;
+use Toby\Models\OvertimeRequest;
+use Toby\Models\Profile;
+use Toby\Models\User;
+use Toby\Models\YearPeriod;
+use Toby\States\OvertimeRequest\Approved;
+use Toby\States\OvertimeRequest\Cancelled;
+use Toby\States\OvertimeRequest\Rejected;
+use Toby\States\OvertimeRequest\Settled;
+use Toby\States\OvertimeRequest\WaitingForTechnical;
+
+class OvertimeRequestTest extends FeatureTestCase
+{
+    use DatabaseMigrations;
+
+    public function testUserCanSeeOvertimeRequestsList(): void
+    {
+        $user = User::factory()->create();
+        $currentYearPeriod = YearPeriod::current();
+
+        OvertimeRequest::factory()
+            ->count(10)
+            ->for($user)
+            ->for($currentYearPeriod)
+            ->create();
+
+        $this->actingAs($user)
+            ->get("/overtime/requests/me")
+            ->assertOk()
+            ->assertInertia(
+                fn(Assert $page) => $page
+                    ->component("OvertimeRequest/Index")
+                    ->has("requests.data", 10),
+            );
+    }
+
+    public function testUserCanCreateOvertimeRequest(): void
+    {
+        $user = User::factory()
+            ->has(Profile::factory(["employment_form" => EmploymentForm::EmploymentContract]))
+            ->create();
+
+        $currentYearPeriod = YearPeriod::current();
+
+        $this->actingAs($user)
+            ->post("/overtime/requests", [
+                "user" => $user->id,
+                "type" => SettlementType::Money->value,
+                "from" => Carbon::create($currentYearPeriod->year, 2, 7, 20)->format("Y-m-d H:i"),
+                "to" => Carbon::create($currentYearPeriod->year, 2, 7, 23)->format("Y-m-d H:i"),
+                "comment" => "Comment for the overtime request.",
+            ])
+            ->assertSessionHasNoErrors()
+            ->assertRedirect();
+
+        $this->assertDatabaseHas("overtime_requests", [
+            "user_id" => $user->id,
+            "year_period_id" => $currentYearPeriod->id,
+            "settlement_type" => SettlementType::Money->value,
+            "state" => WaitingForTechnical::$name,
+            "from" => Carbon::create($currentYearPeriod->year, 2, 7, 20)->format("Y-m-d H:i"),
+            "to" => Carbon::create($currentYearPeriod->year, 2, 7, 23)->format("Y-m-d H:i"),
+            "hours" => 3,
+            "comment" => "Comment for the overtime request.",
+        ]);
+    }
+
+    public function testTechnicalApproverCanApproveOvertimeRequest(): void
+    {
+        $user = User::factory()
+            ->has(Profile::factory(["employment_form" => EmploymentForm::EmploymentContract]))
+            ->create();
+        $technicalApprover = User::factory()->technicalApprover()->create();
+
+        $overtimeRequest = OvertimeRequest::factory()
+            ->for($user)
+            ->create(["state" => WaitingForTechnical::$name]);
+
+        $this->actingAs($technicalApprover)
+            ->post("/overtime/requests/{$overtimeRequest->id}/accept-as-technical")
+            ->assertSessionHasNoErrors()
+            ->assertRedirect();
+
+        $this->assertDatabaseHas("overtime_requests", [
+            "id" => $overtimeRequest->id,
+            "state" => Approved::$name,
+        ]);
+    }
+
+    public function testEmployeeCannotApproveOvertimeRequest(): void
+    {
+        $user = User::factory()
+            ->has(Profile::factory(["employment_form" => EmploymentForm::EmploymentContract]))
+            ->create();
+        $approver = User::factory()->employee()->create();
+
+        $overtimeRequest = OvertimeRequest::factory()
+            ->for($user)
+            ->create(["state" => WaitingForTechnical::$name]);
+
+        $this->actingAs($approver)
+            ->post("/overtime/requests/{$overtimeRequest->id}/accept-as-technical")
+            ->assertStatus(403);
+
+        $this->assertDatabaseHas("overtime_requests", [
+            "id" => $overtimeRequest->id,
+            "state" => WaitingForTechnical::$name,
+        ]);
+    }
+
+    public function testTechnicalApproverCanRejectOvertimeRequest(): void
+    {
+        $user = User::factory()
+            ->has(Profile::factory(["employment_form" => EmploymentForm::EmploymentContract]))
+            ->create();
+        $technicalApprover = User::factory()->technicalApprover()->create();
+
+        $overtimeRequest = OvertimeRequest::factory()
+            ->for($user)
+            ->create(["state" => WaitingForTechnical::$name]);
+
+        $this->actingAs($technicalApprover)
+            ->post("/overtime/requests/{$overtimeRequest->id}/reject")
+            ->assertSessionHasNoErrors()
+            ->assertRedirect();
+
+        $this->assertDatabaseHas("overtime_requests", [
+            "id" => $overtimeRequest->id,
+            "state" => Rejected::$name,
+        ]);
+    }
+
+    public function testEmployeeCanCancelOvertimeRequest(): void
+    {
+        $user = User::factory()
+            ->has(Profile::factory(["employment_form" => EmploymentForm::EmploymentContract]))
+            ->create();
+
+        $overtimeRequest = OvertimeRequest::factory()
+            ->for($user)
+            ->create(["state" => WaitingForTechnical::$name]);
+
+        $this->actingAs($user)
+            ->post("/overtime/requests/{$overtimeRequest->id}/cancel")
+            ->assertSessionHasNoErrors()
+            ->assertRedirect();
+
+        $this->assertDatabaseHas("overtime_requests", [
+            "id" => $overtimeRequest->id,
+            "state" => Cancelled::$name,
+        ]);
+    }
+
+    public function testUserCannotCreateOvertimeRequestIfHeHasPendingVacationRequestInThisRange(): void
+    {
+        $user = User::factory()
+            ->has(Profile::factory(["employment_form" => EmploymentForm::EmploymentContract]))
+            ->create();
+        $currentYearPeriod = YearPeriod::current();
+
+        OvertimeRequest::factory([
+            "state" => WaitingForTechnical::class,
+            "from" => Carbon::create($currentYearPeriod->year, 2, 7, 20)->format("Y-m-d H:i"),
+            "to" => Carbon::create($currentYearPeriod->year, 2, 7, 22)->format("Y-m-d H:i"),
+        ])
+            ->for($user)
+            ->for($currentYearPeriod)
+            ->create();
+
+        $this->actingAs($user)
+            ->post("/overtime/requests", [
+                "user" => $user->id,
+                "type" => SettlementType::Money->value,
+                "from" => Carbon::create($currentYearPeriod->year, 2, 7, 21)->format("Y-m-d H:i"),
+                "to" => Carbon::create($currentYearPeriod->year, 2, 7, 23)->format("Y-m-d H:i"),
+            ])
+            ->assertSessionHasErrors([
+                "overtimeRequest" => __("You have a pending request in this date range."),
+            ]);
+    }
+
+    public function testTechnicalApproverCanSettleOvertimeRequest(): void
+    {
+        $user = User::factory()
+            ->has(Profile::factory(["employment_form" => EmploymentForm::EmploymentContract]))
+            ->create();
+        $technicalApprover = User::factory()->technicalApprover()->create();
+
+        $overtimeRequest = OvertimeRequest::factory()
+            ->for($user)
+            ->create(["state" => Approved::$name]);
+
+        $this->actingAs($technicalApprover)
+            ->post("/overtime/requests/{$overtimeRequest->id}/settle")
+            ->assertSessionHasNoErrors()
+            ->assertRedirect();
+
+        $this->assertDatabaseHas("overtime_requests", [
+            "id" => $overtimeRequest->id,
+            "state" => Settled::$name,
+        ]);
+    }
+
+    public function testEmployeeCanSettleOvertimeRequest(): void
+    {
+        $user = User::factory()
+            ->has(Profile::factory(["employment_form" => EmploymentForm::EmploymentContract]))
+            ->create();
+
+        $overtimeRequest = OvertimeRequest::factory()
+            ->for($user)
+            ->create(["state" => Approved::$name]);
+
+        $this->actingAs($user)
+            ->post("/overtime/requests/{$overtimeRequest->id}/settle")
+            ->assertSessionHasNoErrors()
+            ->assertRedirect();
+
+        $this->assertDatabaseHas("overtime_requests", [
+            "id" => $overtimeRequest->id,
+            "state" => Settled::$name,
+        ]);
+    }
+
+    public function testOvertimeRequestHoursAreRoundedUp(): void
+    {
+        $user = User::factory()
+            ->has(Profile::factory(["employment_form" => EmploymentForm::EmploymentContract]))
+            ->create();
+
+        $currentYearPeriod = YearPeriod::current();
+
+        $this->actingAs($user)
+            ->post("/overtime/requests", [
+                "user" => $user->id,
+                "type" => SettlementType::Money->value,
+                "from" => Carbon::create($currentYearPeriod->year, 2, 7, 20)->format("Y-m-d H:i"),
+                "to" => Carbon::create($currentYearPeriod->year, 2, 7, 23, 5)->format("Y-m-d H:i"),
+                "comment" => "Comment for the overtime request.",
+            ])
+            ->assertSessionHasNoErrors()
+            ->assertRedirect();
+
+        $this->assertDatabaseHas("overtime_requests", [
+            "user_id" => $user->id,
+            "year_period_id" => $currentYearPeriod->id,
+            "settlement_type" => SettlementType::Money->value,
+            "state" => WaitingForTechnical::$name,
+            "from" => Carbon::create($currentYearPeriod->year, 2, 7, 20)->format("Y-m-d H:i"),
+            "to" => Carbon::create($currentYearPeriod->year, 2, 7, 23, 5)->format("Y-m-d H:i"),
+            "hours" => 4,
+            "comment" => "Comment for the overtime request.",
+        ]);
+    }
+}

From d247ce92cde14f52aef05b782151678dc46f28a4 Mon Sep 17 00:00:00 2001
From: Kamil <kamil.piech.97@gmail.com>
Date: Mon, 10 Jun 2024 12:28:31 +0200
Subject: [PATCH 05/14] #444 - fix

---
 app/Actions/OvertimeRequest/CreateAction.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/Actions/OvertimeRequest/CreateAction.php b/app/Actions/OvertimeRequest/CreateAction.php
index 2af62242..793be7f0 100644
--- a/app/Actions/OvertimeRequest/CreateAction.php
+++ b/app/Actions/OvertimeRequest/CreateAction.php
@@ -55,9 +55,4 @@ protected function handleCreatedOvertimeRequest(OvertimeRequest $overtimeRequest
     {
         $this->waitForTechApprovalAction->execute($overtimeRequest);
     }
-
-    protected function notify(VacationRequest $vacationRequest): void
-    {
-        $vacationRequest->user->notify(new VacationRequestCreatedNotification($vacationRequest));
-    }
 }

From 1976a47e3b0825beea9b2ba41b55f648150d83bb Mon Sep 17 00:00:00 2001
From: Kamil <kamil.piech.97@gmail.com>
Date: Mon, 10 Jun 2024 14:45:52 +0200
Subject: [PATCH 06/14] #444 - fixes and added policies

---
 app/Actions/OvertimeRequest/CreateAction.php  |  1 -
 .../Controllers/OvertimeRequestController.php |  4 ++
 app/Http/Middleware/HandleInertiaRequests.php |  1 +
 app/Models/User.php                           |  2 -
 app/Policies/UserPolicy.php                   | 16 +++++++
 app/Providers/AuthServiceProvider.php         |  3 ++
 database/seeders/DemoSeeder.php               | 14 ++++++
 resources/js/Shared/MainMenu.vue              |  2 +-
 tests/Feature/OvertimeRequestTest.php         | 44 ++++++++++++++++++-
 9 files changed, 81 insertions(+), 6 deletions(-)
 create mode 100644 app/Policies/UserPolicy.php

diff --git a/app/Actions/OvertimeRequest/CreateAction.php b/app/Actions/OvertimeRequest/CreateAction.php
index 793be7f0..e15ce218 100644
--- a/app/Actions/OvertimeRequest/CreateAction.php
+++ b/app/Actions/OvertimeRequest/CreateAction.php
@@ -9,7 +9,6 @@
 use Toby\Domain\OvertimeRequestStateManager;
 use Toby\Models\OvertimeRequest;
 use Toby\Models\User;
-use Toby\Models\VacationRequest;
 use Toby\Validation\OvertimeRequestValidator;
 
 class CreateAction
diff --git a/app/Http/Controllers/OvertimeRequestController.php b/app/Http/Controllers/OvertimeRequestController.php
index 997e4cad..433d9739 100644
--- a/app/Http/Controllers/OvertimeRequestController.php
+++ b/app/Http/Controllers/OvertimeRequestController.php
@@ -32,6 +32,8 @@ public function index(Request $request, YearPeriodRetriever $yearPeriodRetriever
             return redirect()->route("overtime.requests.indexForApprovers");
         }
 
+        $this->authorize("canUseOvertimeRequestFunctionality", $request->user());
+
         $status = $request->get("status", "all");
 
         $overtimeRequests = $request->user()
@@ -133,6 +135,8 @@ public function show(OvertimeRequest $overtimeRequest): Response
 
     public function create(Request $request): Response
     {
+        $this->authorize("canUseOvertimeRequestFunctionality", $request->user());
+
         return inertia("OvertimeRequest/Create", [
             "settlementTypes" => SettlementType::casesToSelect(),
             "overtimeFromDate" => $request->get("from_date"),
diff --git a/app/Http/Middleware/HandleInertiaRequests.php b/app/Http/Middleware/HandleInertiaRequests.php
index be7e6018..408c3907 100644
--- a/app/Http/Middleware/HandleInertiaRequests.php
+++ b/app/Http/Middleware/HandleInertiaRequests.php
@@ -48,6 +48,7 @@ protected function getAuthData(Request $request): Closure
                         $permission->name => $user && $user->hasPermissionTo($permission),
                     ],
                 ),
+            "overtimeEnabled" => $user && $user->can("canUseOvertimeRequestFunctionality", $user),
         ];
     }
 
diff --git a/app/Models/User.php b/app/Models/User.php
index d214b7bb..4521da5a 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -17,7 +17,6 @@
 use Illuminate\Support\Facades\DB;
 use Laravel\Sanctum\HasApiTokens;
 use Spatie\Permission\Traits\HasRoles;
-use Toby\Enums\EmploymentForm;
 use Toby\Enums\Role;
 use Toby\Notifications\Notifiable as NotifiableInterface;
 
@@ -44,7 +43,6 @@ class User extends Authenticatable implements NotifiableInterface
     protected $casts = [
         "role" => Role::class,
         "last_active_at" => "datetime",
-        "employment_form" => EmploymentForm::class,
         "employment_date" => "date",
     ];
     protected $hidden = [
diff --git a/app/Policies/UserPolicy.php b/app/Policies/UserPolicy.php
new file mode 100644
index 00000000..424e6f34
--- /dev/null
+++ b/app/Policies/UserPolicy.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Policies;
+
+use Toby\Enums\EmploymentForm;
+use Toby\Models\User;
+
+class UserPolicy
+{
+    public function canUseOvertimeRequestFunctionality(User $user): bool
+    {
+        return $user->profile->employment_form->value === EmploymentForm::EmploymentContract->value;
+    }
+}
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
index da545c00..da37876a 100644
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -7,9 +7,11 @@
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
 use Toby\Models\Key;
 use Toby\Models\OvertimeRequest;
+use Toby\Models\User;
 use Toby\Models\VacationRequest;
 use Toby\Policies\KeyPolicy;
 use Toby\Policies\OvertimeRequestPolicy;
+use Toby\Policies\UserPolicy;
 use Toby\Policies\VacationRequestPolicy;
 
 class AuthServiceProvider extends ServiceProvider
@@ -17,6 +19,7 @@ class AuthServiceProvider extends ServiceProvider
     protected $policies = [
         OvertimeRequest::class => OvertimeRequestPolicy::class,
         VacationRequest::class => VacationRequestPolicy::class,
+        User::class => UserPolicy::class,
         Key::class => KeyPolicy::class,
     ];
 }
diff --git a/database/seeders/DemoSeeder.php b/database/seeders/DemoSeeder.php
index bc8222bf..2e78f7be 100644
--- a/database/seeders/DemoSeeder.php
+++ b/database/seeders/DemoSeeder.php
@@ -52,6 +52,20 @@ public function run(): void
             ])
             ->create();
 
+        User::factory([
+            "email" => "jerzy.nowak@example.com",
+            "remember_token" => Str::random(10),
+        ])
+            ->employee()
+            ->hasProfile([
+                "first_name" => "Jerzy",
+                "last_name" => "Nowak",
+                "employment_form" => EmploymentForm::EmploymentContract,
+                "position" => "programista",
+                "employment_date" => Carbon::createFromDate(2021, 5, 10),
+            ])
+            ->create();
+
         User::factory([
             "email" => "anna.nowak@example.com",
             "remember_token" => Str::random(10),
diff --git a/resources/js/Shared/MainMenu.vue b/resources/js/Shared/MainMenu.vue
index b83c4f52..8e9339d1 100644
--- a/resources/js/Shared/MainMenu.vue
+++ b/resources/js/Shared/MainMenu.vue
@@ -59,7 +59,7 @@ const vacationNavigation = computed(() =>
       href: '/overtime/requests/me',
       section: 'OvertimeRequest',
       icon: ClockIcon,
-      can: !props.auth.can.listAllRequests,
+      can: props.auth.overtimeEnabled,
     },
     {
       name: 'Wnioski',
diff --git a/tests/Feature/OvertimeRequestTest.php b/tests/Feature/OvertimeRequestTest.php
index 93c41e9b..9c97cad2 100644
--- a/tests/Feature/OvertimeRequestTest.php
+++ b/tests/Feature/OvertimeRequestTest.php
@@ -26,7 +26,10 @@ class OvertimeRequestTest extends FeatureTestCase
 
     public function testUserCanSeeOvertimeRequestsList(): void
     {
-        $user = User::factory()->create();
+        $user = User::factory()
+            ->employee()
+            ->has(Profile::factory(["employment_form" => EmploymentForm::EmploymentContract]))
+            ->create();
         $currentYearPeriod = YearPeriod::current();
 
         OvertimeRequest::factory()
@@ -45,9 +48,10 @@ public function testUserCanSeeOvertimeRequestsList(): void
             );
     }
 
-    public function testUserCanCreateOvertimeRequest(): void
+    public function testUserWithEmploymentContractCanCreateOvertimeRequest(): void
     {
         $user = User::factory()
+            ->employee()
             ->has(Profile::factory(["employment_form" => EmploymentForm::EmploymentContract]))
             ->create();
 
@@ -76,6 +80,42 @@ public function testUserCanCreateOvertimeRequest(): void
         ]);
     }
 
+    public function testUserWithB2bContractCannotCreateOvertimeRequest(): void
+    {
+        $user = User::factory()
+            ->employee()
+            ->has(Profile::factory(["employment_form" => EmploymentForm::B2bContract]))
+            ->create();
+
+        $this->actingAs($user)
+            ->get("/overtime/requests/create")
+            ->assertStatus(403);
+    }
+
+    public function testUserWithBoardMemberContractCannotCreateOvertimeRequest(): void
+    {
+        $user = User::factory()
+            ->employee()
+            ->has(Profile::factory(["employment_form" => EmploymentForm::BoardMemberContract]))
+            ->create();
+
+        $this->actingAs($user)
+            ->get("/overtime/requests/create")
+            ->assertStatus(403);
+    }
+
+    public function testUserWithCommissionContractCannotCreateOvertimeRequest(): void
+    {
+        $user = User::factory()
+            ->employee()
+            ->has(Profile::factory(["employment_form" => EmploymentForm::CommissionContract]))
+            ->create();
+
+        $this->actingAs($user)
+            ->get("/overtime/requests/create")
+            ->assertStatus(403);
+    }
+
     public function testTechnicalApproverCanApproveOvertimeRequest(): void
     {
         $user = User::factory()

From d7af41f472bbe3c72a24922bc4b8d7ad51137b8a Mon Sep 17 00:00:00 2001
From: Kamil <kamil.piech.97@gmail.com>
Date: Tue, 11 Jun 2024 09:38:31 +0200
Subject: [PATCH 07/14]  - fixes

---
 .../Controllers/OvertimeRequestController.php     |  6 +-----
 app/Policies/OvertimeRequestPolicy.php            | 15 ++++++++++-----
 .../{IndexForApprovers.vue => ApproversIndex.vue} |  0
 resources/js/Shared/MainMenu.vue                  |  4 ++--
 4 files changed, 13 insertions(+), 12 deletions(-)
 rename resources/js/Pages/OvertimeRequest/{IndexForApprovers.vue => ApproversIndex.vue} (100%)

diff --git a/app/Http/Controllers/OvertimeRequestController.php b/app/Http/Controllers/OvertimeRequestController.php
index 433d9739..bf7ca5ac 100644
--- a/app/Http/Controllers/OvertimeRequestController.php
+++ b/app/Http/Controllers/OvertimeRequestController.php
@@ -28,10 +28,6 @@ class OvertimeRequestController extends Controller
 {
     public function index(Request $request, YearPeriodRetriever $yearPeriodRetriever): Response|RedirectResponse
     {
-        if ($request->user()->can("listAllRequests")) {
-            return redirect()->route("overtime.requests.indexForApprovers");
-        }
-
         $this->authorize("canUseOvertimeRequestFunctionality", $request->user());
 
         $status = $request->get("status", "all");
@@ -108,7 +104,7 @@ public function indexForApprovers(
             ->orderByProfileField("first_name")
             ->get();
 
-        return inertia("OvertimeRequest/IndexForApprovers", [
+        return inertia("OvertimeRequest/ApproversIndex", [
             "requests" => OvertimeRequestResource::collection($overtimeRequests),
             "users" => SimpleUserResource::collection($users),
             "filters" => [
diff --git a/app/Policies/OvertimeRequestPolicy.php b/app/Policies/OvertimeRequestPolicy.php
index 622e913a..2da05205 100644
--- a/app/Policies/OvertimeRequestPolicy.php
+++ b/app/Policies/OvertimeRequestPolicy.php
@@ -14,12 +14,14 @@ class OvertimeRequestPolicy
 {
     public function acceptAsTechApprover(User $user): bool
     {
-        return $user->hasPermissionTo("manageRequestsAsTechnicalApprover");
+        return $user->hasPermissionTo("manageRequestsAsAdministrativeApprover") ||
+            $user->hasPermissionTo("manageRequestsAsTechnicalApprover");
     }
 
     public function reject(User $user): bool
     {
-        return $user->hasPermissionTo("manageRequestsAsTechnicalApprover");
+        return $user->hasPermissionTo("manageRequestsAsAdministrativeApprover") ||
+            $user->hasPermissionTo("manageRequestsAsTechnicalApprover");
     }
 
     public function cancel(User $user, OvertimeRequest $overtimeRequest): bool
@@ -31,7 +33,8 @@ public function cancel(User $user, OvertimeRequest $overtimeRequest): bool
             return true;
         }
 
-        return $user->hasPermissionTo("manageRequestsAsTechnicalApprover");
+        return $user->hasPermissionTo("manageRequestsAsAdministrativeApprover") ||
+            $user->hasPermissionTo("manageRequestsAsTechnicalApprover");
     }
 
     public function settle(User $user, OvertimeRequest $overtimeRequest): bool
@@ -42,7 +45,8 @@ public function settle(User $user, OvertimeRequest $overtimeRequest): bool
             return true;
         }
 
-        return $user->hasPermissionTo("manageRequestsAsTechnicalApprover");
+        return $user->hasPermissionTo("manageRequestsAsAdministrativeApprover") ||
+            $user->hasPermissionTo("manageRequestsAsTechnicalApprover");
     }
 
     public function show(User $user, OvertimeRequest $overtimeRequest): bool
@@ -51,6 +55,7 @@ public function show(User $user, OvertimeRequest $overtimeRequest): bool
             return true;
         }
 
-        return $user->hasPermissionTo("manageRequestsAsTechnicalApprover");
+        return $user->hasPermissionTo("manageRequestsAsAdministrativeApprover") ||
+            $user->hasPermissionTo("manageRequestsAsTechnicalApprover");
     }
 }
diff --git a/resources/js/Pages/OvertimeRequest/IndexForApprovers.vue b/resources/js/Pages/OvertimeRequest/ApproversIndex.vue
similarity index 100%
rename from resources/js/Pages/OvertimeRequest/IndexForApprovers.vue
rename to resources/js/Pages/OvertimeRequest/ApproversIndex.vue
diff --git a/resources/js/Shared/MainMenu.vue b/resources/js/Shared/MainMenu.vue
index 8e9339d1..44f92efb 100644
--- a/resources/js/Shared/MainMenu.vue
+++ b/resources/js/Shared/MainMenu.vue
@@ -57,7 +57,7 @@ const vacationNavigation = computed(() =>
     {
       name: 'Moje nadgodziny',
       href: '/overtime/requests/me',
-      section: 'OvertimeRequest',
+      section: 'OvertimeRequest/Index',
       icon: ClockIcon,
       can: props.auth.overtimeEnabled,
     },
@@ -72,7 +72,7 @@ const vacationNavigation = computed(() =>
     {
       name: 'Nadgodziny',
       href: '/overtime/requests',
-      section: 'OvertimeRequest',
+      section: 'OvertimeRequest/ApproversIndex',
       icon: ClockIcon,
       can: props.auth.can.listAllRequests,
     },

From e2d0283a43d4010907184fe7e239f2f1692110ec Mon Sep 17 00:00:00 2001
From: Kamil Piech <kamil.piech@blumilk.pl>
Date: Tue, 11 Jun 2024 10:05:11 +0200
Subject: [PATCH 08/14] Update app/Enums/SettlementType.php

Co-authored-by: Krzysztof Rewak <krzysztof.rewak@blumilk.pl>
---
 app/Enums/SettlementType.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/Enums/SettlementType.php b/app/Enums/SettlementType.php
index e7008a7c..f38a20e1 100644
--- a/app/Enums/SettlementType.php
+++ b/app/Enums/SettlementType.php
@@ -16,13 +16,12 @@ public function label(): string
 
     public static function casesToSelect(): array
     {
-        $cases = collect(SettlementType::cases());
-
-        return $cases->map(
+        return array_map(
             fn(SettlementType $enum): array => [
                 "label" => $enum->label(),
                 "value" => $enum->value,
             ],
-        )->toArray();
+            SettlementType::cases(),
+        )
     }
 }

From f5c262821879a85c4d0deab4f334bf6f9f5d3e54 Mon Sep 17 00:00:00 2001
From: Kamil <kamil.piech.97@gmail.com>
Date: Tue, 11 Jun 2024 10:41:51 +0200
Subject: [PATCH 09/14]  - cr fixes

---
 .../OvertimeRequest/AcceptAsTechnicalAction.php       |  2 --
 app/Domain/OvertimeCalculator.php                     |  2 +-
 app/Enums/SettlementType.php                          |  2 +-
 app/Helpers/DateFormats.php                           | 11 +++++++++++
 app/Http/Controllers/OvertimeRequestController.php    |  8 ++++++--
 app/Http/Controllers/VacationRequestController.php    |  3 +++
 .../Requests/Api/CalculateOvertimeHoursRequest.php    |  5 +++--
 .../Requests/Api/CalculateVacationDaysRequest.php     |  5 +++--
 app/Http/Requests/EquipmentRequest.php                |  3 ++-
 app/Http/Requests/HolidayRequest.php                  |  3 ++-
 app/Http/Requests/OvertimeRequestRequest.php          |  5 +++--
 app/Http/Requests/UserRequest.php                     |  5 +++--
 app/Http/Requests/VacationRequestRequest.php          |  5 +++--
 app/Http/Resources/OvertimeRequestResource.php        |  5 +++--
 app/Observers/OvertimeRequestObserver.php             |  6 ++++++
 app/Observers/VacationRequestObserver.php             |  6 ++++++
 16 files changed, 56 insertions(+), 20 deletions(-)
 create mode 100644 app/Helpers/DateFormats.php

diff --git a/app/Actions/OvertimeRequest/AcceptAsTechnicalAction.php b/app/Actions/OvertimeRequest/AcceptAsTechnicalAction.php
index b5e4feac..4a7800e7 100644
--- a/app/Actions/OvertimeRequest/AcceptAsTechnicalAction.php
+++ b/app/Actions/OvertimeRequest/AcceptAsTechnicalAction.php
@@ -5,7 +5,6 @@
 namespace Toby\Actions\OvertimeRequest;
 
 use Toby\Domain\OvertimeRequestStateManager;
-use Toby\Domain\VacationTypeConfigRetriever;
 use Toby\Models\OvertimeRequest;
 use Toby\Models\User;
 
@@ -13,7 +12,6 @@ class AcceptAsTechnicalAction
 {
     public function __construct(
         protected OvertimeRequestStateManager $stateManager,
-        protected VacationTypeConfigRetriever $configRetriever,
         protected ApproveAction $approveAction,
     ) {}
 
diff --git a/app/Domain/OvertimeCalculator.php b/app/Domain/OvertimeCalculator.php
index 14c8f500..fb731b11 100644
--- a/app/Domain/OvertimeCalculator.php
+++ b/app/Domain/OvertimeCalculator.php
@@ -11,7 +11,7 @@ class OvertimeCalculator
 {
     public function calculateHours(CarbonInterface $from, CarbonInterface $to): int
     {
-        $hours = Carbon::create($from)->diffInMinutes($to, true);
+        $hours = Carbon::create($from)->diffInMinutes($to);
 
         return (int)ceil($hours / 60);
     }
diff --git a/app/Enums/SettlementType.php b/app/Enums/SettlementType.php
index f38a20e1..e84b871f 100644
--- a/app/Enums/SettlementType.php
+++ b/app/Enums/SettlementType.php
@@ -22,6 +22,6 @@ public static function casesToSelect(): array
                 "value" => $enum->value,
             ],
             SettlementType::cases(),
-        )
+        );
     }
 }
diff --git a/app/Helpers/DateFormats.php b/app/Helpers/DateFormats.php
new file mode 100644
index 00000000..9f8b2395
--- /dev/null
+++ b/app/Helpers/DateFormats.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Helpers;
+
+class DateFormats
+{
+    public const DATETIME = "Y-m-d H:i";
+    public const DATE = "Y-m-d";
+}
diff --git a/app/Http/Controllers/OvertimeRequestController.php b/app/Http/Controllers/OvertimeRequestController.php
index bf7ca5ac..ad4ebde0 100644
--- a/app/Http/Controllers/OvertimeRequestController.php
+++ b/app/Http/Controllers/OvertimeRequestController.php
@@ -26,7 +26,7 @@
 
 class OvertimeRequestController extends Controller
 {
-    public function index(Request $request, YearPeriodRetriever $yearPeriodRetriever): Response|RedirectResponse
+    public function index(Request $request, YearPeriodRetriever $yearPeriodRetriever): Response
     {
         $this->authorize("canUseOvertimeRequestFunctionality", $request->user());
 
@@ -44,24 +44,28 @@ public function index(Request $request, YearPeriodRetriever $yearPeriodRetriever
             ->overtimeRequests()
             ->whereBelongsTo($yearPeriodRetriever->selected())
             ->states(OvertimeRequestStatesRetriever::pendingStates())
+            ->cache(key: "overtimeStats")
             ->count();
 
         $success = $request->user()
             ->overtimeRequests()
             ->whereBelongsTo($yearPeriodRetriever->selected())
             ->states(OvertimeRequestStatesRetriever::successStates())
+            ->cache(key: "overtimeStats")
             ->count();
 
         $failed = $request->user()
             ->overtimeRequests()
             ->whereBelongsTo($yearPeriodRetriever->selected())
             ->states(OvertimeRequestStatesRetriever::failedStates())
+            ->cache(key: "overtimeStats")
             ->count();
 
         $settled = $request->user()
             ->overtimeRequests()
             ->whereBelongsTo($yearPeriodRetriever->selected())
             ->states(OvertimeRequestStatesRetriever::settledStates())
+            ->cache(key: "overtimeStats")
             ->count();
 
         return inertia("OvertimeRequest/Index", [
@@ -84,7 +88,7 @@ public function indexForApprovers(
         YearPeriodRetriever $yearPeriodRetriever,
     ): RedirectResponse|Response {
         if ($request->user()->cannot("listAllRequests")) {
-            return redirect()->route("overtime.requests.index");
+            abort(403);
         }
 
         $yearPeriod = $yearPeriodRetriever->selected();
diff --git a/app/Http/Controllers/VacationRequestController.php b/app/Http/Controllers/VacationRequestController.php
index efbe4c9f..b22992b7 100644
--- a/app/Http/Controllers/VacationRequestController.php
+++ b/app/Http/Controllers/VacationRequestController.php
@@ -58,6 +58,7 @@ public function index(Request $request, YearPeriodRetriever $yearPeriodRetriever
             ->whereBelongsTo($yearPeriodRetriever->selected())
             ->states(VacationRequestStatesRetriever::pendingStates())
             ->when($withoutRemote, fn(Builder $query): Builder => $query->excludeType(VacationType::RemoteWork))
+            ->cache(key: "vacationStats")
             ->count();
 
         $success = $request->user()
@@ -65,6 +66,7 @@ public function index(Request $request, YearPeriodRetriever $yearPeriodRetriever
             ->whereBelongsTo($yearPeriodRetriever->selected())
             ->states(VacationRequestStatesRetriever::successStates())
             ->when($withoutRemote, fn(Builder $query): Builder => $query->excludeType(VacationType::RemoteWork))
+            ->cache(key: "vacationStats")
             ->count();
 
         $failed = $request->user()
@@ -72,6 +74,7 @@ public function index(Request $request, YearPeriodRetriever $yearPeriodRetriever
             ->whereBelongsTo($yearPeriodRetriever->selected())
             ->states(VacationRequestStatesRetriever::failedStates())
             ->when($withoutRemote, fn(Builder $query): Builder => $query->excludeType(VacationType::RemoteWork))
+            ->cache(key: "vacationStats")
             ->count();
 
         return inertia("VacationRequest/Index", [
diff --git a/app/Http/Requests/Api/CalculateOvertimeHoursRequest.php b/app/Http/Requests/Api/CalculateOvertimeHoursRequest.php
index 103f989b..0529e5da 100644
--- a/app/Http/Requests/Api/CalculateOvertimeHoursRequest.php
+++ b/app/Http/Requests/Api/CalculateOvertimeHoursRequest.php
@@ -6,6 +6,7 @@
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Carbon;
+use Toby\Helpers\DateFormats;
 use Toby\Http\Rules\YearPeriodExists;
 use Toby\Models\YearPeriod;
 
@@ -14,8 +15,8 @@ class CalculateOvertimeHoursRequest extends FormRequest
     public function rules(): array
     {
         return [
-            "from" => ["required", "date_format:Y-m-d H:i", new YearPeriodExists()],
-            "to" => ["required", "date_format:Y-m-d H:i", new YearPeriodExists()],
+            "from" => ["required", "date_format:" . DateFormats::DATETIME, new YearPeriodExists()],
+            "to" => ["required", "date_format:" . DateFormats::DATETIME, new YearPeriodExists()],
         ];
     }
 
diff --git a/app/Http/Requests/Api/CalculateVacationDaysRequest.php b/app/Http/Requests/Api/CalculateVacationDaysRequest.php
index e77dfed5..c8f2240f 100644
--- a/app/Http/Requests/Api/CalculateVacationDaysRequest.php
+++ b/app/Http/Requests/Api/CalculateVacationDaysRequest.php
@@ -8,6 +8,7 @@
 use Illuminate\Support\Carbon;
 use Illuminate\Validation\Rules\Enum;
 use Toby\Enums\VacationType;
+use Toby\Helpers\DateFormats;
 use Toby\Http\Rules\YearPeriodExists;
 use Toby\Models\YearPeriod;
 
@@ -17,8 +18,8 @@ public function rules(): array
     {
         return [
             "vacationType" => ["required", new Enum(VacationType::class)],
-            "from" => ["required", "date_format:Y-m-d", new YearPeriodExists()],
-            "to" => ["required", "date_format:Y-m-d", new YearPeriodExists()],
+            "from" => ["required", "date_format:" . DateFormats::DATE, new YearPeriodExists()],
+            "to" => ["required", "date_format:" . DateFormats::DATE, new YearPeriodExists()],
         ];
     }
 
diff --git a/app/Http/Requests/EquipmentRequest.php b/app/Http/Requests/EquipmentRequest.php
index 3eaed672..5ba60e39 100644
--- a/app/Http/Requests/EquipmentRequest.php
+++ b/app/Http/Requests/EquipmentRequest.php
@@ -6,6 +6,7 @@
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
+use Toby\Helpers\DateFormats;
 
 class EquipmentRequest extends FormRequest
 {
@@ -16,7 +17,7 @@ public function rules(): array
             "name" => ["required", "min:3", "max:80"],
             "isMobile" => ["required", "boolean"],
             "assignee" => ["required_with:assignedAt", "nullable", "exists:users,id"],
-            "assignedAt" => ["required_with:assignee", "nullable", "date_format:Y-m-d"],
+            "assignedAt" => ["required_with:assignee", "nullable", "date_format:" . DateFormats::DATE],
             "labels" => ["array", "distinct"],
         ];
     }
diff --git a/app/Http/Requests/HolidayRequest.php b/app/Http/Requests/HolidayRequest.php
index 96cc56a5..1069f267 100644
--- a/app/Http/Requests/HolidayRequest.php
+++ b/app/Http/Requests/HolidayRequest.php
@@ -7,6 +7,7 @@
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Carbon;
 use Illuminate\Validation\Rule;
+use Toby\Helpers\DateFormats;
 use Toby\Http\Rules\YearPeriodExists;
 use Toby\Models\YearPeriod;
 
@@ -17,7 +18,7 @@ public function rules(): array
         return [
             "name" => ["required", "min:3", "max:150"],
             "date" => ["required",
-                "date_format:Y-m-d",
+                "date_format:" . DateFormats::DATE,
                 Rule::unique("holidays", "date")->ignore($this->holiday),
                 new YearPeriodExists(),
             ],
diff --git a/app/Http/Requests/OvertimeRequestRequest.php b/app/Http/Requests/OvertimeRequestRequest.php
index 734203bd..1470fb63 100644
--- a/app/Http/Requests/OvertimeRequestRequest.php
+++ b/app/Http/Requests/OvertimeRequestRequest.php
@@ -8,6 +8,7 @@
 use Illuminate\Support\Carbon;
 use Illuminate\Validation\Rules\Enum;
 use Toby\Enums\SettlementType;
+use Toby\Helpers\DateFormats;
 use Toby\Http\Rules\YearPeriodExists;
 use Toby\Models\YearPeriod;
 
@@ -17,8 +18,8 @@ public function rules(): array
     {
         return [
             "user" => ["required", "exists:users,id"],
-            "from" => ["required", "date_format:Y-m-d H:i", new YearPeriodExists()],
-            "to" => ["required", "date_format:Y-m-d H:i", "after:from", new YearPeriodExists()],
+            "from" => ["required", "date_format:" . DateFormats::DATETIME, new YearPeriodExists()],
+            "to" => ["required", "date_format:" . DateFormats::DATETIME, "after:from", new YearPeriodExists()],
             "type" => ["required", new Enum(SettlementType::class)],
             "comment" => ["nullable"],
         ];
diff --git a/app/Http/Requests/UserRequest.php b/app/Http/Requests/UserRequest.php
index de04008c..16180db9 100644
--- a/app/Http/Requests/UserRequest.php
+++ b/app/Http/Requests/UserRequest.php
@@ -9,6 +9,7 @@
 use Illuminate\Validation\Rules\Enum;
 use Toby\Enums\EmploymentForm;
 use Toby\Enums\Role;
+use Toby\Helpers\DateFormats;
 
 class UserRequest extends FormRequest
 {
@@ -21,8 +22,8 @@ public function rules(): array
             "role" => ["required", new Enum(Role::class)],
             "position" => ["required"],
             "employmentForm" => ["required", new Enum(EmploymentForm::class)],
-            "employmentDate" => ["required", "date_format:Y-m-d"],
-            "birthday" => ["required", "date_format:Y-m-d", "before:today"],
+            "employmentDate" => ["required", "date_format:" . DateFormats::DATE],
+            "birthday" => ["required", "date_format:" . DateFormats::DATE, "before:today"],
             "slackId" => [],
             "nextMedicalExamDate" => ["nullable", "after:lastMedicalExamDate"],
             "nextOhsTrainingDate" => ["nullable", "after:lastOhsTrainingDate"],
diff --git a/app/Http/Requests/VacationRequestRequest.php b/app/Http/Requests/VacationRequestRequest.php
index 94e07412..a089eaa5 100644
--- a/app/Http/Requests/VacationRequestRequest.php
+++ b/app/Http/Requests/VacationRequestRequest.php
@@ -8,6 +8,7 @@
 use Illuminate\Support\Carbon;
 use Illuminate\Validation\Rules\Enum;
 use Toby\Enums\VacationType;
+use Toby\Helpers\DateFormats;
 use Toby\Http\Rules\YearPeriodExists;
 use Toby\Models\YearPeriod;
 
@@ -18,8 +19,8 @@ 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()],
+            "from" => ["required", "date_format:" . DateFormats::DATE, new YearPeriodExists()],
+            "to" => ["required", "date_format:" . DateFormats::DATE, new YearPeriodExists()],
             "flowSkipped" => ["nullable", "boolean"],
             "comment" => ["nullable"],
         ];
diff --git a/app/Http/Resources/OvertimeRequestResource.php b/app/Http/Resources/OvertimeRequestResource.php
index a7daa406..960bb83b 100644
--- a/app/Http/Resources/OvertimeRequestResource.php
+++ b/app/Http/Resources/OvertimeRequestResource.php
@@ -5,6 +5,7 @@
 namespace Toby\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
+use Toby\Helpers\DateFormats;
 use Toby\States\OvertimeRequest\AcceptedByTechnical;
 use Toby\States\OvertimeRequest\Cancelled;
 use Toby\States\OvertimeRequest\Rejected;
@@ -23,8 +24,8 @@ public function toArray($request): array
             "name" => $this->name,
             "user" => new SimpleUserResource($this->user),
             "state" => $this->state,
-            "from" => $this->from->format("Y-m-d H:i"),
-            "to" => $this->to->format("Y-m-d H:i"),
+            "from" => $this->from->format(DateFormats::DATETIME),
+            "to" => $this->to->format(DateFormats::DATETIME),
             "hours" => $this->hours,
             "settlementType" => $this->settlement_type,
             "settled" => $this->settled,
diff --git a/app/Observers/OvertimeRequestObserver.php b/app/Observers/OvertimeRequestObserver.php
index 12c2ee74..fcfe0e03 100644
--- a/app/Observers/OvertimeRequestObserver.php
+++ b/app/Observers/OvertimeRequestObserver.php
@@ -4,6 +4,7 @@
 
 namespace Toby\Observers;
 
+use Laragear\CacheQuery\Facades\CacheQuery;
 use Toby\Models\OvertimeRequest;
 
 class OvertimeRequestObserver
@@ -15,4 +16,9 @@ public function creating(OvertimeRequest $overtime): void
 
         $overtime->name = "{$number}/{$overtime->yearPeriod->year}";
     }
+
+    public function updating(OvertimeRequest $overtime): void
+    {
+        CacheQuery::forget("overtimeStats");
+    }
 }
diff --git a/app/Observers/VacationRequestObserver.php b/app/Observers/VacationRequestObserver.php
index 8500a471..44b4cb1f 100644
--- a/app/Observers/VacationRequestObserver.php
+++ b/app/Observers/VacationRequestObserver.php
@@ -4,6 +4,7 @@
 
 namespace Toby\Observers;
 
+use Laragear\CacheQuery\Facades\CacheQuery;
 use Toby\Models\VacationRequest;
 
 class VacationRequestObserver
@@ -15,4 +16,9 @@ public function creating(VacationRequest $vacationRequest): void
 
         $vacationRequest->name = "{$number}/{$vacationRequest->yearPeriod->year}";
     }
+
+    public function updating(VacationRequest $vacationRequest): void
+    {
+        CacheQuery::forget("vacationStats");
+    }
 }

From e98b510581805bc2184dcca1a368d68bf3a62ee8 Mon Sep 17 00:00:00 2001
From: Kamil <kamil.piech.97@gmail.com>
Date: Thu, 13 Jun 2024 14:22:08 +0200
Subject: [PATCH 10/14] #444 - added overtime report in Excel file for
 administrator

---
 app/Domain/OvertimeTimesheetExport.php        |  37 ++++
 app/Domain/OvertimeTimesheetPerUserSheet.php  | 189 ++++++++++++++++++
 .../OvertimeTimesheetController.php           |  41 ++++
 lang/pl.json                                  |   4 +
 resources/js/Pages/Calendar.vue               |  11 +-
 routes/web.php                                |   3 +
 6 files changed, 284 insertions(+), 1 deletion(-)
 create mode 100644 app/Domain/OvertimeTimesheetExport.php
 create mode 100644 app/Domain/OvertimeTimesheetPerUserSheet.php
 create mode 100644 app/Http/Controllers/OvertimeTimesheetController.php

diff --git a/app/Domain/OvertimeTimesheetExport.php b/app/Domain/OvertimeTimesheetExport.php
new file mode 100644
index 00000000..ab02d576
--- /dev/null
+++ b/app/Domain/OvertimeTimesheetExport.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Domain;
+
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Collection;
+use Maatwebsite\Excel\Concerns\WithMultipleSheets;
+use Toby\Models\User;
+
+class OvertimeTimesheetExport implements WithMultipleSheets
+{
+    protected Collection $users;
+    protected Carbon $month;
+
+    public function sheets(): array
+    {
+        return $this->users
+            ->map(fn(User $user): OvertimeTimesheetPerUserSheet => new OvertimeTimesheetPerUserSheet($user, $this->month))
+            ->toArray();
+    }
+
+    public function forUsers(Collection $users): static
+    {
+        $this->users = $users;
+
+        return $this;
+    }
+
+    public function forMonth(Carbon $month): static
+    {
+        $this->month = $month;
+
+        return $this;
+    }
+}
diff --git a/app/Domain/OvertimeTimesheetPerUserSheet.php b/app/Domain/OvertimeTimesheetPerUserSheet.php
new file mode 100644
index 00000000..246369cc
--- /dev/null
+++ b/app/Domain/OvertimeTimesheetPerUserSheet.php
@@ -0,0 +1,189 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Domain;
+
+use Carbon\CarbonPeriod;
+use Generator;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Collection;
+use Maatwebsite\Excel\Concerns\FromGenerator;
+use Maatwebsite\Excel\Concerns\RegistersEventListeners;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Maatwebsite\Excel\Concerns\WithEvents;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithStrictNullComparison;
+use Maatwebsite\Excel\Concerns\WithStyles;
+use Maatwebsite\Excel\Concerns\WithTitle;
+use Maatwebsite\Excel\Events\AfterSheet;
+use PhpOffice\PhpSpreadsheet\Shared\Date;
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+use PhpOffice\PhpSpreadsheet\Style\Border;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use Toby\Helpers\DateFormats;
+use Toby\Models\OvertimeRequest;
+use Toby\Models\User;
+use Toby\States\OvertimeRequest\Approved;
+
+class OvertimeTimesheetPerUserSheet implements WithTitle, WithHeadings, WithEvents, WithStyles, WithStrictNullComparison, ShouldAutoSize, FromGenerator
+{
+    use RegistersEventListeners;
+
+    public function __construct(
+        protected User $user,
+        protected Carbon $month,
+    ) {}
+
+    public function title(): string
+    {
+        return $this->user->profile->full_name;
+    }
+
+    public function headings(): array
+    {
+        return [
+            __("Date"),
+            __("Day of week"),
+            __("Start date"),
+            __("End date"),
+            __("Overtime hours"),
+            __("Overtime settlement"),
+        ];
+    }
+
+    public function generator(): Generator
+    {
+        $period = CarbonPeriod::create($this->month->copy()->startOfMonth(), $this->month->copy()->endOfMonth());
+        $overtimeRequests = $this->getOvertimeForPeriod($this->user, $period);
+
+        foreach ($period as $day) {
+            $overtimeRequestsForDay = $overtimeRequests->get($day->toDateString(), new Collection());
+
+            if (!$overtimeRequestsForDay->isEmpty()) {
+                /** @var OvertimeRequest $overtimeForDay */
+                foreach ($overtimeRequestsForDay as $overtimeForDay) {
+                    $row = [
+                        Date::dateTimeToExcel($day),
+                        $day->translatedFormat("l"),
+                        $overtimeForDay->from->format(DateFormats::DATETIME),
+                        $overtimeForDay->to->format(DateFormats::DATETIME),
+                        $overtimeForDay->hours,
+                        __($overtimeForDay->settlement_type->value),
+                    ];
+
+                    yield $row;
+                }
+            } else {
+                $row = [
+                    Date::dateTimeToExcel($day),
+                    $day->translatedFormat("l"),
+                ];
+
+                yield $row;
+            }
+        }
+    }
+
+    public function styles(Worksheet $sheet): void
+    {
+        $lastRow = $sheet->getHighestRow();
+        $lastColumn = $sheet->getHighestColumn();
+
+        $sheet->getStyle("A1:{$lastColumn}1")
+            ->getFont()->setBold(true);
+
+        $sheet->getStyle("A1:{$lastColumn}1")
+            ->getAlignment()
+            ->setVertical(Alignment::VERTICAL_CENTER);
+
+        $sheet->getStyle("A1:{$lastColumn}1")
+            ->getFill()
+            ->setFillType(Fill::FILL_SOLID)
+            ->getStartColor()
+            ->setRGB("D9D9D9");
+
+        $sheet->getStyle("C1:{$lastColumn}{$lastRow}")
+            ->getAlignment()
+            ->setHorizontal(Alignment::HORIZONTAL_CENTER);
+
+        $sheet->getStyle("A2:A{$lastRow}")
+            ->getNumberFormat()
+            ->setFormatCode(NumberFormat::FORMAT_DATE_DDMMYYYY);
+
+        $sheet->getStyle("C1:D{$lastRow}")
+            ->getNumberFormat()
+            ->setFormatCode(NumberFormat::FORMAT_DATE_TIME3);
+
+        $sheet->getStyle("A2:A{$lastRow}")
+            ->getFont()
+            ->setBold(true);
+
+        for ($i = 2; $i < $lastRow; $i++) {
+            $date = Date::excelToDateTimeObject($sheet->getCell("A{$i}")->getValue());
+
+            if (Carbon::createFromInterface($date)->isWeekend()) {
+                $sheet->getStyle("A{$i}:{$lastColumn}{$i}")
+                    ->getFill()
+                    ->setFillType(Fill::FILL_SOLID)
+                    ->getStartColor()
+                    ->setRGB("FEE2E2");
+            }
+        }
+
+        $sheet->getStyle("A1:{$lastColumn}{$lastRow}")
+            ->getBorders()
+            ->getAllBorders()
+            ->setBorderStyle(Border::BORDER_THIN)
+            ->getColor()
+            ->setRGB("B7B7B7");
+    }
+
+    public static function afterSheet(AfterSheet $event): void
+    {
+        $sheet = $event->getSheet();
+        $lastRow = $sheet->getDelegate()->getHighestRow();
+
+        $sheet->append([
+            __("Sum:"),
+            null,
+            null,
+            null,
+            "=SUM(E2:E{$lastRow})",
+        ]);
+
+        $lastRow++;
+
+        $sheet->getDelegate()->getStyle("A{$lastRow}")
+            ->getAlignment()
+            ->setHorizontal(Alignment::HORIZONTAL_RIGHT);
+
+        $sheet->getDelegate()->getStyle("A{$lastRow}")
+            ->getFont()
+            ->setBold(true);
+
+        $sheet->getDelegate()->getStyle("E{$lastRow}")
+            ->getAlignment()
+            ->setHorizontal(Alignment::HORIZONTAL_CENTER);
+
+        $sheet->getDelegate()->mergeCells("A{$lastRow}:D{$lastRow}");
+
+        $sheet->getDelegate()->getStyle("A{$lastRow}:E{$lastRow}")
+            ->getBorders()
+            ->getAllBorders()
+            ->setBorderStyle(Border::BORDER_THIN)
+            ->getColor()
+            ->setRGB("B7B7B7");
+    }
+
+    protected function getOvertimeForPeriod(User $user, CarbonPeriod $period): Collection
+    {
+        return $user->overtimeRequests()
+            ->whereBetween("from", [$period->start, $period->end])
+            ->states([Approved::$name])
+            ->get()
+            ->groupBy(fn(OvertimeRequest $overtime): string => $overtime->from->toDateString());
+    }
+}
diff --git a/app/Http/Controllers/OvertimeTimesheetController.php b/app/Http/Controllers/OvertimeTimesheetController.php
new file mode 100644
index 00000000..108b4b10
--- /dev/null
+++ b/app/Http/Controllers/OvertimeTimesheetController.php
@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Http\Controllers;
+
+use Illuminate\Support\Carbon;
+use Maatwebsite\Excel\Facades\Excel;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Toby\Domain\OvertimeTimesheetExport;
+use Toby\Enums\EmploymentForm;
+use Toby\Enums\Month;
+use Toby\Helpers\YearPeriodRetriever;
+use Toby\Models\User;
+
+class OvertimeTimesheetController extends Controller
+{
+    public function __invoke(
+        Month $month,
+        YearPeriodRetriever $yearPeriodRetriever,
+    ): BinaryFileResponse {
+        $this->authorize("manageRequestsAsAdministrativeApprover");
+
+        $yearPeriod = $yearPeriodRetriever->selected();
+        $carbonMonth = Carbon::create($yearPeriod->year, $month->toCarbonNumber());
+
+        $users = User::query()
+            ->whereRelation("profile", "employment_form", EmploymentForm::EmploymentContract)
+            ->orderByProfileField("last_name")
+            ->orderByProfileField("first_name")
+            ->get();
+
+        $filename = "overtime-{$carbonMonth->translatedFormat("F Y")}.xlsx";
+
+        $timesheet = (new OvertimeTimesheetExport())
+            ->forMonth($carbonMonth)
+            ->forUsers($users);
+
+        return Excel::download($timesheet, $filename);
+    }
+}
diff --git a/lang/pl.json b/lang/pl.json
index 529b872d..e68e3e38 100644
--- a/lang/pl.json
+++ b/lang/pl.json
@@ -49,6 +49,10 @@
   "Day of week": "Dzień tygodnia",
   "Start date": "Data rozpoczęcia",
   "End date": "Data zakończenia",
+  "Overtime hours": "Liczba nadgodzin",
+  "Overtime settlement": "Sposób rozliczenia",
+  "hours": "godzinowe",
+  "money": "pieniężne",
   "Worked hours": "Liczba godzin",
   "Hi :user!": "Cześć :user!",
   "The request :title changed state to :state.": "Wniosek :title zmienił status na :state.",
diff --git a/resources/js/Pages/Calendar.vue b/resources/js/Pages/Calendar.vue
index 4aa9e14e..f1d94c26 100644
--- a/resources/js/Pages/Calendar.vue
+++ b/resources/js/Pages/Calendar.vue
@@ -94,13 +94,22 @@ function linkVacationRequest(user){
           </span>
         </div>
       </div>
-      <div v-if="auth.can.manageRequestsAsAdministrativeApprover">
+      <div
+        v-if="auth.can.manageRequestsAsAdministrativeApprover"
+        class="flex"
+      >
         <a
           :href="`/vacation/timesheet/${selectedMonth.value}`"
           class="block py-3 px-4 ml-3 text-sm font-medium leading-4 text-center text-white bg-blumilk-600 hover:bg-blumilk-700 rounded-md border border-transparent focus:outline-none focus:ring-2 focus:ring-blumilk-500 focus:ring-offset-2 shadow-sm"
         >
           Pobierz plik Excel
         </a>
+        <a
+          :href="`/overtime/timesheet/${selectedMonth.value}`"
+          class="block py-3 px-4 ml-3 text-sm font-medium leading-4 text-center text-white bg-blumilk-600 hover:bg-blumilk-700 rounded-md border border-transparent focus:outline-none focus:ring-2 focus:ring-blumilk-500 focus:ring-offset-2 shadow-sm"
+        >
+          Pobierz nadgodziny
+        </a>
       </div>
     </div>
     <div class="overflow-x-auto">
diff --git a/routes/web.php b/routes/web.php
index dea6cf00..c14b94ce 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -19,6 +19,7 @@
 use Toby\Http\Controllers\LogoutController;
 use Toby\Http\Controllers\MonthlyUsageController;
 use Toby\Http\Controllers\OvertimeRequestController;
+use Toby\Http\Controllers\OvertimeTimesheetController;
 use Toby\Http\Controllers\PermissionController;
 use Toby\Http\Controllers\ResumeController;
 use Toby\Http\Controllers\SelectYearPeriodController;
@@ -184,6 +185,8 @@
         Route::post("/requests/{overtimeRequest}/accept-as-technical", [OvertimeRequestController::class, "acceptAsTechnical"])
             ->whereNumber("overtimeRequest")
             ->name("requests.accept-as-technical");
+        Route::get("/timesheet/{month}", OvertimeTimesheetController::class)
+            ->name("overtime-timesheet");
     });
 });
 

From c1fbed51e7c6084a3d9176d7d4e1ca6bb63c2541 Mon Sep 17 00:00:00 2001
From: Kamil <kamil.piech.97@gmail.com>
Date: Fri, 14 Jun 2024 09:48:55 +0200
Subject: [PATCH 11/14] #444 - fixes

---
 .../Controllers/OvertimeRequestController.php |  5 ++
 resources/js/Pages/Calendar.vue               |  6 --
 .../Pages/OvertimeRequest/ApproversIndex.vue  | 68 +++++++++++++++++++
 3 files changed, 73 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/OvertimeRequestController.php b/app/Http/Controllers/OvertimeRequestController.php
index ad4ebde0..98e80e18 100644
--- a/app/Http/Controllers/OvertimeRequestController.php
+++ b/app/Http/Controllers/OvertimeRequestController.php
@@ -15,6 +15,7 @@
 use Toby\Actions\OvertimeRequest\RejectAction;
 use Toby\Actions\OvertimeRequest\SettleAction;
 use Toby\Domain\OvertimeRequestStatesRetriever;
+use Toby\Enums\Month;
 use Toby\Enums\SettlementType;
 use Toby\Helpers\YearPeriodRetriever;
 use Toby\Http\Requests\OvertimeRequestRequest;
@@ -94,11 +95,13 @@ public function indexForApprovers(
         $yearPeriod = $yearPeriodRetriever->selected();
         $status = $request->get("status", "all");
         $user = $request->get("user");
+        $month = $request->get("month") ?? Month::current()->value;
 
         $overtimeRequests = OvertimeRequest::query()
             ->with(["user.permissions", "user.profile"])
             ->whereBelongsTo($yearPeriod)
             ->when($user !== null, fn(Builder $query): Builder => $query->where("user_id", $user))
+            ->when($month !== null, fn(Builder $query) => $query->whereMonth("from", Month::fromNameOrCurrent($month)->toCarbonNumber()))
             ->states(OvertimeRequestStatesRetriever::filterByStatusGroup($status, $request->user()))
             ->latest()
             ->paginate();
@@ -111,9 +114,11 @@ public function indexForApprovers(
         return inertia("OvertimeRequest/ApproversIndex", [
             "requests" => OvertimeRequestResource::collection($overtimeRequests),
             "users" => SimpleUserResource::collection($users),
+            "months" => Month::cases(),
             "filters" => [
                 "status" => $status,
                 "user" => (int)$user,
+                "month" => $month,
             ],
         ]);
     }
diff --git a/resources/js/Pages/Calendar.vue b/resources/js/Pages/Calendar.vue
index f1d94c26..ec741a2d 100644
--- a/resources/js/Pages/Calendar.vue
+++ b/resources/js/Pages/Calendar.vue
@@ -104,12 +104,6 @@ function linkVacationRequest(user){
         >
           Pobierz plik Excel
         </a>
-        <a
-          :href="`/overtime/timesheet/${selectedMonth.value}`"
-          class="block py-3 px-4 ml-3 text-sm font-medium leading-4 text-center text-white bg-blumilk-600 hover:bg-blumilk-700 rounded-md border border-transparent focus:outline-none focus:ring-2 focus:ring-blumilk-500 focus:ring-offset-2 shadow-sm"
-        >
-          Pobierz nadgodziny
-        </a>
       </div>
     </div>
     <div class="overflow-x-auto">
diff --git a/resources/js/Pages/OvertimeRequest/ApproversIndex.vue b/resources/js/Pages/OvertimeRequest/ApproversIndex.vue
index 1eeb4838..2649152d 100644
--- a/resources/js/Pages/OvertimeRequest/ApproversIndex.vue
+++ b/resources/js/Pages/OvertimeRequest/ApproversIndex.vue
@@ -8,8 +8,10 @@ import { Listbox, ListboxButton, ListboxLabel, ListboxOption, ListboxOptions } f
 import Pagination from '@/Shared/Pagination.vue'
 import EmptyState from '@/Shared/Feedbacks/EmptyState.vue'
 import SettlementType from '@/Shared/SettlementType.vue'
+import { useMonthInfo } from '@/Composables/monthInfo.js'
 
 const props = defineProps({
+  auth: Object,
   requests: Object,
   users: Object,
   filters: Object,
@@ -42,15 +44,19 @@ const statuses = [
   },
 ]
 
+const months = useMonthInfo().getMonths()
+
 const form = reactive({
   user: props.users.data.find(user => user.id === props.filters.user) ?? null,
   status: statuses.find(status => status.value === props.filters.status) ?? statuses[0],
+  month: months.find(month => month.value === props.filters.month),
 })
 
 watch(form, debounce(() => {
   Inertia.get('/overtime/requests', {
     user: form.user?.id,
     status: form.status.value,
+    month: form.month.value,
   }, {
     preserveState: true,
     replace: true,
@@ -67,6 +73,17 @@ watch(form, debounce(() => {
           Lista wniosków
         </h2>
       </div>
+      <div
+        v-if="auth.can.manageRequestsAsAdministrativeApprover"
+        class="flex"
+      >
+        <a
+          :href="`/overtime/timesheet/${filters.month}`"
+          class="block py-3 px-4 ml-3 text-sm font-medium leading-4 text-center text-white bg-blumilk-600 hover:bg-blumilk-700 rounded-md border border-transparent focus:outline-none focus:ring-2 focus:ring-blumilk-500 focus:ring-offset-2 shadow-sm"
+        >
+          Pobierz plik Excel
+        </a>
+      </div>
     </div>
     <div class="border-t border-gray-200">
       <div class="grid grid-cols-1 gap-2 p-4 md:grid-cols-3 md:gap-4">
@@ -199,6 +216,57 @@ watch(form, debounce(() => {
                   >
                     {{ status.name }}
 
+                    <span
+                      v-if="selected"
+                      :class="['text-blumilk-600 absolute inset-y-0 right-0 flex items-center pr-4']"
+                    >
+                      <CheckIcon class="w-5 h-5" />
+                    </span>
+                  </li>
+                </ListboxOption>
+              </ListboxOptions>
+            </transition>
+          </div>
+        </Listbox>
+        <Listbox
+          v-model="form.month"
+          as="div"
+        >
+          <ListboxLabel class="block mb-2 text-sm font-medium text-gray-700">
+            Miesiąc
+          </ListboxLabel>
+          <div class="relative mt-1 sm:mt-0">
+            <ListboxButton
+              class="relative py-2 pr-10 pl-3 w-full max-w-lg h-10 text-left bg-white rounded-md border border-gray-300 focus:border-blumilk-500 focus:outline-none focus:ring-1 focus:ring-blumilk-500 shadow-sm cursor-default sm:text-sm"
+            >
+              <span class="flex items-center">
+                {{ form.month.name }}
+              </span>
+              <span class="flex absolute inset-y-0 right-0 items-center pr-2 pointer-events-none">
+                <ChevronUpDownIcon class="w-5 h-5 text-gray-400" />
+              </span>
+            </ListboxButton>
+
+            <transition
+              leave-active-class="transition ease-in duration-100"
+              leave-from-class="opacity-100"
+              leave-to-class="opacity-0"
+            >
+              <ListboxOptions
+                class="overflow-auto absolute z-10 py-1 mt-1 w-full max-w-lg max-h-60 text-base bg-white rounded-md focus:outline-none ring-1 ring-black ring-opacity-5 shadow-lg sm:text-sm"
+              >
+                <ListboxOption
+                  v-for="month in months"
+                  :key="month"
+                  v-slot="{ active, selected }"
+                  as="template"
+                  :value="month"
+                >
+                  <li
+                    :class="[active ? 'bg-gray-100' : 'text-gray-900', 'cursor-default truncate select-none relative py-2 pl-3 pr-9']"
+                  >
+                    {{ month.name }}
+
                     <span
                       v-if="selected"
                       :class="['text-blumilk-600 absolute inset-y-0 right-0 flex items-center pr-4']"

From def12b8bbd9b8a21f3dcc1b1dbce5b6cbe5ef79d Mon Sep 17 00:00:00 2001
From: Kamil <kamil.piech.97@gmail.com>
Date: Thu, 4 Jul 2024 08:29:23 +0200
Subject: [PATCH 12/14] #444 - csf

---
 routes/web.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/routes/web.php b/routes/web.php
index e7acee45..0ac411e2 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -19,7 +19,6 @@
 use Toby\Http\Controllers\LogoutController;
 use Toby\Http\Controllers\MonthlyUsageController;
 use Toby\Http\Controllers\OvertimeRequestController;
-use Toby\Http\Controllers\OvertimeTimesheetController;
 use Toby\Http\Controllers\PermissionController;
 use Toby\Http\Controllers\ResumeController;
 use Toby\Http\Controllers\SelectYearPeriodController;

From df301a8d00c57f45330ac256f275704e7bd00017 Mon Sep 17 00:00:00 2001
From: Kamil <kamil.piech.97@gmail.com>
Date: Thu, 4 Jul 2024 10:40:42 +0200
Subject: [PATCH 13/14] #444 - fix: fixed button and route for generating
 overtime reports

---
 resources/js/Pages/Calendar.vue | 9 ++++++++-
 routes/web.php                  | 3 +++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/resources/js/Pages/Calendar.vue b/resources/js/Pages/Calendar.vue
index ec741a2d..1c53ff43 100644
--- a/resources/js/Pages/Calendar.vue
+++ b/resources/js/Pages/Calendar.vue
@@ -95,15 +95,22 @@ function linkVacationRequest(user){
         </div>
       </div>
       <div
-        v-if="auth.can.manageRequestsAsAdministrativeApprover"
         class="flex"
       >
         <a
+          v-if="auth.can.manageRequestsAsAdministrativeApprover"
           :href="`/vacation/timesheet/${selectedMonth.value}`"
           class="block py-3 px-4 ml-3 text-sm font-medium leading-4 text-center text-white bg-blumilk-600 hover:bg-blumilk-700 rounded-md border border-transparent focus:outline-none focus:ring-2 focus:ring-blumilk-500 focus:ring-offset-2 shadow-sm"
         >
           Pobierz plik Excel
         </a>
+        <a
+          v-if="auth.can.manageOvertimeAsAdministrativeApprover"
+          :href="`/overtime/timesheet/${selectedMonth.value}`"
+          class="block py-3 px-4 ml-3 text-sm font-medium leading-4 text-center text-white bg-blumilk-600 hover:bg-blumilk-700 rounded-md border border-transparent focus:outline-none focus:ring-2 focus:ring-blumilk-500 focus:ring-offset-2 shadow-sm"
+        >
+          Pobierz nadgodziny
+        </a>
       </div>
     </div>
     <div class="overflow-x-auto">
diff --git a/routes/web.php b/routes/web.php
index 0ac411e2..e00af083 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -19,6 +19,7 @@
 use Toby\Http\Controllers\LogoutController;
 use Toby\Http\Controllers\MonthlyUsageController;
 use Toby\Http\Controllers\OvertimeRequestController;
+use Toby\Http\Controllers\OvertimeTimesheetController;
 use Toby\Http\Controllers\PermissionController;
 use Toby\Http\Controllers\ResumeController;
 use Toby\Http\Controllers\SelectYearPeriodController;
@@ -198,6 +199,8 @@
         Route::post("/requests/{overtimeRequest}/accept-as-technical", [OvertimeRequestController::class, "acceptAsTechnical"])
             ->whereNumber("overtimeRequest")
             ->name("requests.accept-as-technical");
+        Route::get("/timesheet/{month}", OvertimeTimesheetController::class)
+            ->name("overtime-timesheet");
     });
 });
 

From 0a033a3706c4af28d9900f05d68b0dde27a8fffb Mon Sep 17 00:00:00 2001
From: Kamil <kamil.piech.97@gmail.com>
Date: Thu, 4 Jul 2024 12:44:00 +0200
Subject: [PATCH 14/14] #444 - fix: fixed 'anuluj' button link

---
 resources/js/Pages/OvertimeRequest/Create.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/Pages/OvertimeRequest/Create.vue b/resources/js/Pages/OvertimeRequest/Create.vue
index cfdc66d0..045a24c7 100644
--- a/resources/js/Pages/OvertimeRequest/Create.vue
+++ b/resources/js/Pages/OvertimeRequest/Create.vue
@@ -294,7 +294,7 @@ async function refreshEstimatedHours(from, to) {
           <div class="flex justify-end py-3">
             <div class="space-x-3">
               <InertiaLink
-                href="/vacation/requests"
+                href="/overtime/requests"
                 class="py-2 px-4 text-sm font-medium text-gray-700 bg-white hover:bg-gray-50 rounded-md border border-gray-300 focus:outline-none focus:ring-2 focus:ring-blumilk-500 focus:ring-offset-2 shadow-sm"
               >
                 Anuluj