From c154c51ef46d8c27f449cc64e2a9fcc44e797957 Mon Sep 17 00:00:00 2001 From: Kamil Niemczycki Date: Fri, 3 Jun 2022 13:18:27 +0200 Subject: [PATCH] #157 - prepared clikable days for calendar of holidays --- app/Domain/CalendarGenerator.php | 1 + resources/js/Composables/vacationTypeInfo.js | 8 +++++ resources/js/Pages/Calendar.vue | 33 ++++++++++++++++++-- 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/app/Domain/CalendarGenerator.php b/app/Domain/CalendarGenerator.php index b1c6c0f..f2c69f3 100644 --- a/app/Domain/CalendarGenerator.php +++ b/app/Domain/CalendarGenerator.php @@ -42,6 +42,7 @@ class CalendarGenerator "isToday" => $day->isToday(), "isWeekend" => $day->isWeekend(), "isHoliday" => $holidays->contains($day), + "isFuture" => $day->isToday() || $day >= Carbon::now(), "vacations" => $vacationsForDay->pluck("user_id"), "vacationTypes" => $vacationsForDay->pluck("vacationRequest.type", "user_id"), ]; diff --git a/resources/js/Composables/vacationTypeInfo.js b/resources/js/Composables/vacationTypeInfo.js index 3bd73b9..75adc75 100644 --- a/resources/js/Composables/vacationTypeInfo.js +++ b/resources/js/Composables/vacationTypeInfo.js @@ -9,6 +9,7 @@ import CalendarCheckIcon from 'vue-material-design-icons/CalendarCheck.vue' import MedicalBagIcon from 'vue-material-design-icons/MedicalBag.vue' import CalendarRemoveIcon from 'vue-material-design-icons/CalendarRemove.vue' import HomeCityIcon from 'vue-material-design-icons/HomeCity.vue' +import BookPlusIcon from 'vue-material-design-icons/BookPlus.vue' const types = [ { @@ -88,6 +89,13 @@ const types = [ color: 'text-lime-500', border: 'border-lime-500', }, + { + text: 'Złóż wniosek', + value: 'create', + icon: BookPlusIcon, + color: 'text-blumilk-700', + border: 'border-lime-500', + }, ] export default function useVacationTypeInfo() { diff --git a/resources/js/Pages/Calendar.vue b/resources/js/Pages/Calendar.vue index b913c2c..50a30d2 100644 --- a/resources/js/Pages/Calendar.vue +++ b/resources/js/Pages/Calendar.vue @@ -100,7 +100,9 @@ v-for="day in calendar" :key="day.dayOfMonth" class="border border-gray-300" - :class="{ 'bg-blumilk-25': day.isToday, 'bg-red-100': day.isWeekend || day.isHoliday}" + :class="{ 'bg-blumilk-25': day.isToday, 'bg-red-100': day.isWeekend || day.isHoliday }" + @mouseover="setActiveBtn(user.id.toString() + '' + day.date)" + @mouseleave="unsetActiveBtn" >
+ +
+ +
+
@@ -118,7 +132,7 @@