This commit is contained in:
Adrian Hopek
2022-02-08 15:04:32 +01:00
parent 26a6d81dc2
commit 09b95602da
8 changed files with 234 additions and 143 deletions

View File

@@ -7,7 +7,6 @@ namespace Toby\Infrastructure\Http\Controllers;
use Carbon\CarbonImmutable;
use Carbon\CarbonInterface;
use Carbon\CarbonPeriod;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Http\Request;
use Inertia\Response;
use Toby\Domain\Enums\VacationRequestState;
@@ -29,7 +28,7 @@ class VacationCalendarController extends Controller
->with([
"vacations" => fn($query) => $query
->whereBetween("date", [$period->start, $period->end])
->whereRelation("vacationRequest", "state", VacationRequestState::APPROVED->value)
->whereRelation("vacationRequest", "state", VacationRequestState::APPROVED->value),
])
->orderBy("last_name")
->orderBy("first_name")
@@ -54,7 +53,7 @@ class VacationCalendarController extends Controller
foreach ($users as $user) {
$userVacations[] = [
"user" => new UserResource($user),
"vacations" => $user->vacations->map(fn (Vacation $vacation) => $vacation->date->toDateString()),
"vacations" => $user->vacations->map(fn(Vacation $vacation) => $vacation->date->toDateString()),
];
}
@@ -67,7 +66,7 @@ class VacationCalendarController extends Controller
protected function monthNameToNumber(?string $name): int
{
return match($name) {
return match ($name) {
default => CarbonInterface::JANUARY,
"february" => CarbonInterface::FEBRUARY,
"march" => CarbonInterface::MARCH,

View File

@@ -80,7 +80,7 @@ class VacationRequestController extends Controller
$days = $vacationDaysCalculator->calculateDays(
$vacationRequest->yearPeriod,
$vacationRequest->from,
$vacationRequest->to
$vacationRequest->to,
);
foreach ($days as $day) {