- added new line in file

app/Infrastructure/Http/Controllers/DashboardController.php

@@ -12,8 +12,11 @@ use Toby\Domain\UserVacationStatsRetriever;
 use Toby\Domain\VacationRequestStatesRetriever;
 use Toby\Domain\VacationTypeConfigRetriever;
 use Toby\Eloquent\Helpers\YearPeriodRetriever;
+use Toby\Eloquent\Models\Holiday;
+use Toby\Eloquent\Models\Vacation;
 use Toby\Eloquent\Models\VacationRequest;
 use Toby\Infrastructure\Http\Resources\HolidayResource;
+use Toby\Infrastructure\Http\Resources\SimpleVacationRequestResource;
 use Toby\Infrastructure\Http\Resources\VacationRequestResource;
 use Toby\Infrastructure\Http\Resources\VacationResource;
 
@@ -54,6 +57,22 @@ class DashboardController extends Controller
             ->limit(3)
             ->get();
 
+        $allHolidays = $yearPeriod->holidays;
+
+        $approvedVacations = $request->user()
+            ->vacations()
+            ->with("vacationRequest.vacations")
+            ->whereBelongsTo($yearPeriod)
+            ->approved()
+            ->get();
+
+        $pendingVacations = $request->user()
+            ->vacations()
+            ->with("vacationRequest.vacations")
+            ->whereBelongsTo($yearPeriod)
+            ->pending()
+            ->get();
+
         $limit = $vacationStatsRetriever->getVacationDaysLimit($user, $yearPeriod);
         $used = $vacationStatsRetriever->getUsedVacationDays($user, $yearPeriod);
         $pending = $vacationStatsRetriever->getPendingVacationDays($user, $yearPeriod);
@@ -66,6 +85,19 @@ class DashboardController extends Controller
             "remoteDays" => VacationResource::collection($remoteDays),
             "vacationRequests" => VacationRequestResource::collection($vacationRequests),
             "holidays" => HolidayResource::collection($holidays),
+            "allHolidays" => $allHolidays->mapWithKeys(
+                fn(Holiday $holiday): array => [$holiday->date->toDateString() => $holiday->name],
+            ),
+            "approvedVacations" => $approvedVacations->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),
+                ],
+            ),
             "stats" => [
                 "limit" => $limit,
                 "remaining" => $remaining,

resources/js/Pages/Calendar.vue

@@ -55,20 +55,18 @@
       </div>
     </div>
     <div class="overflow-x-auto">
-      <table class="w-full text-sm text-center border-y border-r border-gray-300">
+      <table class="w-full text-sm text-center border border-gray-300">
         <thead>
           <tr>
-            <th
-              class="py-2 w-64 text-lg font-semibold text-gray-800 border-y border-gray-300 bg-white sticky left-0 sticky-border"
-            >
+            <th class="py-2 w-64 text-lg font-semibold text-gray-800 border border-gray-300">
               <div class="flex justify-center items-center">
-                {{ selectedMonth.name }}
+                {{ selectedMonth.name }} {{ years.selected.year }}
               </div>
             </th>
             <th
               v-for="day in calendar"
               :key="day.dayOfMonth"
-              class="p-2 text-lg font-semibold text-gray-900 border second:border-l-0 border-gray-300"
+              class="p-2 text-lg font-semibold text-gray-900 border border-gray-300"
               style="min-width: 46px;"
               :class="{ 'bg-red-100 text-red-800': day.isWeekend || day.isHoliday, 'text-blumilk-600 bg-blumilk-25': day.isToday }"
             >
@@ -86,28 +84,22 @@
             v-for="user in users.data"
             :key="user.id"
           >
-            <th
-              class="p-2 border-y border-gray-300 bg-white sticky left-0 sticky-border"
-            >
+            <th class="p-2 border border-gray-300">
               <div class="flex justify-start items-center">
                 <span class="inline-flex justify-center items-center w-8 h-8 rounded-full">
                   <img :src="user.avatar">
                 </span>
-                <div class="ml-3 flex items-start flex-col-reverse md:flex-row">
-                  <span
-                    v-for="split in user.name.split(' ', 2)"
-                    :key="split"
-                    class="text-sm first:text-xs md:first:text-sm font-medium text-gray-900 truncate first:mr-1"
-                  >
-                    {{ split }}
-                  </span>
+                <div class="ml-3">
+                  <div class="text-sm font-medium text-gray-900 truncate">
+                    {{ user.name }}
+                  </div>
                 </div>
               </div>
             </th>
             <td
               v-for="day in calendar"
               :key="day.dayOfMonth"
-              class="border second:border-l-0 border-gray-300"
+              class="border border-gray-300"
               :class="{ 'bg-blumilk-25': day.isToday, 'bg-red-100': day.isWeekend || day.isHoliday }"
               @mouseover="setActiveDay(user.id + '+' + day.date)"
               @mouseleave="unsetActiveDay"
@@ -184,10 +176,3 @@ function linkParameters(user, day) {
   return props.can.createOnBehalfOfEmployee ? { user: user.id, from_date: day.date } : { from_date: day.date }
 }
 </script>
-
-<style lang="css">
-.sticky-border {
-  box-shadow: inset -1px 0 rgb(209 213 219 / 1),
-              inset 1px 0 rgb(209 213 219 / 1);
-}
-</style>

resources/js/Pages/Dashboard.vue

@@ -3,11 +3,14 @@
   <div class="grid grid-cols-1 gap-4 items-start xl:grid-cols-3 xl:gap-8">
     <div class="grid grid-cols-1 gap-4 xl:col-span-2">
       <Welcome :user="auth.user" />
-      <VacationCalendar />
+      <VacationCalendar
+        :holidays="allHolidays"
+        :approved-vacations="approvedVacations"
+        :pending-vacations="pendingVacations"
+      />
       <VacationStats :stats="stats" />
     </div>
     <div class="grid grid-cols-1 gap-4">
-      <VacationCalendar />
       <PendingVacationRequests
         v-if="can.listAllVacationRequests"
         :requests="vacationRequests.data"
@@ -51,5 +54,8 @@ defineProps({
   can: Object,
   stats: Object,
   years: Object,
+  allHolidays: Object,
+  approvedVacations: Object,
+  pendingVacations: Object,
 })
 </script>

resources/js/Pages/MonthlyUsage.vue

@@ -9,11 +9,11 @@
       </div>
     </div>
     <div class="border-t border-gray-200">
-      <div class="overflow-x-auto xl:overflow-x-visible">
+      <div class="overflow-x-auto overflow-y-hidden xl:overflow-x-visible">
         <table class="min-w-full divide-y divide-gray-200">
           <thead class="bg-gray-50">
             <tr>
-              <th class="py-3 px-6 w-64 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase bg-gray-50 sticky -left-1">
+              <th class="py-3 px-6 w-64 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase">
                 Pracownik
               </th>
               <th
@@ -38,7 +38,7 @@
               :key="item.user.id"
               class="hover:bg-blumilk-25"
             >
-              <th class="p-4 text-sm font-semibold text-gray-500 capitalize whitespace-nowrap bg-white sticky -left-1">
+              <th class="p-4 text-sm font-semibold text-gray-500 capitalize whitespace-nowrap">
                 <div class="flex justify-start items-center">
                   <span class="inline-flex justify-center items-center w-10 h-10 rounded-full">
                     <img
@@ -46,14 +46,12 @@
                       :src="item.user.avatar"
                     >
                   </span>
-                  <div class="ml-3 flex items-start flex-col-reverse md:flex-row">
-                    <span
-                      v-for="split in item.user.name.split(' ', 2)"
-                      :key="split"
-                      class="text-sm first:text-xs md:first:text-sm font-medium text-gray-900 truncate first:mr-1"
+                  <div class="ml-3">
+                    <div
+                      class="text-sm font-medium text-gray-900 whitespace-nowrap"
                     >
-                      {{ split }}
-                    </span>
+                      {{ item.user.name }}
+                    </div>
                   </div>
                 </div>
               </th>

resources/js/Pages/VacationRequest/IndexForApprovers.vue

@@ -242,12 +242,46 @@
         <thead class="bg-gray-50">
           <tr>
             <th
-              v-for="head in headers"
-              :key="head"
               scope="col"
               class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
             >
-              {{ head }}
+              Numer
+            </th>
+            <th
+              scope="col"
+              class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
+            >
+              Pracownik
+            </th>
+            <th
+              scope="col"
+              class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
+            >
+              Rodzaj wniosku
+            </th>
+            <th
+              scope="col"
+              class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
+            >
+              Od
+            </th>
+            <th
+              scope="col"
+              class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
+            >
+              Do
+            </th>
+            <th
+              scope="col"
+              class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
+            >
+              Dni urlopu
+            </th>
+            <th
+              scope="col"
+              class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
+            >
+              Status
             </th>
             <th scope="col" />
           </tr>
@@ -347,8 +381,6 @@ const props = defineProps({
   types: Object,
 })
 
-const headers = ['Numer', 'Pracownik', 'Rodzaj wniosku', 'Od', 'Do', 'Dni urlopu', 'Status']
-
 const statuses = [
   {
     name: 'Wszystkie',

resources/js/Shared/Widgets/Calendar/DayComponent.vue

@@ -0,0 +1,104 @@
+<template>
+  <div
+    :class="[ (day.isVacation || day.isPendingVacation) && `border-b-2 border-dashed ${getVacationBorder(day)}` ]"
+  >
+    <Popper
+      v-if="day.isHoliday"
+      as="div"
+      open-delay="200"
+      hover
+      offset-distance="0"
+      @mouseover.passive="onMouseover"
+      @mouseleave="onMouseleave"
+    >
+      <time
+        :datetime="day.date"
+        :class="[ day.isToday && 'flex h-6 w-6 items-center justify-center rounded-full bg-blumilk-500 font-semibold text-white', 'text-red-600' ]"
+      >
+        {{ day.dayNumber }}
+      </time>
+      <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">
+          {{ getHolidayDescription(day) }}
+        </div>
+      </template>
+    </Popper>
+    <Popper
+      v-else-if="day.isPendingVacation"
+      as="div"
+      open-delay="200"
+      hover
+      offset-distance="0"
+      @mouseover.passive="onMouseover"
+      @mouseleave="onMouseleave"
+    >
+      <time
+        :datetime="day.date"
+        :class="[ day.isToday && 'flex h-6 w-6 items-center justify-center rounded-full bg-blumilk-500 font-semibold text-white' ]"
+      >
+        {{ day.dayNumber }}
+      </time>
+      <template #content>
+        <VacationPopup :vacation="getVacationInfo(day)" />
+      </template>
+    </Popper>
+    <div
+      v-else-if="day.isWeekend"
+    >
+      <time
+        :datetime="day.date"
+        :class="{ 'flex h-6 w-6 items-center justify-center rounded-full bg-blumilk-500 font-semibold text-white': day.isToday }"
+      >
+        {{ day.dayNumber }}
+      </time>
+    </div>
+    <InertiaLink
+      v-else
+      href="/vacation/requests/create"
+      :data="{ 'from_date': day.date }"
+      @mouseover.passive="onMouseover"
+      @mouseleave="onMouseleave"
+    >
+      <time
+        :datetime="day.date"
+        :class="{ 'flex h-6 w-6 items-center justify-center rounded-full bg-blumilk-500 font-semibold text-white': day.isToday }"
+      >
+        {{ day.dayNumber }}
+      </time>
+    </InertiaLink>
+  </div>
+</template>
+
+<script setup>
+import Popper from 'vue3-popper'
+import { defineProps, ref } from 'vue'
+import VacationPopup from '@/Shared/VacationPopup'
+
+defineProps({
+  day: {
+    type: Object,
+    required: true,
+  },
+  getHolidayDescription: {
+    type: Function,
+  },
+  getVacationBorder: {
+    type: Function,
+  },
+  getVacationInfo: {
+    type: Function,
+  },
+})
+
+const isActive = ref(false)
+
+function onMouseover() {
+  if (!isActive.value)
+    isActive.value = true
+}
+
+function onMouseleave() {
+  if (isActive.value)
+    isActive.value = false
+}
+</script>

resources/js/Shared/Widgets/VacationCalendar.vue

@@ -120,19 +120,16 @@
           class="w-full grid grid-cols-7 gap-px"
           :class="{ 'grid-rows-1': calendarState.viewMode.isWeek }"
         >
-          <div
+          <DayComponent
             v-for="(day, index) in days"
             :key="index"
-            class="flex flex-col"
-            :class="[day.isCurrentMonth ? 'bg-white' : 'bg-gray-50 text-gray-500', calendarState.viewMode.isWeek && index !== 0 && (index % 5 === 0 || index % 6 === 0) ? 'bg-red-100' : undefined, calendarState.viewMode.isWeek ? 'day' : 'month-day', 'relative py-2 px-3']"
-          >
-            <time
-              :datetime="day.date"
-              :class="day.isToday ? 'flex h-6 w-6 items-center justify-center rounded-full bg-indigo-600 font-semibold text-white' : undefined"
-            >
-              {{ day.date.split('-').pop().replace(/^0/, '') }}
-            </time>
-          </div>
+            :day="day"
+            class="flex flex-col relative py-2 px-3"
+            :class="[day.isCurrentMonth ? 'bg-white' : 'bg-gray-50 text-gray-500', { 'hover:bg-blumilk-25': day.isCurrentMonth && !day.isWeekend }, { 'day': calendarState.viewMode.isWeek }, { 'bg-red-100': day.isCurrentMonth && day.isWeekend }, { 'bg-red-50': !day.isCurrentMonth && day.isWeekend }, { 'text-red-800': day.isWeekend }]"
+            :get-holiday-description="getHolidayDescription"
+            :get-vacation-border="getVacationBorder"
+            :get-vacation-info="getVacationInfo"
+          />
         </div>
       </div>
     </div>
@@ -144,19 +141,30 @@ import { CheckIcon, ChevronDownIcon, ChevronLeftIcon, ChevronRightIcon } from '@
 import { Menu, MenuButton, MenuItem, MenuItems } from '@headlessui/vue'
 import { ref, watch, computed, reactive } from 'vue'
 import { DateTime } from 'luxon'
+import useVacationTypeInfo from '@/Composables/vacationTypeInfo'
 import useCurrentYearPeriodInfo from '@/Composables/yearPeriodInfo'
 import { useMonthInfo } from '@/Composables/monthInfo'
 import { viewModes, find as findViewMode } from '@/Shared/Widgets/Calendar/ViewModeOptions'
+import DayComponent from '@/Shared/Widgets/Calendar/DayComponent'
+
+const props = defineProps({
+  holidays: Object,
+  approvedVacations: Object,
+  pendingVacations: Object,
+})
 
 let days = ref([])
-const months = useMonthInfo().getMonths()
+
 function getCurrentDate() {
   const { year, month, weekNumber } = DateTime.now()
   return { year, month, week: weekNumber }
 }
-const selectedYear = useCurrentYearPeriodInfo().year.value
 const currentDate = getCurrentDate()
 
+const months = useMonthInfo().getMonths()
+const { findType } = useVacationTypeInfo()
+const selectedYear = useCurrentYearPeriodInfo().year.value
+
 const calendar = {
   viewMode: ref('week'),
   currents: reactive({
@@ -179,7 +187,7 @@ const calendarState = reactive({
 })
 
 const customCalendar = {
-  generateCalendar() {
+  loadCalendar() {
     const date = DateTime.fromObject({
       year: calendar.currents.year,
       month: calendarState.viewMode.isMonth ? calendar.currents.month : 1,
@@ -221,33 +229,38 @@ const customCalendar = {
     return days
   },
   prepareDay(day) {
+    const isCurrentMonth = isInCurrentMonth(day)
     return {
       date: day.toISODate(),
       dayNumber: day.day,
-      isCurrentMonth: isInCurrentMonth(day),
+      isCurrentMonth: isCurrentMonth,
       isToday: isToday(day),
+      isWeekend: isWeekend(day),
+      isHoliday: isHoliday(day),
+      isVacation: isCurrentMonth && isVacation(day),
+      isPendingVacation: isCurrentMonth && isPendingVacation(day),
     }
   },
 }
 
 watch([calendar.viewMode, calendar.currents], () => {
-  customCalendar.generateCalendar()
+  customCalendar.loadCalendar()
 })
 
-customCalendar.generateCalendar()
+customCalendar.loadCalendar()
 
 function toLast() {
   if (calendar.viewMode.value === 'week')
     minusWeek()
   else
-    addMonths(-1)
+    minusMonth()
 }
 
 function toNext() {
-  if (calendar.viewMode.value === 'week') {
+  if (calendar.viewMode.value === 'week')
     addWeek()
-  } else
-    addMonths()
+  else
+    addMonth()
 }
 
 function resetCalendar(config = {}) {
@@ -256,7 +269,7 @@ function resetCalendar(config = {}) {
 
   calendar.currents.year = isUndefined(config.year) ? selectedYear : config.month
   calendar.currents.month = calendarState.isActualYear || !isUndefined(config.year) ? currentMonth : 1
-  calendar.currents.week = calendarState.isActualYear || !isUndefined(config.year) ? currentWeek : 1
+  calendar.currents.week = calendarState.isActualYear || !isUndefined(config.week) ? currentWeek : 0
 }
 
 function isUndefined(value) {
@@ -275,15 +288,10 @@ function addWeek(minus = false) {
 
   const startWeekDay = date.startOf('week'), endWeekDay = date.endOf('week')
   nextMonth = howMany > 0 ? startWeekDay.month : endWeekDay.month
-  if (howMany < 0 && endWeekDay.day === endWeekDay.daysInMonth) {
-    console.log('pre', endWeekDay.day, endWeekDay.daysInMonth)
+  if (howMany < 0 && endWeekDay.day === endWeekDay.daysInMonth)
     calendar.currents.week--
-  } else if (howMany > 0 && startWeekDay.day === 1) {
-    console.log('next', endWeekDay.day, endWeekDay.daysInMonth)
+  else if (howMany > 0 && startWeekDay.day === 1)
     calendar.currents.week++
-  } else {
-    console.log('else', endWeekDay.day, endWeekDay.daysInMonth)
-  }
 
   if (nextMonth !== calendar.currents.month) {
     calendar.currents.month = calendar.currents.week > 1 ? nextMonth : 1
@@ -298,8 +306,12 @@ function minusWeek() {
   addWeek(true)
 }
 
-function addMonths(howMany = 1) {
-  calendar.currents.month += howMany
+function addMonth(minus = false) {
+  calendar.currents.month += minus ? -1 : 1
+}
+
+function minusMonth() {
+  addMonth(true)
 }
 
 function goToToday() {
@@ -308,7 +320,7 @@ function goToToday() {
 
 function updateViewMode(type) {
   if (type === 'month')
-    resetCalendar({ week: 1 })
+    resetCalendar({ week: 0 })
   else
     resetCalendar()
   calendar.viewMode.value = type
@@ -318,9 +330,37 @@ function isInCurrentMonth(date) {
   return calendar.currents.month === date.month
 }
 
+function isWeekend(date) {
+  return date.weekday === 6 || date.weekday === 7
+}
+
 function isToday(date) {
   return date.toISODate() === DateTime.local().toISODate()
 }
+
+function isHoliday(date) {
+  return props.holidays[date.toISODate()] !== undefined
+}
+
+function getHolidayDescription(day) {
+  return props.holidays[day.date]
+}
+
+function isVacation(date) {
+  return props.approvedVacations[date.toISODate()] !== undefined
+}
+
+function isPendingVacation(date) {
+  return props.pendingVacations[date.toISODate()] !== undefined
+}
+
+function getVacationBorder(day) {
+  return findType(getVacationInfo(day).type)?.border
+}
+
+function getVacationInfo(day) {
+  return day.isVacation ? props.approvedVacations[day.date] : props.pendingVacations[day.date]
+}
 </script>
 
 <style lang="css">
@@ -344,11 +384,6 @@ function isToday(date) {
   content: "Pt";
 }
 
-.day:nth-of-type(7n - 1):before,
-.day:nth-of-type(7n):before {
-  color: #991b1b;
-}
-
 .day:nth-of-type(7n - 1):before {
   content: "Sb";
 }
@@ -356,8 +391,4 @@ function isToday(date) {
 .day:nth-of-type(7n):before {
   content: "Nd";
 }
-
-.month-day:nth-of-type(7n - 1), .month-day:nth-of-type(7n) {
-  background-color: #fee2e2;
-}
 </style>

tailwind.config.js

@@ -1,5 +1,4 @@
 const defaultTheme = require('tailwindcss/defaultTheme')
-const plugin = require('tailwindcss/plugin')
 
 module.exports = {
   content: [
@@ -32,12 +31,5 @@ module.exports = {
     require('@tailwindcss/forms'),
     require('@tailwindcss/typography'),
     require('@tailwindcss/line-clamp'),
-    plugin(function({ addVariant, e }) {
-      addVariant('second', ({ modifySelectors, separator }) => {
-        modifySelectors(({ className }) => {
-          return `.${e(`second${separator}${className}`)}:nth-child(2)`
-        })
-      })
-    }),
   ],
 }