From 11663576894ce9cdfd139f643f8e494221a2c7d8 Mon Sep 17 00:00:00 2001
From: Adrian Hopek <adrian.hopek@blumilk.pl>
Date: Thu, 31 Mar 2022 13:20:10 +0200
Subject: [PATCH 01/13] wip

---
 package-lock.json           |  14 +++++
 package.json                |   1 +
 resources/js/Pages/Test.vue | 105 ++++++++++++++++++++++++++++++++++++
 routes/web.php              |   3 ++
 4 files changed, 123 insertions(+)
 create mode 100644 resources/js/Pages/Test.vue

diff --git a/package-lock.json b/package-lock.json
index 6e6fd67..d06e55e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,6 +22,7 @@
                 "flatpickr": "^4.6.11",
                 "laravel-mix": "^6.0.43",
                 "lodash": "^4.17.21",
+                "luxon": "^2.3.1",
                 "postcss": "^8.4.12",
                 "tailwindcss": "^3.0.23",
                 "vue": "^3.2.31",
@@ -6115,6 +6116,14 @@
                 "node": ">=10"
             }
         },
+        "node_modules/luxon": {
+            "version": "2.3.1",
+            "resolved": "https://registry.npmjs.org/luxon/-/luxon-2.3.1.tgz",
+            "integrity": "sha512-I8vnjOmhXsMSlNMZlMkSOvgrxKJl0uOsEzdGgGNZuZPaS9KlefpE9KV95QFftlJSC+1UyCC9/I69R02cz/zcCA==",
+            "engines": {
+                "node": ">=12"
+            }
+        },
         "node_modules/magic-string": {
             "version": "0.25.7",
             "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
@@ -14182,6 +14191,11 @@
                 "yallist": "^4.0.0"
             }
         },
+        "luxon": {
+            "version": "2.3.1",
+            "resolved": "https://registry.npmjs.org/luxon/-/luxon-2.3.1.tgz",
+            "integrity": "sha512-I8vnjOmhXsMSlNMZlMkSOvgrxKJl0uOsEzdGgGNZuZPaS9KlefpE9KV95QFftlJSC+1UyCC9/I69R02cz/zcCA=="
+        },
         "magic-string": {
             "version": "0.25.7",
             "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
diff --git a/package.json b/package.json
index decb2c6..8e5320e 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,7 @@
         "flatpickr": "^4.6.11",
         "laravel-mix": "^6.0.43",
         "lodash": "^4.17.21",
+        "luxon": "^2.3.1",
         "postcss": "^8.4.12",
         "tailwindcss": "^3.0.23",
         "vue": "^3.2.31",
diff --git a/resources/js/Pages/Test.vue b/resources/js/Pages/Test.vue
new file mode 100644
index 0000000..4ba6969
--- /dev/null
+++ b/resources/js/Pages/Test.vue
@@ -0,0 +1,105 @@
+<template>
+  <div class="bg-white shadow-md">
+    <div class="p-4 sm:px-6">
+      <div>
+        <h2 class="text-lg font-medium leading-6 text-gray-900">
+          Podsumowanie roczne
+        </h2>
+      </div>
+    </div>
+    <div class="grid grid-cols-1 gap-8 py-8 px-4 mx-auto max-w-3xl border-t border-gray-200 sm:grid-cols-2 sm:px-6 xl:grid-cols-3 xl:px-8 xl:max-w-none 2xl:grid-cols-4">
+      <section
+        v-for="month in months"
+        :key="month.name"
+        class="text-center"
+      >
+        <h2 class="font-semibold text-gray-900 capitalize">
+          {{ month.name }}
+        </h2>
+        <div class="grid grid-cols-7 mt-6 text-xs font-semibold leading-6 text-gray-500">
+          <div>Pn</div>
+          <div>Wt</div>
+          <div>Śr</div>
+          <div>Cz</div>
+          <div>Pt</div>
+          <div>Sb</div>
+          <div>Nd</div>
+        </div>
+        <div class="grid isolate grid-cols-7 gap-px mt-2 text-sm bg-gray-200 ring-1 ring-gray-200 shadow">
+          <Component
+            :is="day.isCurrentMonth ? 'button' : 'div'"
+            v-for="(day, dayIdx) in month.days"
+            :key="dayIdx"
+            :class="[day.isCurrentMonth ? 'bg-white hover:brightness-90' : 'bg-gray-50 text-gray-400', day.isCurrentMonth && day.isToday && 'bg-blumilk-700', 'py-1.5 focus:z-10 font-medium']"
+          >
+            <div :class="[day.isCurrentMonth && (day.isWeekend || day.isHoliday) && 'text-red-600 font-bold', 'mx-auto flex h-7 w-7 p-4 items-center justify-center']">
+              <time :datetime="day.date">
+                {{ day.date.split('-').pop().replace(/^0/, '') }}
+              </time>
+            </div>
+          </Component>
+        </div>
+      </section>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { DateTime } from 'luxon'
+
+const vacations = [
+  '2022-03-21',
+  '2022-03-22',
+  '2022-03-23',
+  '2022-03-24',
+  '2022-03-25',
+  '2022-03-28',
+  '2022-03-29',
+  '2022-03-30',
+  '2022-03-31',
+  '2022-04-01',
+]
+
+const holidays = [
+  '2022-04-17',
+  '2022-04-18',
+  '2022-05-01',
+  '2022-05-03',
+  '2022-01-01',
+  '2022-01-06',
+  '2022-06-16',
+  '2022-08-15',
+  '2022-11-01',
+  '2022-11-11',
+  '2022-12-25',
+  '2022-12-26',
+]
+
+const months = []
+
+for (let i = 1; i < 13; i++) {
+  const currentMonth = DateTime.fromObject({ month: i }).startOf('month')
+  
+  const start = currentMonth.startOf('week')
+  const end = currentMonth.endOf('month').endOf('week')
+
+  const temp = {
+    name: currentMonth.monthLong,
+    days: [],
+  }
+
+  for (let day = start; day < end; day = day.plus({ day: 1 })) {
+    temp.days.push({
+      date: day.toFormat('yyyy-MM-dd'),
+      isCurrentMonth: currentMonth.hasSame(day, 'month'),
+      isToday: DateTime.now().hasSame(day, 'day'),
+      isWeekend: day.weekday === 6 || day.weekday === 7,
+      isVacation: vacations.includes(day.toFormat('yyyy-MM-dd')),
+      isHoliday: holidays.includes(day.toFormat('yyyy-MM-dd')),
+    })
+  }
+
+  months.push(temp)
+}
+
+</script>
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 7eedd7a..778b90c 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -64,6 +64,9 @@ Route::middleware("auth")->group(function (): void {
         Route::get("/monthly-usage", MonthlyUsageController::class)
             ->name("vacation.monthly-usage");
     });
+
+    Route::get("/test", fn() => inertia("Test"));
+
 });
 
 Route::middleware("guest")->group(function (): void {
-- 
2.52.0


From 74dfd9fbf31927bbb252acce0ac205b3db12ef08 Mon Sep 17 00:00:00 2001
From: Adrian Hopek <adrian.hopek@blumilk.pl>
Date: Wed, 6 Apr 2022 08:14:37 +0200
Subject: [PATCH 02/13] wip

---
 app/Eloquent/Models/Vacation.php             |   8 ++
 resources/js/Composables/vacationTypeInfo.js |  36 ++++++
 resources/js/Composables/yearPeriodInfo.js   |   2 +
 resources/js/Pages/Test.vue                  | 111 +++++++++++--------
 resources/js/Shared/VacationBar.vue          |   2 +-
 routes/web.php                               |  35 +++++-
 6 files changed, 146 insertions(+), 48 deletions(-)

diff --git a/app/Eloquent/Models/Vacation.php b/app/Eloquent/Models/Vacation.php
index 65ac662..6313d07 100644
--- a/app/Eloquent/Models/Vacation.php
+++ b/app/Eloquent/Models/Vacation.php
@@ -50,4 +50,12 @@ class Vacation extends Model
             fn(Builder $query) => $query->states(VacationRequestStatesRetriever::successStates()),
         );
     }
+
+    public function scopePending(Builder $query): Builder
+    {
+        return $query->whereRelation(
+            "vacationRequest",
+            fn(Builder $query) => $query->states(VacationRequestStatesRetriever::pendingStates()),
+        );
+    }
 }
diff --git a/resources/js/Composables/vacationTypeInfo.js b/resources/js/Composables/vacationTypeInfo.js
index 6594ab7..c19730e 100644
--- a/resources/js/Composables/vacationTypeInfo.js
+++ b/resources/js/Composables/vacationTypeInfo.js
@@ -14,54 +14,90 @@ const types = [
     value: 'vacation',
     icon: WhiteBalanceSunnyIcon,
     color: 'text-amber-500',
+    border: {
+      approved: 'border-amber-500',
+      pending: 'border-amber-300',
+    },
   },
   {
     text: 'Urlop na żądanie',
     value: 'vacation_on_request',
     icon: CommentAlertIcon,
     color: 'text-slate-500',
+    border: {
+      approved: 'border-slate-500',
+      pending: 'border-slate-300',
+    },
   },
   {
     text: 'Urlop okolicznościowy',
     value: 'special_vacation',
     icon: StarShootingIcon,
     color: 'text-orange-500',
+    border: {
+      approved: 'border-orange-500',
+      pending: 'border-orange-300',
+    },
   },
   {
     text: 'Opieka nad dzieckiem art 188 kp',
     value: 'childcare_vacation',
     icon: BabyCarriageIcon,
     color: 'text-purple-500',
+    border: {
+      approved: 'border-purple-500',
+      pending: 'border-purple-300',
+    },
   },
   {
     text: 'Urlop szkoleniowy',
     value: 'training_vacation',
     icon: HumanMaleBoardIcon,
     color: 'text-blumilk-500',
+    border: {
+      approved: 'border-blumilk-500',
+      pending: 'border-blumilk-300',
+    },
   },
   {
     text: 'Urlop bezpłatny',
     value: 'unpaid_vacation',
     icon: CurrencyUsdOffIcon,
     color: 'text-emerald-500',
+    border: {
+      approved: 'border-emerald-500',
+      pending: 'border-emerald-300',
+    },
   },
   {
     text: 'Wolontariat',
     value: 'volunteering_vacation',
     icon: HandHeartOutlineIcon,
     color: 'text-pink-500',
+    border: {
+      approved: 'border-pink-500',
+      pending: 'border-pink-300',
+    },
   },
   {
     text: 'Odbiór za święto',
     value: 'time_in_lieu',
     icon: CalendarCheckIcon,
     color: 'text-stone-500',
+    border: {
+      approved: 'border-stone-500',
+      pending: 'border-stone-300',
+    },
   },
   {
     text: 'Zwolnienie lekarskie',
     value: 'sick_vacation',
     icon: MedicalBagIcon,
     color: 'text-rose-500',
+    border: {
+      approved: 'border-rose-500',
+      pending: 'border-rose-300',
+    },
   },
 ]
 
diff --git a/resources/js/Composables/yearPeriodInfo.js b/resources/js/Composables/yearPeriodInfo.js
index b62eb05..ede213c 100644
--- a/resources/js/Composables/yearPeriodInfo.js
+++ b/resources/js/Composables/yearPeriodInfo.js
@@ -4,9 +4,11 @@ import { usePage } from '@inertiajs/inertia-vue3'
 export default function useCurrentYearPeriodInfo() {
   const minDate = computed(() => new Date(usePage().props.value.years.selected.year, 0, 1))
   const maxDate = computed(() => new Date(usePage().props.value.years.selected.year, 11, 31))
+  const year = computed(() => usePage().props.value.years.selected.year)
 
   return {
     minDate,
     maxDate,
+    year,
   }
 }
diff --git a/resources/js/Pages/Test.vue b/resources/js/Pages/Test.vue
index 4ba6969..eb7c03d 100644
--- a/resources/js/Pages/Test.vue
+++ b/resources/js/Pages/Test.vue
@@ -1,11 +1,9 @@
 <template>
   <div class="bg-white shadow-md">
     <div class="p-4 sm:px-6">
-      <div>
-        <h2 class="text-lg font-medium leading-6 text-gray-900">
-          Podsumowanie roczne
-        </h2>
-      </div>
+      <h2 class="text-lg font-medium leading-6 text-gray-900">
+        Podsumowanie roczne
+      </h2>
     </div>
     <div class="grid grid-cols-1 gap-8 py-8 px-4 mx-auto max-w-3xl border-t border-gray-200 sm:grid-cols-2 sm:px-6 xl:grid-cols-3 xl:px-8 xl:max-w-none 2xl:grid-cols-4">
       <section
@@ -25,16 +23,16 @@
           <div>Sb</div>
           <div>Nd</div>
         </div>
-        <div class="grid isolate grid-cols-7 gap-px mt-2 text-sm bg-gray-200 ring-1 ring-gray-200 shadow">
+        <div class="grid isolate grid-cols-7 mt-2 text-sm ring-1 ring-gray-200 shadow">
           <Component
             :is="day.isCurrentMonth ? 'button' : 'div'"
             v-for="(day, dayIdx) in month.days"
             :key="dayIdx"
-            :class="[day.isCurrentMonth ? 'bg-white hover:brightness-90' : 'bg-gray-50 text-gray-400', day.isCurrentMonth && day.isToday && 'bg-blumilk-700', 'py-1.5 focus:z-10 font-medium']"
+            :class="[day.isCurrentMonth ? 'bg-white hover:bg-gray-100' : 'bg-gray-50 text-gray-400', day.isVacation && `${getVacationBorder(day.date)}`, day.isPendingVacation && `border-dashed mx-0.5 ${getPendingVacationBorder(day.date)}`, 'border-b-4 border-transparent py-1.5 focus:z-10 font-medium']"
           >
-            <div :class="[day.isCurrentMonth && (day.isWeekend || day.isHoliday) && 'text-red-600 font-bold', 'mx-auto flex h-7 w-7 p-4 items-center justify-center']">
-              <time :datetime="day.date">
-                {{ day.date.split('-').pop().replace(/^0/, '') }}
+            <div :class="[day.isCurrentMonth && (day.isWeekend || day.isHoliday) && 'text-red-600 font-bold', day.isToday && 'bg-blumilk-500 font-semibold text-white rounded-full', 'mx-auto flex h-7 w-7 p-4 items-center justify-center']">
+              <time :datetime="day.date.toISODate()">
+                {{ day.date.day }}
               </time>
             </div>
           </Component>
@@ -46,60 +44,81 @@
 
 <script setup>
 import { DateTime } from 'luxon'
+import useVacationTypeInfo from '@/Composables/vacationTypeInfo'
+import useCurrentYearPeriodInfo from '@/Composables/yearPeriodInfo'
 
-const vacations = [
-  '2022-03-21',
-  '2022-03-22',
-  '2022-03-23',
-  '2022-03-24',
-  '2022-03-25',
-  '2022-03-28',
-  '2022-03-29',
-  '2022-03-30',
-  '2022-03-31',
-  '2022-04-01',
-]
+const props = defineProps({
+  holidays: Object,
+  vacations: Object,
+  pendingVacations: Object,
+})
 
-const holidays = [
-  '2022-04-17',
-  '2022-04-18',
-  '2022-05-01',
-  '2022-05-03',
-  '2022-01-01',
-  '2022-01-06',
-  '2022-06-16',
-  '2022-08-15',
-  '2022-11-01',
-  '2022-11-11',
-  '2022-12-25',
-  '2022-12-26',
-]
+const { findType } = useVacationTypeInfo()
+const { year } = useCurrentYearPeriodInfo()
 
 const months = []
 
 for (let i = 1; i < 13; i++) {
-  const currentMonth = DateTime.fromObject({ month: i }).startOf('month')
+  const currentMonth = DateTime.fromObject({ year: year.value, month: i }).startOf('month')
   
   const start = currentMonth.startOf('week')
   const end = currentMonth.endOf('month').endOf('week')
 
-  const temp = {
+  const month = {
     name: currentMonth.monthLong,
     days: [],
   }
 
   for (let day = start; day < end; day = day.plus({ day: 1 })) {
-    temp.days.push({
-      date: day.toFormat('yyyy-MM-dd'),
-      isCurrentMonth: currentMonth.hasSame(day, 'month'),
-      isToday: DateTime.now().hasSame(day, 'day'),
-      isWeekend: day.weekday === 6 || day.weekday === 7,
-      isVacation: vacations.includes(day.toFormat('yyyy-MM-dd')),
-      isHoliday: holidays.includes(day.toFormat('yyyy-MM-dd')),
+    const isCurrentMonth = isInCurrentMonth(day, currentMonth)
+
+    month.days.push({
+      date: day,
+      isCurrentMonth: isCurrentMonth,
+      isToday: isCurrentMonth && isToday(day),
+      isWeekend: isWeekend(day),
+      isVacation: isCurrentMonth && isVacation(day),
+      isPendingVacation: isCurrentMonth && isPendingVacation(day),
+      isHoliday: isHoliday(day),
     })
   }
 
-  months.push(temp)
+  months.push(month)
 }
 
+function isHoliday(date) {
+  return props.holidays[date.toISODate()] !== undefined
+}
+
+function isVacation(date) {
+  return props.vacations[date.toISODate()] !== undefined
+}
+
+function isPendingVacation(date) {
+  return props.pendingVacations[date.toISODate()] !== undefined
+}
+
+function isToday(date) {
+  return DateTime.now().hasSame(date, 'year') && DateTime.now().hasSame(date, 'day')
+}
+
+function isInCurrentMonth(date, currentMonth) {
+  return currentMonth.hasSame(date, 'month')
+}
+
+function isWeekend(date) {
+  return date.weekday === 6 || date.weekday === 7
+}
+
+function getVacationBorder(date) {
+  const type = findType(props.vacations[date.toISODate()])
+
+  return type.border.approved
+}
+
+function getPendingVacationBorder(date) {
+  const type = findType(props.pendingVacations[date.toISODate()])
+
+  return type.border.approved
+}
 </script>
\ No newline at end of file
diff --git a/resources/js/Shared/VacationBar.vue b/resources/js/Shared/VacationBar.vue
index 24a0386..dc96d3e 100644
--- a/resources/js/Shared/VacationBar.vue
+++ b/resources/js/Shared/VacationBar.vue
@@ -27,7 +27,7 @@
       </div>
     </div>
     <template #content>
-      <div class="py-2 px-4 text-gray-900 bg-white rounded-md shadow-md text-md flext">
+      <div class="py-2 px-4 text-gray-900 bg-white rounded-md shadow-md text-md">
         <div class="flex items-center font-normal">
           <i
             class="inline-block mr-3 w-5 h-3"
diff --git a/routes/web.php b/routes/web.php
index 778b90c..9292b82 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -2,7 +2,12 @@
 
 declare(strict_types=1);
 
+use Illuminate\Http\Request;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Route;
+use Toby\Eloquent\Helpers\YearPeriodRetriever;
+use Toby\Eloquent\Models\Holiday;
+use Toby\Eloquent\Models\Vacation;
 use Toby\Infrastructure\Http\Controllers\DashboardController;
 use Toby\Infrastructure\Http\Controllers\GoogleController;
 use Toby\Infrastructure\Http\Controllers\HolidayController;
@@ -65,8 +70,36 @@ Route::middleware("auth")->group(function (): void {
             ->name("vacation.monthly-usage");
     });
 
-    Route::get("/test", fn() => inertia("Test"));
+    Route::get("/test", function (Request $request, YearPeriodRetriever $yearPeriodRetriever) {
+        $yearPeriod = $yearPeriodRetriever->selected();
 
+        $startDate = Carbon::createFromDate($yearPeriod->year)->startOfYear()->startOfWeek();
+        $endDate = Carbon::createFromDate($yearPeriod->year)->endOfYear()->endOfWeek();
+
+        $holidays = $yearPeriod->holidays()
+            ->whereBetween("date", [$startDate, $endDate])
+            ->get();
+
+        $vacations = $request->user()
+            ->vacations()
+            ->with("vacationRequest")
+            ->whereBetween("date", [$startDate, $endDate])
+            ->approved()
+            ->get();
+        
+        $pendingVacations = $request->user()
+            ->vacations()
+            ->with("vacationRequest")
+            ->whereBetween("date", [$startDate, $endDate])
+            ->pending()
+            ->get();
+
+        return inertia("Test", [
+            "holidays" => $holidays->mapWithKeys(fn(Holiday $holiday) => [$holiday->date->toDateString() => $holiday->name]),
+            "vacations" => $vacations->mapWithKeys(fn(Vacation $vacation) => [$vacation->date->toDateString() => $vacation->vacationRequest->type]),
+            "pendingVacations" => $pendingVacations->mapWithKeys(fn(Vacation $vacation) => [$vacation->date->toDateString() => $vacation->vacationRequest->type]),
+        ]);
+    });
 });
 
 Route::middleware("guest")->group(function (): void {
-- 
2.52.0


From 84b1805015d25b0a35247aa4b69f919ec1b2a249 Mon Sep 17 00:00:00 2001
From: Adrian Hopek <adrian.hopek@blumilk.pl>
Date: Wed, 6 Apr 2022 10:01:22 +0200
Subject: [PATCH 03/13] wip

---
 .../Controllers/AnnualSummaryController.php   | 46 +++++++++++++
 .../js/Pages/{Test.vue => AnnualSummary.vue}  | 33 ++++++---
 resources/js/Shared/MainMenu.vue              |  8 +++
 routes/web.php                                | 68 +++++--------------
 4 files changed, 97 insertions(+), 58 deletions(-)
 create mode 100644 app/Infrastructure/Http/Controllers/AnnualSummaryController.php
 rename resources/js/Pages/{Test.vue => AnnualSummary.vue} (69%)

diff --git a/app/Infrastructure/Http/Controllers/AnnualSummaryController.php b/app/Infrastructure/Http/Controllers/AnnualSummaryController.php
new file mode 100644
index 0000000..bc2a2d7
--- /dev/null
+++ b/app/Infrastructure/Http/Controllers/AnnualSummaryController.php
@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Infrastructure\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Carbon;
+use Inertia\Response;
+use Toby\Eloquent\Helpers\YearPeriodRetriever;
+use Toby\Eloquent\Models\Holiday;
+use Toby\Eloquent\Models\Vacation;
+
+class AnnualSummaryController extends Controller
+{
+    public function __invoke(Request $request, YearPeriodRetriever $yearPeriodRetriever): Response {
+        $yearPeriod = $yearPeriodRetriever->selected();
+
+        $startDate = Carbon::createFromDate($yearPeriod->year)->startOfYear()->startOfWeek();
+        $endDate = Carbon::createFromDate($yearPeriod->year)->endOfYear()->endOfWeek();
+
+        $holidays = $yearPeriod->holidays()
+            ->whereBetween("date", [$startDate, $endDate])
+            ->get();
+
+        $vacations = $request->user()
+            ->vacations()
+            ->with("vacationRequest")
+            ->whereBetween("date", [$startDate, $endDate])
+            ->approved()
+            ->get();
+
+        $pendingVacations = $request->user()
+            ->vacations()
+            ->with("vacationRequest")
+            ->whereBetween("date", [$startDate, $endDate])
+            ->pending()
+            ->get();
+
+        return inertia("AnnualSummary", [
+            "holidays" => $holidays->mapWithKeys(fn(Holiday $holiday) => [$holiday->date->toDateString() => $holiday->name]),
+            "vacations" => $vacations->mapWithKeys(fn(Vacation $vacation) => [$vacation->date->toDateString() => $vacation->vacationRequest->type]),
+            "pendingVacations" => $pendingVacations->mapWithKeys(fn(Vacation $vacation) => [$vacation->date->toDateString() => $vacation->vacationRequest->type]),
+        ]);
+    }
+}
diff --git a/resources/js/Pages/Test.vue b/resources/js/Pages/AnnualSummary.vue
similarity index 69%
rename from resources/js/Pages/Test.vue
rename to resources/js/Pages/AnnualSummary.vue
index eb7c03d..028568a 100644
--- a/resources/js/Pages/Test.vue
+++ b/resources/js/Pages/AnnualSummary.vue
@@ -24,18 +24,35 @@
           <div>Nd</div>
         </div>
         <div class="grid isolate grid-cols-7 mt-2 text-sm ring-1 ring-gray-200 shadow">
-          <Component
-            :is="day.isCurrentMonth ? 'button' : 'div'"
+          <template
             v-for="(day, dayIdx) in month.days"
             :key="dayIdx"
-            :class="[day.isCurrentMonth ? 'bg-white hover:bg-gray-100' : 'bg-gray-50 text-gray-400', day.isVacation && `${getVacationBorder(day.date)}`, day.isPendingVacation && `border-dashed mx-0.5 ${getPendingVacationBorder(day.date)}`, 'border-b-4 border-transparent py-1.5 focus:z-10 font-medium']"
           >
-            <div :class="[day.isCurrentMonth && (day.isWeekend || day.isHoliday) && 'text-red-600 font-bold', day.isToday && 'bg-blumilk-500 font-semibold text-white rounded-full', 'mx-auto flex h-7 w-7 p-4 items-center justify-center']">
-              <time :datetime="day.date.toISODate()">
-                {{ day.date.day }}
-              </time>
+            <div
+              v-if="day.isCurrentMonth"
+              :class="[day.isVacation && `${getVacationBorder(day.date)}`, day.isPendingVacation && `border-dashed mx-0.5 ${getPendingVacationBorder(day.date)}`, !day.isVacation && !day.isPendingVacation && 'border-transparent', 'relative bg-white hover:bg-gray-100 border-b-4 py-1.5 focus:z-10 font-medium']"
+            >
+              <div :class="[day.isCurrentMonth && (day.isWeekend || day.isHoliday) && 'text-red-600 font-bold', day.isToday && 'bg-blumilk-500 font-semibold text-white rounded-full', 'mx-auto flex h-7 w-7 p-4 items-center justify-center']">
+                <time :datetime="day.date.toISODate()">
+                  {{ day.date.day }}
+                </time>
+              </div>
+              <InertiaLink
+                :href="`/vacation/requests/${dayIdx}`"
+                class="absolute inset-0"
+              />
             </div>
-          </Component>
+            <div
+              v-else
+              :class="['bg-gray-50 text-gray-400 border-b-4 border-transparent py-1.5 w-full focus:z-10 font-medium']"
+            >
+              <div class="flex justify-center items-center p-4 mx-auto w-7 h-7">
+                <time :datetime="day.date.toISODate()">
+                  {{ day.date.day }}
+                </time>
+              </div>
+            </div>
+          </template>
         </div>
       </section>
     </div>
diff --git a/resources/js/Shared/MainMenu.vue b/resources/js/Shared/MainMenu.vue
index a594833..89c9bd2 100644
--- a/resources/js/Shared/MainMenu.vue
+++ b/resources/js/Shared/MainMenu.vue
@@ -335,6 +335,14 @@ const navigation = computed(() =>
       icon: SunIcon,
       can: props.auth.can.manageVacationLimits,
     },
+    {
+
+      name: 'Podsumowanie roczne',
+      href: '/vacation/annual-summary',
+      component: 'AnnualSummary',
+      icon: SunIcon,
+      can: true,
+    },
     {
       name: 'Użytkownicy',
       href: '/users',
diff --git a/routes/web.php b/routes/web.php
index 9292b82..33f8720 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -2,12 +2,8 @@
 
 declare(strict_types=1);
 
-use Illuminate\Http\Request;
-use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Route;
-use Toby\Eloquent\Helpers\YearPeriodRetriever;
-use Toby\Eloquent\Models\Holiday;
-use Toby\Eloquent\Models\Vacation;
+use Toby\Infrastructure\Http\Controllers\AnnualSummaryController;
 use Toby\Infrastructure\Http\Controllers\DashboardController;
 use Toby\Infrastructure\Http\Controllers\GoogleController;
 use Toby\Infrastructure\Http\Controllers\HolidayController;
@@ -33,72 +29,44 @@ Route::middleware("auth")->group(function (): void {
     Route::post("year-periods/{yearPeriod}/select", SelectYearPeriodController::class)
         ->name("year-periods.select");
 
-    Route::prefix("/vacation")->group(function (): void {
+    Route::prefix("/vacation")->as("vacation.")->group(function (): void {
         Route::get("/limits", [VacationLimitController::class, "edit"])
-            ->name("vacation.limits");
+            ->name("limits");
         Route::get("/calendar/{month?}", [VacationCalendarController::class, "index"])
-            ->name("vacation.calendar");
+            ->name("calendar");
         Route::get("/timesheet/{month}", TimesheetController::class)
             ->name("timesheet");
 
         Route::get("/limits", [VacationLimitController::class, "edit"])
-            ->name("vacation.limits");
+            ->name("limits");
         Route::put("/limits", [VacationLimitController::class, "update"]);
 
         Route::get("/requests", [VacationRequestController::class, "indexForApprovers"])
-            ->name("vacation.requests.indexForApprovers");
+            ->name("requests.indexForApprovers");
         Route::get("/requests/me", [VacationRequestController::class, "index"])
-            ->name("vacation.requests.index");
+            ->name("requests.index");
         Route::get("/requests/create", [VacationRequestController::class, "create"])
-            ->name("vacation.requests.create");
+            ->name("requests.create");
         Route::post("/requests", [VacationRequestController::class, "store"])
-            ->name("vacation.requests.store");
+            ->name("requests.store");
         Route::get("/requests/{vacationRequest}", [VacationRequestController::class, "show"])
-            ->name("vacation.requests.show");
+            ->name("requests.show");
         Route::get("/requests/{vacationRequest}/download", [VacationRequestController::class, "download"])
-            ->name("vacation.requests.download");
+            ->name("requests.download");
         Route::post("/requests/{vacationRequest}/reject", [VacationRequestController::class, "reject"])
-            ->name("vacation.requests.reject");
+            ->name("requests.reject");
         Route::post("/requests/{vacationRequest}/cancel", [VacationRequestController::class, "cancel"])
-            ->name("vacation.requests.cancel");
+            ->name("requests.cancel");
         Route::post("/requests/{vacationRequest}/accept-as-technical", [VacationRequestController::class, "acceptAsTechnical"], )
-            ->name("vacation.requests.accept-as-technical");
+            ->name("requests.accept-as-technical");
         Route::post("/requests/{vacationRequest}/accept-as-administrative", [VacationRequestController::class, "acceptAsAdministrative"], )
-            ->name("vacation.requests.accept-as-administrative");
+            ->name("requests.accept-as-administrative");
 
         Route::get("/monthly-usage", MonthlyUsageController::class)
-            ->name("vacation.monthly-usage");
-    });
+            ->name("monthly-usage");
+        Route::get("/annual-summary", AnnualSummaryController::class)
+            ->name("annual-summmary");
 
-    Route::get("/test", function (Request $request, YearPeriodRetriever $yearPeriodRetriever) {
-        $yearPeriod = $yearPeriodRetriever->selected();
-
-        $startDate = Carbon::createFromDate($yearPeriod->year)->startOfYear()->startOfWeek();
-        $endDate = Carbon::createFromDate($yearPeriod->year)->endOfYear()->endOfWeek();
-
-        $holidays = $yearPeriod->holidays()
-            ->whereBetween("date", [$startDate, $endDate])
-            ->get();
-
-        $vacations = $request->user()
-            ->vacations()
-            ->with("vacationRequest")
-            ->whereBetween("date", [$startDate, $endDate])
-            ->approved()
-            ->get();
-        
-        $pendingVacations = $request->user()
-            ->vacations()
-            ->with("vacationRequest")
-            ->whereBetween("date", [$startDate, $endDate])
-            ->pending()
-            ->get();
-
-        return inertia("Test", [
-            "holidays" => $holidays->mapWithKeys(fn(Holiday $holiday) => [$holiday->date->toDateString() => $holiday->name]),
-            "vacations" => $vacations->mapWithKeys(fn(Vacation $vacation) => [$vacation->date->toDateString() => $vacation->vacationRequest->type]),
-            "pendingVacations" => $pendingVacations->mapWithKeys(fn(Vacation $vacation) => [$vacation->date->toDateString() => $vacation->vacationRequest->type]),
-        ]);
     });
 });
 
-- 
2.52.0


From 2a574bec623a1a36a3b3aabd7625e4d644892154 Mon Sep 17 00:00:00 2001
From: Adrian Hopek <adrian.hopek@blumilk.pl>
Date: Wed, 6 Apr 2022 10:13:36 +0200
Subject: [PATCH 04/13] wip

---
 resources/css/app.css                |  1 -
 resources/js/Pages/AnnualSummary.vue | 22 +++++++++++++++-------
 resources/js/Shared/VacationBar.vue  |  5 +----
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/resources/css/app.css b/resources/css/app.css
index 3c5c746..858c5e9 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -68,4 +68,3 @@
 ::-webkit-scrollbar-thumb:hover {
     background: #dadce0;
 }
-
diff --git a/resources/js/Pages/AnnualSummary.vue b/resources/js/Pages/AnnualSummary.vue
index 028568a..552846a 100644
--- a/resources/js/Pages/AnnualSummary.vue
+++ b/resources/js/Pages/AnnualSummary.vue
@@ -28,7 +28,7 @@
             v-for="(day, dayIdx) in month.days"
             :key="dayIdx"
           >
-            <div
+            <button
               v-if="day.isCurrentMonth"
               :class="[day.isVacation && `${getVacationBorder(day.date)}`, day.isPendingVacation && `border-dashed mx-0.5 ${getPendingVacationBorder(day.date)}`, !day.isVacation && !day.isPendingVacation && 'border-transparent', 'relative bg-white hover:bg-gray-100 border-b-4 py-1.5 focus:z-10 font-medium']"
             >
@@ -37,11 +37,19 @@
                   {{ day.date.day }}
                 </time>
               </div>
-              <InertiaLink
-                :href="`/vacation/requests/${dayIdx}`"
-                class="absolute inset-0"
-              />
-            </div>
+              <Popper
+                v-if="day.isHoliday || day.isVacation || day.isPendingVacation"
+                hover
+              >
+                <button class="absolute inset-0" />
+
+                <template #content>
+                  <div class="py-2 px-4 text-gray-900 bg-white rounded-md shadow-md text-md">
+                    {{ dayIdx }}
+                  </div>
+                </template>
+              </Popper>
+            </button>
             <div
               v-else
               :class="['bg-gray-50 text-gray-400 border-b-4 border-transparent py-1.5 w-full focus:z-10 font-medium']"
@@ -63,7 +71,7 @@
 import { DateTime } from 'luxon'
 import useVacationTypeInfo from '@/Composables/vacationTypeInfo'
 import useCurrentYearPeriodInfo from '@/Composables/yearPeriodInfo'
-
+import Popper from 'vue3-popper'
 const props = defineProps({
   holidays: Object,
   vacations: Object,
diff --git a/resources/js/Shared/VacationBar.vue b/resources/js/Shared/VacationBar.vue
index dc96d3e..b4e6fb1 100644
--- a/resources/js/Shared/VacationBar.vue
+++ b/resources/js/Shared/VacationBar.vue
@@ -1,8 +1,5 @@
 <template>
-  <Popper
-    hover
-    class="w-full h-full"
-  >
+  <Popper hover>
     <div class="flex text-white bg-white">
       <div
         v-show="stats.used > 0"
-- 
2.52.0


From aeb43fe4488eead5d34169e454398751d6dc4151 Mon Sep 17 00:00:00 2001
From: Adrian Hopek <adrian.hopek@blumilk.pl>
Date: Wed, 6 Apr 2022 14:27:04 +0200
Subject: [PATCH 05/13] wip

---
 .../Controllers/AnnualSummaryController.php   |  9 +--
 .../SimpleVacationRequestResource.php         | 25 ++++++++
 package-lock.json                             | 62 +++++++++++++++++++
 package.json                                  |  1 +
 resources/css/app.css                         | 14 +++++
 resources/js/Pages/AnnualSummary.vue          | 50 ++++++++++-----
 resources/js/Shared/VacationPopup.vue         | 62 +++++++++++++++++++
 7 files changed, 205 insertions(+), 18 deletions(-)
 create mode 100644 app/Infrastructure/Http/Resources/SimpleVacationRequestResource.php
 create mode 100644 resources/js/Shared/VacationPopup.vue

diff --git a/app/Infrastructure/Http/Controllers/AnnualSummaryController.php b/app/Infrastructure/Http/Controllers/AnnualSummaryController.php
index bc2a2d7..6df14a4 100644
--- a/app/Infrastructure/Http/Controllers/AnnualSummaryController.php
+++ b/app/Infrastructure/Http/Controllers/AnnualSummaryController.php
@@ -10,6 +10,7 @@ use Inertia\Response;
 use Toby\Eloquent\Helpers\YearPeriodRetriever;
 use Toby\Eloquent\Models\Holiday;
 use Toby\Eloquent\Models\Vacation;
+use Toby\Infrastructure\Http\Resources\SimpleVacationRequestResource;
 
 class AnnualSummaryController extends Controller
 {
@@ -25,22 +26,22 @@ class AnnualSummaryController extends Controller
 
         $vacations = $request->user()
             ->vacations()
-            ->with("vacationRequest")
+            ->with("vacationRequest.vacations")
             ->whereBetween("date", [$startDate, $endDate])
             ->approved()
             ->get();
 
         $pendingVacations = $request->user()
             ->vacations()
-            ->with("vacationRequest")
+            ->with("vacationRequest.vacations")
             ->whereBetween("date", [$startDate, $endDate])
             ->pending()
             ->get();
 
         return inertia("AnnualSummary", [
             "holidays" => $holidays->mapWithKeys(fn(Holiday $holiday) => [$holiday->date->toDateString() => $holiday->name]),
-            "vacations" => $vacations->mapWithKeys(fn(Vacation $vacation) => [$vacation->date->toDateString() => $vacation->vacationRequest->type]),
-            "pendingVacations" => $pendingVacations->mapWithKeys(fn(Vacation $vacation) => [$vacation->date->toDateString() => $vacation->vacationRequest->type]),
+            "vacations" => $vacations->mapWithKeys(fn(Vacation $vacation) => [$vacation->date->toDateString() => new SimpleVacationRequestResource($vacation->vacationRequest)]),
+            "pendingVacations" => $pendingVacations->mapWithKeys(fn(Vacation $vacation) => [$vacation->date->toDateString() => new SimpleVacationRequestResource($vacation->vacationRequest)]),
         ]);
     }
 }
diff --git a/app/Infrastructure/Http/Resources/SimpleVacationRequestResource.php b/app/Infrastructure/Http/Resources/SimpleVacationRequestResource.php
new file mode 100644
index 0000000..3cb9c52
--- /dev/null
+++ b/app/Infrastructure/Http/Resources/SimpleVacationRequestResource.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Infrastructure\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class SimpleVacationRequestResource extends JsonResource
+{
+    public static $wrap = null;
+
+    public function toArray($request): array
+    {
+        return [
+            "id" => $this->id,
+            "name" => $this->name,
+            "type" => $this->type,
+            "state" => $this->state,
+            "from" => $this->from->toDisplayString(),
+            "to" => $this->to->toDisplayString(),
+            "days" => $this->vacations->count(),
+        ];
+    }
+}
diff --git a/package-lock.json b/package-lock.json
index c4ca458..958c116 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,6 +20,7 @@
                 "echarts": "^5.3.2",
                 "eslit": "^6.0.0",
                 "flatpickr": "^4.6.11",
+                "floating-vue": "^2.0.0-beta.13",
                 "laravel-mix": "^6.0.43",
                 "lodash": "^4.17.21",
                 "luxon": "^2.3.1",
@@ -1681,6 +1682,19 @@
                 "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
             }
         },
+        "node_modules/@floating-ui/core": {
+            "version": "0.3.1",
+            "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-0.3.1.tgz",
+            "integrity": "sha512-ensKY7Ub59u16qsVIFEo2hwTCqZ/r9oZZFh51ivcLGHfUwTn8l1Xzng8RJUe91H/UP8PeqeBronAGx0qmzwk2g=="
+        },
+        "node_modules/@floating-ui/dom": {
+            "version": "0.1.10",
+            "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-0.1.10.tgz",
+            "integrity": "sha512-4kAVoogvQm2N0XE0G6APQJuCNuErjOfPW8Ux7DFxh8+AfugWflwVJ5LDlHOwrwut7z/30NUvdtHzQ3zSip4EzQ==",
+            "dependencies": {
+                "@floating-ui/core": "^0.3.0"
+            }
+        },
         "node_modules/@headlessui/vue": {
             "version": "1.5.0",
             "resolved": "https://registry.npmjs.org/@headlessui/vue/-/vue-1.5.0.tgz",
@@ -4866,6 +4880,18 @@
             "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==",
             "dev": true
         },
+        "node_modules/floating-vue": {
+            "version": "2.0.0-beta.13",
+            "resolved": "https://registry.npmjs.org/floating-vue/-/floating-vue-2.0.0-beta.13.tgz",
+            "integrity": "sha512-C2bGEtdbOXm+2rmkn8W6dTQeh3xJT7YbdHnrbanYDS3vK/1lumdXhYA6j2Qs+9shViNjoVUUND1EhLxLDP2OZA==",
+            "dependencies": {
+                "@floating-ui/dom": "^0.1.10",
+                "vue-resize": "^2.0.0-alpha.1"
+            },
+            "peerDependencies": {
+                "vue": "^3.2.0"
+            }
+        },
         "node_modules/follow-redirects": {
             "version": "1.14.9",
             "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",
@@ -9029,6 +9055,14 @@
             "resolved": "https://registry.npmjs.org/vue-material-design-icons/-/vue-material-design-icons-5.0.0.tgz",
             "integrity": "sha512-lYSJFW/TyQqmg7MvUbEB8ua1mwWy/v8qve7QJuA/UWUAXC4/yVUdAm4pg/sM9+k5n7VLckBv6ucOROuGBsGPDQ=="
         },
+        "node_modules/vue-resize": {
+            "version": "2.0.0-alpha.1",
+            "resolved": "https://registry.npmjs.org/vue-resize/-/vue-resize-2.0.0-alpha.1.tgz",
+            "integrity": "sha512-7+iqOueLU7uc9NrMfrzbG8hwMqchfVfSzpVlCMeJQe4pyibqyoifDNbKTZvwxZKDvGkB+PdFeKvnGZMoEb8esg==",
+            "peerDependencies": {
+                "vue": "^3.0.0"
+            }
+        },
         "node_modules/vue-style-loader": {
             "version": "4.1.3",
             "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz",
@@ -10755,6 +10789,19 @@
                 "strip-json-comments": "^3.1.1"
             }
         },
+        "@floating-ui/core": {
+            "version": "0.3.1",
+            "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-0.3.1.tgz",
+            "integrity": "sha512-ensKY7Ub59u16qsVIFEo2hwTCqZ/r9oZZFh51ivcLGHfUwTn8l1Xzng8RJUe91H/UP8PeqeBronAGx0qmzwk2g=="
+        },
+        "@floating-ui/dom": {
+            "version": "0.1.10",
+            "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-0.1.10.tgz",
+            "integrity": "sha512-4kAVoogvQm2N0XE0G6APQJuCNuErjOfPW8Ux7DFxh8+AfugWflwVJ5LDlHOwrwut7z/30NUvdtHzQ3zSip4EzQ==",
+            "requires": {
+                "@floating-ui/core": "^0.3.0"
+            }
+        },
         "@headlessui/vue": {
             "version": "1.5.0",
             "resolved": "https://registry.npmjs.org/@headlessui/vue/-/vue-1.5.0.tgz",
@@ -13304,6 +13351,15 @@
             "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==",
             "dev": true
         },
+        "floating-vue": {
+            "version": "2.0.0-beta.13",
+            "resolved": "https://registry.npmjs.org/floating-vue/-/floating-vue-2.0.0-beta.13.tgz",
+            "integrity": "sha512-C2bGEtdbOXm+2rmkn8W6dTQeh3xJT7YbdHnrbanYDS3vK/1lumdXhYA6j2Qs+9shViNjoVUUND1EhLxLDP2OZA==",
+            "requires": {
+                "@floating-ui/dom": "^0.1.10",
+                "vue-resize": "^2.0.0-alpha.1"
+            }
+        },
         "follow-redirects": {
             "version": "1.14.9",
             "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",
@@ -16265,6 +16321,12 @@
             "resolved": "https://registry.npmjs.org/vue-material-design-icons/-/vue-material-design-icons-5.0.0.tgz",
             "integrity": "sha512-lYSJFW/TyQqmg7MvUbEB8ua1mwWy/v8qve7QJuA/UWUAXC4/yVUdAm4pg/sM9+k5n7VLckBv6ucOROuGBsGPDQ=="
         },
+        "vue-resize": {
+            "version": "2.0.0-alpha.1",
+            "resolved": "https://registry.npmjs.org/vue-resize/-/vue-resize-2.0.0-alpha.1.tgz",
+            "integrity": "sha512-7+iqOueLU7uc9NrMfrzbG8hwMqchfVfSzpVlCMeJQe4pyibqyoifDNbKTZvwxZKDvGkB+PdFeKvnGZMoEb8esg==",
+            "requires": {}
+        },
         "vue-style-loader": {
             "version": "4.1.3",
             "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz",
diff --git a/package.json b/package.json
index 8896792..715ab69 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
         "echarts": "^5.3.2",
         "eslit": "^6.0.0",
         "flatpickr": "^4.6.11",
+        "floating-vue": "^2.0.0-beta.13",
         "laravel-mix": "^6.0.43",
         "lodash": "^4.17.21",
         "luxon": "^2.3.1",
diff --git a/resources/css/app.css b/resources/css/app.css
index 858c5e9..e578feb 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -1,5 +1,6 @@
 @import 'flatpickr/dist/themes/light.css';
 @import 'vue-toastification/dist/index.css';
+@import 'floating-vue/dist/style.css';
 
 @tailwind base;
 @tailwind components;
@@ -68,3 +69,16 @@
 ::-webkit-scrollbar-thumb:hover {
     background: #dadce0;
 }
+
+.v-popper--theme-tooltip .v-popper__inner {
+    padding: 0;
+    background: transparent;
+}
+
+.v-popper--theme-tooltip .v-popper__arrow-outer {
+    border-color: #527ABA;
+}
+
+.v-popper--theme-tooltip:focus-visible {
+    outline: none;
+}
diff --git a/resources/js/Pages/AnnualSummary.vue b/resources/js/Pages/AnnualSummary.vue
index 552846a..896f235 100644
--- a/resources/js/Pages/AnnualSummary.vue
+++ b/resources/js/Pages/AnnualSummary.vue
@@ -1,10 +1,12 @@
 <template>
+  <InertiaHead title="Podsumowanie roczne" />
   <div class="bg-white shadow-md">
     <div class="p-4 sm:px-6">
       <h2 class="text-lg font-medium leading-6 text-gray-900">
         Podsumowanie roczne
       </h2>
     </div>
+    <div class="max-w-md" />
     <div class="grid grid-cols-1 gap-8 py-8 px-4 mx-auto max-w-3xl border-t border-gray-200 sm:grid-cols-2 sm:px-6 xl:grid-cols-3 xl:px-8 xl:max-w-none 2xl:grid-cols-4">
       <section
         v-for="month in months"
@@ -23,32 +25,46 @@
           <div>Sb</div>
           <div>Nd</div>
         </div>
-        <div class="grid isolate grid-cols-7 mt-2 text-sm ring-1 ring-gray-200 shadow">
+        <div class="grid grid-cols-7 mt-2 text-sm ring-1 ring-gray-200 shadow">
           <template
             v-for="(day, dayIdx) in month.days"
             :key="dayIdx"
           >
             <button
               v-if="day.isCurrentMonth"
-              :class="[day.isVacation && `${getVacationBorder(day.date)}`, day.isPendingVacation && `border-dashed mx-0.5 ${getPendingVacationBorder(day.date)}`, !day.isVacation && !day.isPendingVacation && 'border-transparent', 'relative bg-white hover:bg-gray-100 border-b-4 py-1.5 focus:z-10 font-medium']"
+              :class="[day.isVacation && `${getVacationBorder(day.date)}`, day.isPendingVacation && `border-dashed mx-0.5 ${getPendingVacationBorder(day.date)}`, !day.isVacation && !day.isPendingVacation && 'border-transparent', 'relative bg-white hover:bg-blumilk-25 border-b-4 py-1.5 font-medium']"
             >
               <div :class="[day.isCurrentMonth && (day.isWeekend || day.isHoliday) && 'text-red-600 font-bold', day.isToday && 'bg-blumilk-500 font-semibold text-white rounded-full', 'mx-auto flex h-7 w-7 p-4 items-center justify-center']">
                 <time :datetime="day.date.toISODate()">
                   {{ day.date.day }}
                 </time>
               </div>
-              <Popper
-                v-if="day.isHoliday || day.isVacation || day.isPendingVacation"
-                hover
+              <Tooltip
+                v-if="day.isVacation || day.isPendingVacation"
+                :triggers="['click']"
+                placement="bottom"
+                auto-hide
               >
-                <button class="absolute inset-0" />
-
-                <template #content>
-                  <div class="py-2 px-4 text-gray-900 bg-white rounded-md shadow-md text-md">
-                    {{ dayIdx }}
+                <div class="absolute inset-0" />
+                <template #popper>
+                  <div class="mt-1">
+                    <VacationPopup :vacation="getVacationInfo(day)" />
                   </div>
                 </template>
-              </Popper>
+              </Tooltip>
+              <Tooltip
+                v-else-if="day.isHoliday"
+                :triggers="['click']"
+                placement="bottom"
+                auto-hide
+              >
+                <div class="absolute inset-0" />
+                <template #popper>
+                  <div class="py-2 px-6 text-sm font-semibold text-left text-gray-700 bg-white rounded-lg border border-gray-400">
+                    {{ holidays[day.date.toISODate()] }}
+                  </div>
+                </template>
+              </Tooltip>
             </button>
             <div
               v-else
@@ -71,7 +87,9 @@
 import { DateTime } from 'luxon'
 import useVacationTypeInfo from '@/Composables/vacationTypeInfo'
 import useCurrentYearPeriodInfo from '@/Composables/yearPeriodInfo'
-import Popper from 'vue3-popper'
+import { Tooltip } from 'floating-vue'
+import VacationPopup from '@/Shared/VacationPopup'
+
 const props = defineProps({
   holidays: Object,
   vacations: Object,
@@ -136,14 +154,18 @@ function isWeekend(date) {
 }
 
 function getVacationBorder(date) {
-  const type = findType(props.vacations[date.toISODate()])
+  const type = findType(props.vacations[date.toISODate()].type)
 
   return type.border.approved
 }
 
 function getPendingVacationBorder(date) {
-  const type = findType(props.pendingVacations[date.toISODate()])
+  const type = findType(props.pendingVacations[date.toISODate()].type)
 
   return type.border.approved
 }
+
+function getVacationInfo(day) {
+  return day.isVacation ? props.vacations[day.date.toISODate()] : props.pendingVacations[day.date.toISODate()]
+}
 </script>
\ No newline at end of file
diff --git a/resources/js/Shared/VacationPopup.vue b/resources/js/Shared/VacationPopup.vue
new file mode 100644
index 0000000..82e0a5a
--- /dev/null
+++ b/resources/js/Shared/VacationPopup.vue
@@ -0,0 +1,62 @@
+<template>
+  <div class="py-2 px-6 text-left text-gray-900 whitespace-nowrap bg-white rounded-lg border border-gray-400">
+    <dl class="divide-y divide-gray-200">
+      <div class="py-2 space-y-1">
+        <dt class="text-sm font-medium text-gray-500">
+          Nr wniosku
+        </dt>
+        <dd class="text-sm text-gray-900">
+          <InertiaLink
+            :href="`/vacation/requests/${vacation.id}`"
+            class="font-semibold text-blumilk-600 hover:text-blumilk-500 hover:underline"
+          >
+            {{ vacation.name }}
+          </InertiaLink>
+        </dd>
+      </div>
+      <div class="py-2 space-y-1">
+        <dt class="text-sm font-medium text-gray-500">
+          Rodzaj urlopu
+        </dt>
+        <dd class="mt-1 text-sm text-gray-900">
+          <VacationType :type="vacation.type" />
+        </dd>
+      </div>
+      <div class="py-2 space-y-1">
+        <dt class="text-sm font-medium text-gray-500">
+          Obecny status
+        </dt>
+        <dd class="mt-1 text-sm text-gray-900">
+          <Status :status="vacation.state" />
+        </dd>
+      </div>
+      <div class="py-2 space-y-1">
+        <dt class="text-sm font-medium text-gray-500">
+          Data
+        </dt>
+        <dd class="mt-1 text-sm text-gray-900">
+          <template v-if="vacation.days > 1">
+            {{ vacation.from }} - {{ vacation.to }}
+          </template>
+          <template v-else>
+            {{ vacation.from }}
+          </template>
+          <span class="font-semibold">
+            [Liczba dni: {{ vacation.days }}]
+          </span>
+        </dd>
+      </div>
+    </dl>
+  </div>
+</template>
+
+
+<script setup>
+import VacationType from '@/Shared/VacationType'
+import Status from '@/Shared/Status'
+
+defineProps({
+  vacation: Object,
+})
+
+</script>
\ No newline at end of file
-- 
2.52.0


From 6abee20245b5601f010d864859b725e8c42c89fb Mon Sep 17 00:00:00 2001
From: Adrian Hopek <adrian.hopek@blumilk.pl>
Date: Wed, 6 Apr 2022 15:30:30 +0200
Subject: [PATCH 06/13] wip

---
 resources/js/Shared/MainMenu.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/js/Shared/MainMenu.vue b/resources/js/Shared/MainMenu.vue
index 643c2e6..799caec 100644
--- a/resources/js/Shared/MainMenu.vue
+++ b/resources/js/Shared/MainMenu.vue
@@ -277,6 +277,7 @@ import {
   UserGroupIcon,
   XIcon,
   SunIcon,
+  ClipboardListIcon,
   StarIcon,
   CalendarIcon,
   DocumentTextIcon,
@@ -340,7 +341,7 @@ const navigation = computed(() =>
       name: 'Podsumowanie roczne',
       href: '/vacation/annual-summary',
       component: 'AnnualSummary',
-      icon: SunIcon,
+      icon: ClipboardListIcon,
       can: true,
     },
     {
-- 
2.52.0


From 0d8dccea22a50383d7d0e2b9894dba71d6c5a125 Mon Sep 17 00:00:00 2001
From: Adrian Hopek <adrian.hopek@blumilk.pl>
Date: Thu, 7 Apr 2022 08:19:08 +0200
Subject: [PATCH 07/13] wip

---
 .../Http/Controllers/AnnualSummaryController.php               | 3 ++-
 resources/css/app.css                                          | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Infrastructure/Http/Controllers/AnnualSummaryController.php b/app/Infrastructure/Http/Controllers/AnnualSummaryController.php
index 6df14a4..b911615 100644
--- a/app/Infrastructure/Http/Controllers/AnnualSummaryController.php
+++ b/app/Infrastructure/Http/Controllers/AnnualSummaryController.php
@@ -14,7 +14,8 @@ use Toby\Infrastructure\Http\Resources\SimpleVacationRequestResource;
 
 class AnnualSummaryController extends Controller
 {
-    public function __invoke(Request $request, YearPeriodRetriever $yearPeriodRetriever): Response {
+    public function __invoke(Request $request, YearPeriodRetriever $yearPeriodRetriever): Response
+    {
         $yearPeriod = $yearPeriodRetriever->selected();
 
         $startDate = Carbon::createFromDate($yearPeriod->year)->startOfYear()->startOfWeek();
diff --git a/resources/css/app.css b/resources/css/app.css
index e578feb..b731a13 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -76,7 +76,7 @@
 }
 
 .v-popper--theme-tooltip .v-popper__arrow-outer {
-    border-color: #527ABA;
+    border-color: #000;
 }
 
 .v-popper--theme-tooltip:focus-visible {
-- 
2.52.0


From fb15811b16b3b3060ae3a3792321294786c80c6e Mon Sep 17 00:00:00 2001
From: Adrian Hopek <adrian.hopek@blumilk.pl>
Date: Thu, 7 Apr 2022 08:57:17 +0200
Subject: [PATCH 08/13] wip

---
 app/Domain/UserVacationStatsRetriever.php            | 10 +++++-----
 .../Validation/Rules/DoesNotExceedLimitRule.php      |  7 +++++--
 app/Eloquent/Models/User.php                         |  4 ++--
 .../Api/CalculateUserUnavailableDaysController.php   |  2 +-
 .../Http/Controllers/VacationRequestController.php   | 12 ++++++------
 5 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/app/Domain/UserVacationStatsRetriever.php b/app/Domain/UserVacationStatsRetriever.php
index 8d1e66d..3a8a6e6 100644
--- a/app/Domain/UserVacationStatsRetriever.php
+++ b/app/Domain/UserVacationStatsRetriever.php
@@ -21,7 +21,7 @@ class UserVacationStatsRetriever
     {
         return $user
             ->vacations()
-            ->where("year_period_id", $yearPeriod->id)
+            ->whereBelongsTo($yearPeriod)
             ->whereRelation(
                 "vacationRequest",
                 fn(Builder $query) => $query
@@ -37,7 +37,7 @@ class UserVacationStatsRetriever
             ->whereRelation(
                 "vacationRequest",
                 fn(Builder $query) => $query
-                    ->where("year_period_id", $yearPeriod->id)
+                    ->whereBelongsTo($yearPeriod)
                     ->whereIn("type", $this->getLimitableVacationTypes())
                     ->states(VacationRequestStatesRetriever::successStates()),
             )
@@ -50,7 +50,7 @@ class UserVacationStatsRetriever
     {
         return $user
             ->vacations()
-            ->where("year_period_id", $yearPeriod->id)
+            ->whereBelongsTo($yearPeriod)
             ->whereRelation(
                 "vacationRequest",
                 fn(Builder $query) => $query
@@ -64,7 +64,7 @@ class UserVacationStatsRetriever
     {
         return $user
             ->vacations()
-            ->where("year_period_id", $yearPeriod->id)
+            ->whereBelongsTo($yearPeriod)
             ->whereRelation(
                 "vacationRequest",
                 fn(Builder $query) => $query
@@ -86,7 +86,7 @@ class UserVacationStatsRetriever
     public function getVacationDaysLimit(User $user, YearPeriod $yearPeriod): int
     {
         $limit = $user->vacationLimits()
-            ->where("year_period_id", $yearPeriod->id)
+            ->whereBelongsTo($yearPeriod)
             ->first()
             ?->days;
 
diff --git a/app/Domain/Validation/Rules/DoesNotExceedLimitRule.php b/app/Domain/Validation/Rules/DoesNotExceedLimitRule.php
index c835cf6..3e90472 100644
--- a/app/Domain/Validation/Rules/DoesNotExceedLimitRule.php
+++ b/app/Domain/Validation/Rules/DoesNotExceedLimitRule.php
@@ -41,13 +41,16 @@ class DoesNotExceedLimitRule implements VacationRequestRule
 
     protected function getUserVacationLimit(User $user, YearPeriod $yearPeriod): int
     {
-        return $user->vacationLimits()->where("year_period_id", $yearPeriod->id)->first()->days ?? 0;
+        return $user->vacationLimits()
+                ->whereBelongsTo($yearPeriod)
+                ->first()
+                ->days ?? 0;
     }
 
     protected function getVacationDaysWithLimit(User $user, YearPeriod $yearPeriod): int
     {
         return $user->vacations()
-            ->where("year_period_id", $yearPeriod->id)
+            ->whereBelongsTo($yearPeriod)
             ->whereRelation(
                 "vacationRequest",
                 fn(Builder $query) => $query
diff --git a/app/Eloquent/Models/User.php b/app/Eloquent/Models/User.php
index 3d12fa9..d4f451c 100644
--- a/app/Eloquent/Models/User.php
+++ b/app/Eloquent/Models/User.php
@@ -91,7 +91,7 @@ class User extends Authenticatable
     public function hasVacationLimit(YearPeriod $yearPeriod): bool
     {
         return $this->vacationLimits()
-            ->where("year_period_id", $yearPeriod->id)
+            ->whereBelongsTo($yearPeriod)
             ->whereNotNull("days")
             ->exists();
     }
@@ -113,7 +113,7 @@ class User extends Authenticatable
         return $query->whereRelation(
             "vacationlimits",
             fn(Builder $query) => $query
-                ->where("year_period_id", $yearPeriod->id)
+                ->whereBelongsTo($yearPeriod)
                 ->whereNotNull("days"),
         );
     }
diff --git a/app/Infrastructure/Http/Controllers/Api/CalculateUserUnavailableDaysController.php b/app/Infrastructure/Http/Controllers/Api/CalculateUserUnavailableDaysController.php
index dfa390d..44715f7 100644
--- a/app/Infrastructure/Http/Controllers/Api/CalculateUserUnavailableDaysController.php
+++ b/app/Infrastructure/Http/Controllers/Api/CalculateUserUnavailableDaysController.php
@@ -27,7 +27,7 @@ class CalculateUserUnavailableDaysController extends Controller
 
         $holidays = $yearPeriod->holidays()->pluck("date");
         $vacationDays = $user->vacations()
-            ->where("year_period_id", $yearPeriod->id)
+            ->whereBelongsTo($yearPeriod)
             ->whereRelation(
                 "vacationRequest",
                 fn(Builder $query) => $query->noStates(VacationRequestStatesRetriever::failedStates()),
diff --git a/app/Infrastructure/Http/Controllers/VacationRequestController.php b/app/Infrastructure/Http/Controllers/VacationRequestController.php
index 4f3134e..fd6b711 100644
--- a/app/Infrastructure/Http/Controllers/VacationRequestController.php
+++ b/app/Infrastructure/Http/Controllers/VacationRequestController.php
@@ -40,26 +40,26 @@ class VacationRequestController extends Controller
         $vacationRequests = $request->user()
             ->vacationRequests()
             ->with("vacations")
-            ->where("year_period_id", $yearPeriodRetriever->selected()->id)
+            ->whereBelongsTo($yearPeriodRetriever->selected())
             ->latest()
             ->states(VacationRequestStatesRetriever::filterByStatusGroup($status, $request->user()))
             ->paginate();
 
         $pending = $request->user()
             ->vacationRequests()
-            ->where("year_period_id", $yearPeriodRetriever->selected()->id)
+            ->whereBelongsTo($yearPeriodRetriever->selected())
             ->states(VacationRequestStatesRetriever::pendingStates())
             ->count();
 
         $success = $request->user()
             ->vacationRequests()
-            ->where("year_period_id", $yearPeriodRetriever->selected()->id)
+            ->whereBelongsTo($yearPeriodRetriever->selected())
             ->states(VacationRequestStatesRetriever::successStates())
             ->count();
 
         $failed = $request->user()
             ->vacationRequests()
-            ->where("year_period_id", $yearPeriodRetriever->selected()->id)
+            ->whereBelongsTo($yearPeriodRetriever->selected())
             ->states(VacationRequestStatesRetriever::failedStates())
             ->count();
 
@@ -91,7 +91,7 @@ class VacationRequestController extends Controller
 
         $vacationRequests = VacationRequest::query()
             ->with(["user", "vacations"])
-            ->where("year_period_id", $yearPeriod->id)
+            ->whereBelongsTo($yearPeriod)
             ->when($user !== null, fn(Builder $query) => $query->where("user_id", $user))
             ->when(
                 $status !== null,
@@ -156,7 +156,7 @@ class VacationRequestController extends Controller
         return $pdf->stream();
     }
 
-    public function create(Request $request, YearPeriodRetriever $yearPeriodRetriever): Response
+    public function create(Request $request): Response
     {
         $users = User::query()
             ->orderBy("last_name")
-- 
2.52.0


From 760c9bf5141dbbe3a9ed2751a2b01aa7eb9c1c29 Mon Sep 17 00:00:00 2001
From: Adrian Hopek <adrian.hopek@blumilk.pl>
Date: Thu, 7 Apr 2022 10:36:48 +0200
Subject: [PATCH 09/13] wip

---
 .../Rules/DoesNotExceedLimitRule.php          |  6 +-
 package-lock.json                             | 62 ------------
 package.json                                  |  1 -
 resources/css/app.css                         | 14 ---
 resources/js/Composables/vacationTypeInfo.js  | 48 +++-------
 resources/js/Pages/AnnualSummary.vue          | 96 +++++++++++--------
 resources/js/Shared/VacationBar.vue           |  5 +-
 .../js/Shared/VacationTypeCalendarIcon.vue    |  2 +-
 8 files changed, 74 insertions(+), 160 deletions(-)

diff --git a/app/Domain/Validation/Rules/DoesNotExceedLimitRule.php b/app/Domain/Validation/Rules/DoesNotExceedLimitRule.php
index 3e90472..74cb9d1 100644
--- a/app/Domain/Validation/Rules/DoesNotExceedLimitRule.php
+++ b/app/Domain/Validation/Rules/DoesNotExceedLimitRule.php
@@ -42,9 +42,9 @@ class DoesNotExceedLimitRule implements VacationRequestRule
     protected function getUserVacationLimit(User $user, YearPeriod $yearPeriod): int
     {
         return $user->vacationLimits()
-                ->whereBelongsTo($yearPeriod)
-                ->first()
-                ->days ?? 0;
+            ->whereBelongsTo($yearPeriod)
+            ->first()
+            ->days ?? 0;
     }
 
     protected function getVacationDaysWithLimit(User $user, YearPeriod $yearPeriod): int
diff --git a/package-lock.json b/package-lock.json
index d4bfd7d..085c8b5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,6 @@
                 "echarts": "^5.3.2",
                 "eslit": "^6.0.0",
                 "flatpickr": "^4.6.11",
-                "floating-vue": "^2.0.0-beta.13",
                 "laravel-mix": "^6.0.43",
                 "lodash": "^4.17.21",
                 "luxon": "^2.3.1",
@@ -1682,19 +1681,6 @@
                 "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
             }
         },
-        "node_modules/@floating-ui/core": {
-            "version": "0.3.1",
-            "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-0.3.1.tgz",
-            "integrity": "sha512-ensKY7Ub59u16qsVIFEo2hwTCqZ/r9oZZFh51ivcLGHfUwTn8l1Xzng8RJUe91H/UP8PeqeBronAGx0qmzwk2g=="
-        },
-        "node_modules/@floating-ui/dom": {
-            "version": "0.1.10",
-            "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-0.1.10.tgz",
-            "integrity": "sha512-4kAVoogvQm2N0XE0G6APQJuCNuErjOfPW8Ux7DFxh8+AfugWflwVJ5LDlHOwrwut7z/30NUvdtHzQ3zSip4EzQ==",
-            "dependencies": {
-                "@floating-ui/core": "^0.3.0"
-            }
-        },
         "node_modules/@headlessui/vue": {
             "version": "1.5.0",
             "resolved": "https://registry.npmjs.org/@headlessui/vue/-/vue-1.5.0.tgz",
@@ -4767,18 +4753,6 @@
             "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==",
             "dev": true
         },
-        "node_modules/floating-vue": {
-            "version": "2.0.0-beta.13",
-            "resolved": "https://registry.npmjs.org/floating-vue/-/floating-vue-2.0.0-beta.13.tgz",
-            "integrity": "sha512-C2bGEtdbOXm+2rmkn8W6dTQeh3xJT7YbdHnrbanYDS3vK/1lumdXhYA6j2Qs+9shViNjoVUUND1EhLxLDP2OZA==",
-            "dependencies": {
-                "@floating-ui/dom": "^0.1.10",
-                "vue-resize": "^2.0.0-alpha.1"
-            },
-            "peerDependencies": {
-                "vue": "^3.2.0"
-            }
-        },
         "node_modules/follow-redirects": {
             "version": "1.14.9",
             "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",
@@ -8763,14 +8737,6 @@
             "resolved": "https://registry.npmjs.org/vue-material-design-icons/-/vue-material-design-icons-5.0.0.tgz",
             "integrity": "sha512-lYSJFW/TyQqmg7MvUbEB8ua1mwWy/v8qve7QJuA/UWUAXC4/yVUdAm4pg/sM9+k5n7VLckBv6ucOROuGBsGPDQ=="
         },
-        "node_modules/vue-resize": {
-            "version": "2.0.0-alpha.1",
-            "resolved": "https://registry.npmjs.org/vue-resize/-/vue-resize-2.0.0-alpha.1.tgz",
-            "integrity": "sha512-7+iqOueLU7uc9NrMfrzbG8hwMqchfVfSzpVlCMeJQe4pyibqyoifDNbKTZvwxZKDvGkB+PdFeKvnGZMoEb8esg==",
-            "peerDependencies": {
-                "vue": "^3.0.0"
-            }
-        },
         "node_modules/vue-style-loader": {
             "version": "4.1.3",
             "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz",
@@ -10495,19 +10461,6 @@
                 "strip-json-comments": "^3.1.1"
             }
         },
-        "@floating-ui/core": {
-            "version": "0.3.1",
-            "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-0.3.1.tgz",
-            "integrity": "sha512-ensKY7Ub59u16qsVIFEo2hwTCqZ/r9oZZFh51ivcLGHfUwTn8l1Xzng8RJUe91H/UP8PeqeBronAGx0qmzwk2g=="
-        },
-        "@floating-ui/dom": {
-            "version": "0.1.10",
-            "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-0.1.10.tgz",
-            "integrity": "sha512-4kAVoogvQm2N0XE0G6APQJuCNuErjOfPW8Ux7DFxh8+AfugWflwVJ5LDlHOwrwut7z/30NUvdtHzQ3zSip4EzQ==",
-            "requires": {
-                "@floating-ui/core": "^0.3.0"
-            }
-        },
         "@headlessui/vue": {
             "version": "1.5.0",
             "resolved": "https://registry.npmjs.org/@headlessui/vue/-/vue-1.5.0.tgz",
@@ -12967,15 +12920,6 @@
             "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==",
             "dev": true
         },
-        "floating-vue": {
-            "version": "2.0.0-beta.13",
-            "resolved": "https://registry.npmjs.org/floating-vue/-/floating-vue-2.0.0-beta.13.tgz",
-            "integrity": "sha512-C2bGEtdbOXm+2rmkn8W6dTQeh3xJT7YbdHnrbanYDS3vK/1lumdXhYA6j2Qs+9shViNjoVUUND1EhLxLDP2OZA==",
-            "requires": {
-                "@floating-ui/dom": "^0.1.10",
-                "vue-resize": "^2.0.0-alpha.1"
-            }
-        },
         "follow-redirects": {
             "version": "1.14.9",
             "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",
@@ -15812,12 +15756,6 @@
             "resolved": "https://registry.npmjs.org/vue-material-design-icons/-/vue-material-design-icons-5.0.0.tgz",
             "integrity": "sha512-lYSJFW/TyQqmg7MvUbEB8ua1mwWy/v8qve7QJuA/UWUAXC4/yVUdAm4pg/sM9+k5n7VLckBv6ucOROuGBsGPDQ=="
         },
-        "vue-resize": {
-            "version": "2.0.0-alpha.1",
-            "resolved": "https://registry.npmjs.org/vue-resize/-/vue-resize-2.0.0-alpha.1.tgz",
-            "integrity": "sha512-7+iqOueLU7uc9NrMfrzbG8hwMqchfVfSzpVlCMeJQe4pyibqyoifDNbKTZvwxZKDvGkB+PdFeKvnGZMoEb8esg==",
-            "requires": {}
-        },
         "vue-style-loader": {
             "version": "4.1.3",
             "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz",
diff --git a/package.json b/package.json
index 715ab69..8896792 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,6 @@
         "echarts": "^5.3.2",
         "eslit": "^6.0.0",
         "flatpickr": "^4.6.11",
-        "floating-vue": "^2.0.0-beta.13",
         "laravel-mix": "^6.0.43",
         "lodash": "^4.17.21",
         "luxon": "^2.3.1",
diff --git a/resources/css/app.css b/resources/css/app.css
index b731a13..858c5e9 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -1,6 +1,5 @@
 @import 'flatpickr/dist/themes/light.css';
 @import 'vue-toastification/dist/index.css';
-@import 'floating-vue/dist/style.css';
 
 @tailwind base;
 @tailwind components;
@@ -69,16 +68,3 @@
 ::-webkit-scrollbar-thumb:hover {
     background: #dadce0;
 }
-
-.v-popper--theme-tooltip .v-popper__inner {
-    padding: 0;
-    background: transparent;
-}
-
-.v-popper--theme-tooltip .v-popper__arrow-outer {
-    border-color: #000;
-}
-
-.v-popper--theme-tooltip:focus-visible {
-    outline: none;
-}
diff --git a/resources/js/Composables/vacationTypeInfo.js b/resources/js/Composables/vacationTypeInfo.js
index a1540f0..1091b25 100644
--- a/resources/js/Composables/vacationTypeInfo.js
+++ b/resources/js/Composables/vacationTypeInfo.js
@@ -14,97 +14,71 @@ const types = [
     text: 'Urlop wypoczynkowy',
     value: 'vacation',
     icon: WhiteBalanceSunnyIcon,
-    color: 'text-amber-500',
-    border: {
-      approved: 'border-amber-500',
-      pending: 'border-amber-300',
-    },
+    color: 'text-amber-300',
+    border: 'border-amber-300',
   },
   {
     text: 'Urlop na żądanie',
     value: 'vacation_on_request',
     icon: CommentAlertIcon,
     color: 'text-slate-500',
-    border: {
-      approved: 'border-slate-500',
-      pending: 'border-slate-300',
-    },
+    border: 'border-slate-500',
   },
   {
     text: 'Urlop okolicznościowy',
     value: 'special_vacation',
     icon: StarShootingIcon,
     color: 'text-orange-500',
-    border: {
-      approved: 'border-orange-500',
-      pending: 'border-orange-300',
-    },
+    border: 'border-orange-500',
   },
   {
     text: 'Opieka nad dzieckiem art 188 kp',
     value: 'childcare_vacation',
     icon: BabyCarriageIcon,
     color: 'text-purple-500',
-    border: {
-      approved: 'border-purple-500',
-      pending: 'border-purple-300',
-    },
+    border: 'border-purple-500',
   },
   {
     text: 'Urlop szkoleniowy',
     value: 'training_vacation',
     icon: HumanMaleBoardIcon,
     color: 'text-blumilk-500',
-    border: {
-      approved: 'border-blumilk-500',
-      pending: 'border-blumilk-300',
-    },
+    border: 'border-blumilk-500',
   },
   {
     text: 'Urlop bezpłatny',
     value: 'unpaid_vacation',
     icon: CurrencyUsdOffIcon,
     color: 'text-emerald-500',
-    border: {
-      approved: 'border-emerald-500',
-      pending: 'border-emerald-300',
-    },
+    border: 'border-emerald-500',
   },
   {
     text: 'Wolontariat',
     value: 'volunteering_vacation',
     icon: HandHeartOutlineIcon,
     color: 'text-pink-500',
-    border: {
-      approved: 'border-pink-500',
-      pending: 'border-pink-300',
-    },
+    border: 'border-pink-500',
   },
   {
     text: 'Odbiór za święto',
     value: 'time_in_lieu',
     icon: CalendarCheckIcon,
     color: 'text-stone-500',
-    border: {
-      approved: 'border-stone-500',
-      pending: 'border-stone-300',
-    },
+    border: 'border-stone-500',
   },
   {
     text: 'Zwolnienie lekarskie',
     value: 'sick_vacation',
     icon: MedicalBagIcon,
     color: 'text-rose-500',
-    border: {
-      approved: 'border-rose-500',
-      pending: 'border-rose-300',
-    },
+    border: 'border-rose-500',
   },
   {
     text: 'Nieobecność',
     value: 'absence',
     icon: CalendarRemoveIcon,
     color: 'text-cyan-500',
+    border: 'border-cyan-500',
   },
 ]
 
diff --git a/resources/js/Pages/AnnualSummary.vue b/resources/js/Pages/AnnualSummary.vue
index 896f235..5ad34fc 100644
--- a/resources/js/Pages/AnnualSummary.vue
+++ b/resources/js/Pages/AnnualSummary.vue
@@ -6,8 +6,9 @@
         Podsumowanie roczne
       </h2>
     </div>
-    <div class="max-w-md" />
-    <div class="grid grid-cols-1 gap-8 py-8 px-4 mx-auto max-w-3xl border-t border-gray-200 sm:grid-cols-2 sm:px-6 xl:grid-cols-3 xl:px-8 xl:max-w-none 2xl:grid-cols-4">
+    <div
+      class="grid grid-cols-1 gap-8 py-8 px-4 mx-auto max-w-3xl border-t border-gray-200 sm:grid-cols-2 sm:px-6 xl:grid-cols-3 xl:px-8 xl:max-w-none 2xl:grid-cols-4"
+    >
       <section
         v-for="month in months"
         :key="month.name"
@@ -30,45 +31,64 @@
             v-for="(day, dayIdx) in month.days"
             :key="dayIdx"
           >
-            <button
-              v-if="day.isCurrentMonth"
-              :class="[day.isVacation && `${getVacationBorder(day.date)}`, day.isPendingVacation && `border-dashed mx-0.5 ${getPendingVacationBorder(day.date)}`, !day.isVacation && !day.isPendingVacation && 'border-transparent', 'relative bg-white hover:bg-blumilk-25 border-b-4 py-1.5 font-medium']"
-            >
-              <div :class="[day.isCurrentMonth && (day.isWeekend || day.isHoliday) && 'text-red-600 font-bold', day.isToday && 'bg-blumilk-500 font-semibold text-white rounded-full', 'mx-auto flex h-7 w-7 p-4 items-center justify-center']">
-                <time :datetime="day.date.toISODate()">
-                  {{ day.date.day }}
-                </time>
-              </div>
-              <Tooltip
+            <template v-if="day.isCurrentMonth">
+              <Popper
                 v-if="day.isVacation || day.isPendingVacation"
-                :triggers="['click']"
-                placement="bottom"
-                auto-hide
+                open-delay="200"
+                arrow
+                hover
+                offset-distance="0"
               >
-                <div class="absolute inset-0" />
-                <template #popper>
-                  <div class="mt-1">
-                    <VacationPopup :vacation="getVacationInfo(day)" />
-                  </div>
+                <div :class="[day.isPendingVacation && 'mx-0.5']">
+                  <button :class="[day.isPendingVacation && `border-dashed`, `${getVacationBorder(day)} isolate bg-white w-full hover:bg-blumilk-25 border-b-4 py-1.5 font-medium`]">
+                    <time
+                      :datetime="day.date.toISODate()"
+                      :class="[ day.isToday && 'bg-blumilk-500 font-semibold text-white rounded-full', 'mx-auto flex h-7 w-7 p-4 items-center justify-center']"
+                    >
+                      {{ day.date.day }}
+                    </time>
+                  </button>
+                </div>
+                <template #content>
+                  <VacationPopup :vacation="getVacationInfo(day)" />
                 </template>
-              </Tooltip>
-              <Tooltip
+              </Popper>
+              <Popper
                 v-else-if="day.isHoliday"
-                :triggers="['click']"
-                placement="bottom"
-                auto-hide
+                open-delay="200"
+                arrow
+                hover
+                offset-distance="0"
               >
-                <div class="absolute inset-0" />
+                <button class="py-1.5 w-full font-medium bg-white hover:bg-blumilk-25 border-b-4 border-transparent">
+                  <time
+                    :datetime="day.date.toISODate()"
+                    :class="[ day.isToday && 'bg-blumilk-500 font-semibold text-white rounded-full', 'text-red-700 font-bold mx-auto flex h-7 w-7 p-4 items-center justify-center']"
+                  >
+                    {{ day.date.day }}
+                  </time>
+                </button>
                 <template #popper>
                   <div class="py-2 px-6 text-sm font-semibold text-left text-gray-700 bg-white rounded-lg border border-gray-400">
                     {{ holidays[day.date.toISODate()] }}
                   </div>
                 </template>
-              </Tooltip>
-            </button>
+              </Popper>
+              <button
+                v-else
+                class="py-1.5 w-full font-medium bg-white hover:bg-blumilk-25 border-b-4 border-transparent"
+              >
+                <time
+                  :datetime="day.date.toISODate()"
+                  :class="[ day.isToday && 'bg-blumilk-500 font-semibold text-white rounded-full', day.isWeekend && 'text-red-700 font-bold', 'mx-auto flex h-7 w-7 p-4 items-center justify-center']"
+                >
+                  {{ day.date.day }}
+                </time>
+              </button>
+            </template>
             <div
               v-else
-              :class="['bg-gray-50 text-gray-400 border-b-4 border-transparent py-1.5 w-full focus:z-10 font-medium']"
+              class="focus:z-10 py-1.5 w-full font-medium text-gray-400 bg-gray-50 border-b-4 border-transparent"
             >
               <div class="flex justify-center items-center p-4 mx-auto w-7 h-7">
                 <time :datetime="day.date.toISODate()">
@@ -87,7 +107,7 @@
 import { DateTime } from 'luxon'
 import useVacationTypeInfo from '@/Composables/vacationTypeInfo'
 import useCurrentYearPeriodInfo from '@/Composables/yearPeriodInfo'
-import { Tooltip } from 'floating-vue'
+import Popper from 'vue3-popper'
 import VacationPopup from '@/Shared/VacationPopup'
 
 const props = defineProps({
@@ -103,7 +123,7 @@ const months = []
 
 for (let i = 1; i < 13; i++) {
   const currentMonth = DateTime.fromObject({ year: year.value, month: i }).startOf('month')
-  
+
   const start = currentMonth.startOf('week')
   const end = currentMonth.endOf('month').endOf('week')
 
@@ -153,19 +173,13 @@ function isWeekend(date) {
   return date.weekday === 6 || date.weekday === 7
 }
 
-function getVacationBorder(date) {
-  const type = findType(props.vacations[date.toISODate()].type)
+function getVacationBorder(day) {
+  const type = findType(getVacationInfo(day).type)
 
-  return type.border.approved
-}
-
-function getPendingVacationBorder(date) {
-  const type = findType(props.pendingVacations[date.toISODate()].type)
-
-  return type.border.approved
+  return type.border
 }
 
 function getVacationInfo(day) {
   return day.isVacation ? props.vacations[day.date.toISODate()] : props.pendingVacations[day.date.toISODate()]
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/resources/js/Shared/VacationBar.vue b/resources/js/Shared/VacationBar.vue
index b4e6fb1..bce16f0 100644
--- a/resources/js/Shared/VacationBar.vue
+++ b/resources/js/Shared/VacationBar.vue
@@ -1,5 +1,8 @@
 <template>
-  <Popper hover>
+  <Popper
+    hover
+    class="w-full"
+  >
     <div class="flex text-white bg-white">
       <div
         v-show="stats.used > 0"
diff --git a/resources/js/Shared/VacationTypeCalendarIcon.vue b/resources/js/Shared/VacationTypeCalendarIcon.vue
index 77970c8..b5bdb26 100644
--- a/resources/js/Shared/VacationTypeCalendarIcon.vue
+++ b/resources/js/Shared/VacationTypeCalendarIcon.vue
@@ -8,7 +8,7 @@
       </div>
     </div>
     <template #content>
-      <div class="py-1 px-2 text-xs text-gray-900 bg-white shadow-md ">
+      <div class="py-2 px-4 text-xs text-gray-900 bg-white rounded-lg border border-gray-400 ">
         {{ typeInfo.text }}
       </div>
     </template>
-- 
2.52.0


From d24517271d4db4a3d82617bea463b4a7a183cc58 Mon Sep 17 00:00:00 2001
From: Adrian Hopek <adrian.hopek@blumilk.pl>
Date: Thu, 7 Apr 2022 12:50:44 +0200
Subject: [PATCH 10/13] fix

---
 .../Http/Controllers/AnnualSummaryController.php         | 9 ++-------
 resources/js/Pages/AnnualSummary.vue                     | 4 +---
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/app/Infrastructure/Http/Controllers/AnnualSummaryController.php b/app/Infrastructure/Http/Controllers/AnnualSummaryController.php
index b911615..c8394c6 100644
--- a/app/Infrastructure/Http/Controllers/AnnualSummaryController.php
+++ b/app/Infrastructure/Http/Controllers/AnnualSummaryController.php
@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace Toby\Infrastructure\Http\Controllers;
 
 use Illuminate\Http\Request;
-use Illuminate\Support\Carbon;
 use Inertia\Response;
 use Toby\Eloquent\Helpers\YearPeriodRetriever;
 use Toby\Eloquent\Models\Holiday;
@@ -18,24 +17,20 @@ class AnnualSummaryController extends Controller
     {
         $yearPeriod = $yearPeriodRetriever->selected();
 
-        $startDate = Carbon::createFromDate($yearPeriod->year)->startOfYear()->startOfWeek();
-        $endDate = Carbon::createFromDate($yearPeriod->year)->endOfYear()->endOfWeek();
-
         $holidays = $yearPeriod->holidays()
-            ->whereBetween("date", [$startDate, $endDate])
             ->get();
 
         $vacations = $request->user()
             ->vacations()
             ->with("vacationRequest.vacations")
-            ->whereBetween("date", [$startDate, $endDate])
+            ->whereBelongsTo($yearPeriod)
             ->approved()
             ->get();
 
         $pendingVacations = $request->user()
             ->vacations()
             ->with("vacationRequest.vacations")
-            ->whereBetween("date", [$startDate, $endDate])
+            ->whereBelongsTo($yearPeriod)
             ->pending()
             ->get();
 
diff --git a/resources/js/Pages/AnnualSummary.vue b/resources/js/Pages/AnnualSummary.vue
index 5ad34fc..72b7dba 100644
--- a/resources/js/Pages/AnnualSummary.vue
+++ b/resources/js/Pages/AnnualSummary.vue
@@ -35,7 +35,6 @@
               <Popper
                 v-if="day.isVacation || day.isPendingVacation"
                 open-delay="200"
-                arrow
                 hover
                 offset-distance="0"
               >
@@ -56,7 +55,6 @@
               <Popper
                 v-else-if="day.isHoliday"
                 open-delay="200"
-                arrow
                 hover
                 offset-distance="0"
               >
@@ -68,7 +66,7 @@
                     {{ day.date.day }}
                   </time>
                 </button>
-                <template #popper>
+                <template #content>
                   <div class="py-2 px-6 text-sm font-semibold text-left text-gray-700 bg-white rounded-lg border border-gray-400">
                     {{ holidays[day.date.toISODate()] }}
                   </div>
-- 
2.52.0


From 518e6a63e376fc52e8577c5e7c6bd6e536b786a5 Mon Sep 17 00:00:00 2001
From: Adrian Hopek <adrian.hopek@blumilk.pl>
Date: Thu, 7 Apr 2022 12:53:48 +0200
Subject: [PATCH 11/13] lint fix

---
 resources/js/Shared/VacationPopup.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/Shared/VacationPopup.vue b/resources/js/Shared/VacationPopup.vue
index 82e0a5a..79aba5a 100644
--- a/resources/js/Shared/VacationPopup.vue
+++ b/resources/js/Shared/VacationPopup.vue
@@ -59,4 +59,4 @@ defineProps({
   vacation: Object,
 })
 
-</script>
\ No newline at end of file
+</script>
-- 
2.52.0


From f09565ac9d081e26a8ee02240e756856a5ffb47f Mon Sep 17 00:00:00 2001
From: Adrian Hopek <adrian.hopek@blumilk.pl>
Date: Thu, 7 Apr 2022 13:50:50 +0200
Subject: [PATCH 12/13] cr fix

---
 ...ionRequestWaitsForApprovalNotification.php | 45 +++++++++++++++----
 app/Domain/TimesheetPerUserSheet.php          |  2 +-
 app/Domain/UserVacationStatsRetriever.php     |  8 ++--
 .../Rules/DoesNotExceedLimitRule.php          |  4 +-
 app/Eloquent/Models/User.php                  |  2 +-
 app/Eloquent/Models/Vacation.php              |  4 +-
 .../Controllers/AnnualSummaryController.php   | 16 +++++--
 ...CalculateUserUnavailableDaysController.php |  6 +--
 .../Controllers/VacationRequestController.php |  4 +-
 9 files changed, 64 insertions(+), 27 deletions(-)

diff --git a/app/Domain/Notifications/VacationRequestWaitsForApprovalNotification.php b/app/Domain/Notifications/VacationRequestWaitsForApprovalNotification.php
index 4e9199c..a737a81 100644
--- a/app/Domain/Notifications/VacationRequestWaitsForApprovalNotification.php
+++ b/app/Domain/Notifications/VacationRequestWaitsForApprovalNotification.php
@@ -8,6 +8,7 @@ use Illuminate\Bus\Queueable;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Notification;
 use InvalidArgumentException;
+use Toby\Domain\States\VacationRequest\WaitingForTechnical;
 use Toby\Eloquent\Models\User;
 use Toby\Eloquent\Models\VacationRequest;
 
@@ -43,8 +44,6 @@ class VacationRequestWaitsForApprovalNotification extends Notification
     protected function buildMailMessage(string $url): MailMessage
     {
         $user = $this->user->first_name;
-        $requester = $this->vacationRequest->user->fullName;
-        $title = $this->vacationRequest->name;
         $type = $this->vacationRequest->type->label();
         $from = $this->vacationRequest->from->toDisplayString();
         $to = $this->vacationRequest->to->toDisplayString();
@@ -54,13 +53,8 @@ class VacationRequestWaitsForApprovalNotification extends Notification
             ->greeting(__("Hi :user!", [
                 "user" => $user,
             ]))
-            ->subject(__("Vacation request :title is waiting for your approval", [
-                "title" => $title,
-            ]))
-            ->line(__("The vacation request :title from user: :requester is waiting for your approval.", [
-                "title" => $title,
-                "requester" => $requester,
-            ]))
+            ->subject($this->buildSubject())
+            ->line($this->buildDescription())
             ->line(__("Vacation type: :type", [
                 "type" => $type,
             ]))
@@ -71,4 +65,37 @@ class VacationRequestWaitsForApprovalNotification extends Notification
             ]))
             ->action(__("Click here for details"), $url);
     }
+
+    protected function buildSubject(): string
+    {
+        $title = $this->vacationRequest->name;
+
+        if ($this->vacationRequest->state->equals(WaitingForTechnical::class)) {
+            return __("Vacation request :title is waiting for your technical approval", [
+                "title" => $title,
+            ]);
+        }
+
+        return __("Vacation request :title is waiting for your administrative approval", [
+            "title" => $title,
+        ]);
+    }
+
+    protected function buildDescription(): string
+    {
+        $title = $this->vacationRequest->name;
+        $requester = $this->vacationRequest->user->name;
+
+        if ($this->vacationRequest->state->equals(WaitingForTechnical::class)) {
+            return __("The vacation request :title from user: :requester is waiting for your technical approval.", [
+                "title" => $title,
+                "requester" => $requester,
+            ]);
+        }
+
+        return __("The vacation request :title from user: :requester is waiting for your administrative approval.", [
+            "title" => $title,
+            "requester" => $requester,
+        ]);
+    }
 }
diff --git a/app/Domain/TimesheetPerUserSheet.php b/app/Domain/TimesheetPerUserSheet.php
index 48098cf..ce7634a 100644
--- a/app/Domain/TimesheetPerUserSheet.php
+++ b/app/Domain/TimesheetPerUserSheet.php
@@ -187,7 +187,7 @@ class TimesheetPerUserSheet implements WithTitle, WithHeadings, WithEvents, With
     {
         return $user->vacations()
             ->with("vacationRequest")
-            ->whereRelation("vacationRequest", fn(Builder $query) => $query->whereIn("type", $this->types))
+            ->whereRelation("vacationRequest", fn(Builder $query): Builder => $query->whereIn("type", $this->types))
             ->whereBetween("date", [$period->start, $period->end])
             ->approved()
             ->get()
diff --git a/app/Domain/UserVacationStatsRetriever.php b/app/Domain/UserVacationStatsRetriever.php
index 3a8a6e6..21967cb 100644
--- a/app/Domain/UserVacationStatsRetriever.php
+++ b/app/Domain/UserVacationStatsRetriever.php
@@ -24,7 +24,7 @@ class UserVacationStatsRetriever
             ->whereBelongsTo($yearPeriod)
             ->whereRelation(
                 "vacationRequest",
-                fn(Builder $query) => $query
+                fn(Builder $query): Builder => $query
                     ->whereIn("type", $this->getLimitableVacationTypes())
                     ->states(VacationRequestStatesRetriever::successStates()),
             )
@@ -36,7 +36,7 @@ class UserVacationStatsRetriever
         return $user->vacations()
             ->whereRelation(
                 "vacationRequest",
-                fn(Builder $query) => $query
+                fn(Builder $query): Builder => $query
                     ->whereBelongsTo($yearPeriod)
                     ->whereIn("type", $this->getLimitableVacationTypes())
                     ->states(VacationRequestStatesRetriever::successStates()),
@@ -53,7 +53,7 @@ class UserVacationStatsRetriever
             ->whereBelongsTo($yearPeriod)
             ->whereRelation(
                 "vacationRequest",
-                fn(Builder $query) => $query
+                fn(Builder $query): Builder => $query
                     ->whereIn("type", $this->getLimitableVacationTypes())
                     ->states(VacationRequestStatesRetriever::pendingStates()),
             )
@@ -67,7 +67,7 @@ class UserVacationStatsRetriever
             ->whereBelongsTo($yearPeriod)
             ->whereRelation(
                 "vacationRequest",
-                fn(Builder $query) => $query
+                fn(Builder $query): Builder => $query
                     ->whereIn("type", $this->getNotLimitableVacationTypes())
                     ->states(VacationRequestStatesRetriever::successStates()),
             )
diff --git a/app/Domain/Validation/Rules/DoesNotExceedLimitRule.php b/app/Domain/Validation/Rules/DoesNotExceedLimitRule.php
index 74cb9d1..3fd5429 100644
--- a/app/Domain/Validation/Rules/DoesNotExceedLimitRule.php
+++ b/app/Domain/Validation/Rules/DoesNotExceedLimitRule.php
@@ -44,7 +44,7 @@ class DoesNotExceedLimitRule implements VacationRequestRule
         return $user->vacationLimits()
             ->whereBelongsTo($yearPeriod)
             ->first()
-            ->days ?? 0;
+            ?->days ?? 0;
     }
 
     protected function getVacationDaysWithLimit(User $user, YearPeriod $yearPeriod): int
@@ -53,7 +53,7 @@ class DoesNotExceedLimitRule implements VacationRequestRule
             ->whereBelongsTo($yearPeriod)
             ->whereRelation(
                 "vacationRequest",
-                fn(Builder $query) => $query
+                fn(Builder $query): Builder => $query
                     ->whereIn("type", $this->getLimitableVacationTypes())
                     ->noStates(VacationRequestStatesRetriever::failedStates()),
             )
diff --git a/app/Eloquent/Models/User.php b/app/Eloquent/Models/User.php
index d4f451c..7aab139 100644
--- a/app/Eloquent/Models/User.php
+++ b/app/Eloquent/Models/User.php
@@ -112,7 +112,7 @@ class User extends Authenticatable
     {
         return $query->whereRelation(
             "vacationlimits",
-            fn(Builder $query) => $query
+            fn(Builder $query): Builder => $query
                 ->whereBelongsTo($yearPeriod)
                 ->whereNotNull("days"),
         );
diff --git a/app/Eloquent/Models/Vacation.php b/app/Eloquent/Models/Vacation.php
index 6313d07..a602042 100644
--- a/app/Eloquent/Models/Vacation.php
+++ b/app/Eloquent/Models/Vacation.php
@@ -47,7 +47,7 @@ class Vacation extends Model
     {
         return $query->whereRelation(
             "vacationRequest",
-            fn(Builder $query) => $query->states(VacationRequestStatesRetriever::successStates()),
+            fn(Builder $query): Builder => $query->states(VacationRequestStatesRetriever::successStates()),
         );
     }
 
@@ -55,7 +55,7 @@ class Vacation extends Model
     {
         return $query->whereRelation(
             "vacationRequest",
-            fn(Builder $query) => $query->states(VacationRequestStatesRetriever::pendingStates()),
+            fn(Builder $query): Builder => $query->states(VacationRequestStatesRetriever::pendingStates()),
         );
     }
 }
diff --git a/app/Infrastructure/Http/Controllers/AnnualSummaryController.php b/app/Infrastructure/Http/Controllers/AnnualSummaryController.php
index c8394c6..83517dd 100644
--- a/app/Infrastructure/Http/Controllers/AnnualSummaryController.php
+++ b/app/Infrastructure/Http/Controllers/AnnualSummaryController.php
@@ -35,9 +35,19 @@ class AnnualSummaryController extends Controller
             ->get();
 
         return inertia("AnnualSummary", [
-            "holidays" => $holidays->mapWithKeys(fn(Holiday $holiday) => [$holiday->date->toDateString() => $holiday->name]),
-            "vacations" => $vacations->mapWithKeys(fn(Vacation $vacation) => [$vacation->date->toDateString() => new SimpleVacationRequestResource($vacation->vacationRequest)]),
-            "pendingVacations" => $pendingVacations->mapWithKeys(fn(Vacation $vacation) => [$vacation->date->toDateString() => new SimpleVacationRequestResource($vacation->vacationRequest)]),
+            "holidays" => $holidays->mapWithKeys(
+                fn(Holiday $holiday): array => [$holiday->date->toDateString() => $holiday->name],
+            ),
+            "vacations" => $vacations->mapWithKeys(
+                fn(Vacation $vacation): array => [
+                    $vacation->date->toDateString() => new SimpleVacationRequestResource($vacation->vacationRequest),
+                ],
+            ),
+            "pendingVacations" => $pendingVacations->mapWithKeys(
+                fn(Vacation $vacation): array => [
+                    $vacation->date->toDateString() => new SimpleVacationRequestResource($vacation->vacationRequest),
+                ],
+            ),
         ]);
     }
 }
diff --git a/app/Infrastructure/Http/Controllers/Api/CalculateUserUnavailableDaysController.php b/app/Infrastructure/Http/Controllers/Api/CalculateUserUnavailableDaysController.php
index 44715f7..5e4afe5 100644
--- a/app/Infrastructure/Http/Controllers/Api/CalculateUserUnavailableDaysController.php
+++ b/app/Infrastructure/Http/Controllers/Api/CalculateUserUnavailableDaysController.php
@@ -30,13 +30,13 @@ class CalculateUserUnavailableDaysController extends Controller
             ->whereBelongsTo($yearPeriod)
             ->whereRelation(
                 "vacationRequest",
-                fn(Builder $query) => $query->noStates(VacationRequestStatesRetriever::failedStates()),
+                fn(Builder $query): Builder => $query->noStates(VacationRequestStatesRetriever::failedStates()),
             )
             ->pluck("date");
 
         return new JsonResponse([
-            ...$holidays->map(fn(Carbon $date) => $date->toDateString()),
-            ...$vacationDays->map(fn(Carbon $date) => $date->toDateString()),
+            ...$holidays->map(fn(Carbon $date): string => $date->toDateString()),
+            ...$vacationDays->map(fn(Carbon $date): string => $date->toDateString()),
         ]);
     }
 }
diff --git a/app/Infrastructure/Http/Controllers/VacationRequestController.php b/app/Infrastructure/Http/Controllers/VacationRequestController.php
index fd6b711..917110c 100644
--- a/app/Infrastructure/Http/Controllers/VacationRequestController.php
+++ b/app/Infrastructure/Http/Controllers/VacationRequestController.php
@@ -92,10 +92,10 @@ class VacationRequestController extends Controller
         $vacationRequests = VacationRequest::query()
             ->with(["user", "vacations"])
             ->whereBelongsTo($yearPeriod)
-            ->when($user !== null, fn(Builder $query) => $query->where("user_id", $user))
+            ->when($user !== null, fn(Builder $query): Builder => $query->where("user_id", $user))
             ->when(
                 $status !== null,
-                fn(Builder $query) => $query->states(
+                fn(Builder $query): Builder => $query->states(
                     VacationRequestStatesRetriever::filterByStatusGroup($status, $request->user()),
                 ),
             )
-- 
2.52.0


From c58d982f985e3439a0081307daa43977282b4e64 Mon Sep 17 00:00:00 2001
From: Adrian Hopek <adrian.hopek@blumilk.pl>
Date: Thu, 7 Apr 2022 14:04:51 +0200
Subject: [PATCH 13/13] fix

---
 ...ionRequestWaitsForApprovalNotification.php | 45 ++++---------------
 1 file changed, 9 insertions(+), 36 deletions(-)

diff --git a/app/Domain/Notifications/VacationRequestWaitsForApprovalNotification.php b/app/Domain/Notifications/VacationRequestWaitsForApprovalNotification.php
index a737a81..4e9199c 100644
--- a/app/Domain/Notifications/VacationRequestWaitsForApprovalNotification.php
+++ b/app/Domain/Notifications/VacationRequestWaitsForApprovalNotification.php
@@ -8,7 +8,6 @@ use Illuminate\Bus\Queueable;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Notification;
 use InvalidArgumentException;
-use Toby\Domain\States\VacationRequest\WaitingForTechnical;
 use Toby\Eloquent\Models\User;
 use Toby\Eloquent\Models\VacationRequest;
 
@@ -44,6 +43,8 @@ class VacationRequestWaitsForApprovalNotification extends Notification
     protected function buildMailMessage(string $url): MailMessage
     {
         $user = $this->user->first_name;
+        $requester = $this->vacationRequest->user->fullName;
+        $title = $this->vacationRequest->name;
         $type = $this->vacationRequest->type->label();
         $from = $this->vacationRequest->from->toDisplayString();
         $to = $this->vacationRequest->to->toDisplayString();
@@ -53,8 +54,13 @@ class VacationRequestWaitsForApprovalNotification extends Notification
             ->greeting(__("Hi :user!", [
                 "user" => $user,
             ]))
-            ->subject($this->buildSubject())
-            ->line($this->buildDescription())
+            ->subject(__("Vacation request :title is waiting for your approval", [
+                "title" => $title,
+            ]))
+            ->line(__("The vacation request :title from user: :requester is waiting for your approval.", [
+                "title" => $title,
+                "requester" => $requester,
+            ]))
             ->line(__("Vacation type: :type", [
                 "type" => $type,
             ]))
@@ -65,37 +71,4 @@ class VacationRequestWaitsForApprovalNotification extends Notification
             ]))
             ->action(__("Click here for details"), $url);
     }
-
-    protected function buildSubject(): string
-    {
-        $title = $this->vacationRequest->name;
-
-        if ($this->vacationRequest->state->equals(WaitingForTechnical::class)) {
-            return __("Vacation request :title is waiting for your technical approval", [
-                "title" => $title,
-            ]);
-        }
-
-        return __("Vacation request :title is waiting for your administrative approval", [
-            "title" => $title,
-        ]);
-    }
-
-    protected function buildDescription(): string
-    {
-        $title = $this->vacationRequest->name;
-        $requester = $this->vacationRequest->user->name;
-
-        if ($this->vacationRequest->state->equals(WaitingForTechnical::class)) {
-            return __("The vacation request :title from user: :requester is waiting for your technical approval.", [
-                "title" => $title,
-                "requester" => $requester,
-            ]);
-        }
-
-        return __("The vacation request :title from user: :requester is waiting for your administrative approval.", [
-            "title" => $title,
-            "requester" => $requester,
-        ]);
-    }
 }
-- 
2.52.0