diff --git a/app/Domain/VacationDaysCalculator.php b/app/Domain/VacationDaysCalculator.php index fcbc9e8..0e41a4a 100644 --- a/app/Domain/VacationDaysCalculator.php +++ b/app/Domain/VacationDaysCalculator.php @@ -16,7 +16,7 @@ class VacationDaysCalculator $period = CarbonPeriod::create($from, $to); $holidays = $yearPeriod->holidays()->pluck("date"); - $validDays = collect(); + $validDays = new Collection(); foreach ($period as $day) { if ($this->passes($day, $holidays)) { diff --git a/database/factories/VacationFactory.php b/database/factories/VacationFactory.php index e28cc70..baa180d 100644 --- a/database/factories/VacationFactory.php +++ b/database/factories/VacationFactory.php @@ -1,5 +1,7 @@ id(); $table->foreignIdFor(User::class)->constrained()->cascadeOnDelete(); $table->foreignIdFor(VacationRequest::class)->constrained()->cascadeOnDelete(); diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index 439a50f..0788740 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -80,17 +80,17 @@ class DatabaseSeeder extends Seeder ->sequence(fn() => [ "year_period_id" => $yearPeriods->random()->id, ]) - ->afterCreating(function (VacationRequest $vacationRequest) { + ->afterCreating(function (VacationRequest $vacationRequest): void { $days = app(VacationDaysCalculator::class)->calculateDays( $vacationRequest->yearPeriod, $vacationRequest->from, - $vacationRequest->to + $vacationRequest->to, ); foreach ($days as $day) { $vacationRequest->vacations()->create([ "date" => $day, - "user_id" => $vacationRequest->user->id + "user_id" => $vacationRequest->user->id, ]); } }) diff --git a/resources/js/Pages/Holidays/Index.vue b/resources/js/Pages/Holidays/Index.vue index 101da1b..bd71b55 100644 --- a/resources/js/Pages/Holidays/Index.vue +++ b/resources/js/Pages/Holidays/Index.vue @@ -144,7 +144,7 @@ import { DotsVerticalIcon, PencilIcon, TrashIcon } from '@heroicons/vue/solid' import { Menu, MenuButton, MenuItem, MenuItems } from '@headlessui/vue' export default { - name: 'HolidayINdex', + name: 'HolidayIndex', components: { DotsVerticalIcon, PencilIcon, diff --git a/resources/js/Pages/VacationRequest/Show.vue b/resources/js/Pages/VacationRequest/Show.vue index 8c82bcb..d849a74 100644 --- a/resources/js/Pages/VacationRequest/Show.vue +++ b/resources/js/Pages/VacationRequest/Show.vue @@ -54,9 +54,18 @@
Komentarz
-
+
{{ request.comment }}
+
+ - +
@@ -183,37 +192,37 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-
-

+

+
{{ status.name }} -

-
-
- +
+
+ Jan Kowalski +
+
+ + +