#120 - remote work (#127)

* #120 - wip

* #120 - add icon to home office

* #120 - wip

* #120 - wip

* #120 - wip

* #120 - wip

* #120 - wip

* #120 - ui fixes

* #120 - fix

* #120 - fix

* #120 - fix

* #120 - fix

* #120 - translation fix

* #120 - fix

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>

app/Infrastructure/Http/Controllers/DashboardController.php

@@ -7,14 +7,16 @@ namespace Toby\Infrastructure\Http\Controllers;
 use Illuminate\Http\Request;
 use Illuminate\Support\Carbon;
 use Inertia\Response;
+use Toby\Domain\Enums\VacationType;
 use Toby\Domain\UserVacationStatsRetriever;
 use Toby\Domain\VacationRequestStatesRetriever;
+use Toby\Domain\VacationTypeConfigRetriever;
 use Toby\Eloquent\Helpers\YearPeriodRetriever;
 use Toby\Eloquent\Models\Vacation;
 use Toby\Eloquent\Models\VacationRequest;
-use Toby\Infrastructure\Http\Resources\AbsenceResource;
 use Toby\Infrastructure\Http\Resources\HolidayResource;
 use Toby\Infrastructure\Http\Resources\VacationRequestResource;
+use Toby\Infrastructure\Http\Resources\VacationResource;
 
 class DashboardController extends Controller
 {
@@ -22,6 +24,7 @@ class DashboardController extends Controller
         Request $request,
         YearPeriodRetriever $yearPeriodRetriever,
         UserVacationStatsRetriever $vacationStatsRetriever,
+        VacationTypeConfigRetriever $configRetriever,
     ): Response {
         $user = $request->user();
         $now = Carbon::now();
@@ -31,6 +34,14 @@ class DashboardController extends Controller
             ->with(["user", "vacationRequest"])
             ->whereDate("date", $now)
             ->approved()
+            ->whereTypes(VacationType::all()->filter(fn(VacationType $type) => $configRetriever->isVacation($type)))
+            ->get();
+
+        $remoteDays = Vacation::query()
+            ->with(["user", "vacationRequest"])
+            ->whereDate("date", $now)
+            ->approved()
+            ->whereTypes(VacationType::all()->filter(fn(VacationType $type) => !$configRetriever->isVacation($type)))
             ->get();
 
         if ($user->can("listAll", VacationRequest::class)) {
@@ -57,11 +68,13 @@ class DashboardController extends Controller
         $limit = $vacationStatsRetriever->getVacationDaysLimit($user, $yearPeriod);
         $used = $vacationStatsRetriever->getUsedVacationDays($user, $yearPeriod);
         $pending = $vacationStatsRetriever->getPendingVacationDays($user, $yearPeriod);
+        $homeOffice = $vacationStatsRetriever->getHomeOfficeDays($user, $yearPeriod);
         $other = $vacationStatsRetriever->getOtherApprovedVacationDays($user, $yearPeriod);
         $remaining = $limit - $used - $pending;
 
         return inertia("Dashboard", [
-            "absences" => AbsenceResource::collection($absences),
+            "absences" => VacationResource::collection($absences),
+            "remoteDays" => VacationResource::collection($remoteDays),
             "vacationRequests" => VacationRequestResource::collection($vacationRequests),
             "holidays" => HolidayResource::collection($holidays),
             "stats" => [
@@ -69,6 +82,7 @@ class DashboardController extends Controller
                 "remaining" => $remaining,
                 "used" => $used,
                 "pending" => $pending,
+                "homeOffice" => $homeOffice,
                 "other" => $other,
             ],
             "can" => [

app/Infrastructure/Http/Controllers/TimesheetController.php

@@ -35,7 +35,8 @@ class TimesheetController extends Controller
 
         $types = VacationType::all()
             ->filter(
-                fn(VacationType $type) => $configRetriever->isAvailableFor($type, EmploymentForm::EmploymentContract),
+                fn(VacationType $type) => $configRetriever->isAvailableFor($type, EmploymentForm::EmploymentContract)
+                    && $configRetriever->isVacation($type),
             );
 
         $filename = "{$carbonMonth->translatedFormat("F Y")}.xlsx";

app/Infrastructure/Http/Controllers/VacationLimitController.php

@@ -11,7 +11,7 @@ use Toby\Eloquent\Helpers\YearPeriodRetriever;
 use Toby\Eloquent\Models\VacationLimit;
 use Toby\Eloquent\Models\YearPeriod;
 use Toby\Infrastructure\Http\Requests\VacationLimitRequest;
-use Toby\Infrastructure\Http\Resources\SimpleUserResource;
+use Toby\Infrastructure\Http\Resources\UserResource;
 
 class VacationLimitController extends Controller
 {
@@ -32,7 +32,7 @@ class VacationLimitController extends Controller
 
         $limitsResource = $limits->map(fn(VacationLimit $limit) => [
             "id" => $limit->id,
-            "user" => new SimpleUserResource($limit->user),
+            "user" => new UserResource($limit->user),
             "hasVacation" => $limit->hasVacation(),
             "days" => $limit->days,
             "remainingLastYear" => $previousYearPeriod

app/Infrastructure/Http/Controllers/VacationRequestController.php

@@ -12,6 +12,7 @@ use Illuminate\Http\Request;
 use Illuminate\Http\Response as LaravelResponse;
 use Illuminate\Validation\ValidationException;
 use Inertia\Response;
+use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
 use Toby\Domain\Actions\VacationRequest\AcceptAsAdministrativeAction;
 use Toby\Domain\Actions\VacationRequest\AcceptAsTechnicalAction;
 use Toby\Domain\Actions\VacationRequest\CancelAction;
@@ -23,6 +24,7 @@ use Toby\Domain\States\VacationRequest\AcceptedByTechnical;
 use Toby\Domain\States\VacationRequest\Cancelled;
 use Toby\Domain\States\VacationRequest\Rejected;
 use Toby\Domain\VacationRequestStatesRetriever;
+use Toby\Domain\VacationTypeConfigRetriever;
 use Toby\Eloquent\Helpers\YearPeriodRetriever;
 use Toby\Eloquent\Models\User;
 use Toby\Eloquent\Models\VacationRequest;
@@ -148,8 +150,14 @@ class VacationRequestController extends Controller
     /**
      * @throws AuthorizationException
      */
-    public function download(VacationRequest $vacationRequest): LaravelResponse
-    {
+    public function download(
+        VacationRequest $vacationRequest,
+        VacationTypeConfigRetriever $configRetriever,
+    ): LaravelResponse {
+        if (!$configRetriever->isVacation($vacationRequest->type)) {
+            return abort(SymfonyResponse::HTTP_NOT_FOUND);
+        }
+
         $this->authorize("show", $vacationRequest);
 
         $pdf = PDF::loadView("pdf.vacation-request", [

app/Infrastructure/Http/Resources/AbsenceResource.php

@@ -1,21 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Toby\Infrastructure\Http\Resources;
-
-use Illuminate\Http\Resources\Json\JsonResource;
-
-class AbsenceResource extends JsonResource
-{
-    public static $wrap = null;
-
-    public function toArray($request): array
-    {
-        return [
-            "id" => $this->id,
-            "user" => new SimpleUserResource($this->user),
-            "date" => $this->date->toDisplayString(),
-        ];
-    }
-}

app/Infrastructure/Http/Resources/VacationRequestResource.php

@@ -5,10 +5,19 @@ declare(strict_types=1);
 namespace Toby\Infrastructure\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
+use Toby\Domain\VacationTypeConfigRetriever;
 
 class VacationRequestResource extends JsonResource
 {
     public static $wrap = null;
+    protected VacationTypeConfigRetriever $configRetriever;
+
+    public function __construct($resource)
+    {
+        parent::__construct($resource);
+
+        $this->configRetriever = app(VacationTypeConfigRetriever::class);
+    }
 
     public function toArray($request): array
     {
@@ -17,6 +26,7 @@ class VacationRequestResource extends JsonResource
             "name" => $this->name,
             "user" => new SimpleUserResource($this->user),
             "type" => $this->type,
+            "isVacation" => $this->configRetriever->isVacation($this->type),
             "state" => $this->state,
             "from" => $this->from->toDisplayString(),
             "to" => $this->to->toDisplayString(),

app/Infrastructure/Http/Resources/VacationResource.php

@@ -14,6 +14,7 @@ class VacationResource extends JsonResource
     {
         return [
             "id" => $this->id,
+            "user" => new SimpleUserResource($this->user),
             "displayDate" => $this->date->toDisplayString(),
             "date" => $this->date->toDateString(),
         ];