diff --git a/app/Domain/CalendarGenerator.php b/app/Domain/CalendarGenerator.php index d1f6cb8..b1c6c0f 100644 --- a/app/Domain/CalendarGenerator.php +++ b/app/Domain/CalendarGenerator.php @@ -42,7 +42,6 @@ class CalendarGenerator "isToday" => $day->isToday(), "isWeekend" => $day->isWeekend(), "isHoliday" => $holidays->contains($day), - "isFuture" => $day->isFuture(), "vacations" => $vacationsForDay->pluck("user_id"), "vacationTypes" => $vacationsForDay->pluck("vacationRequest.type", "user_id"), ]; diff --git a/resources/js/Pages/AnnualSummary.vue b/resources/js/Pages/AnnualSummary.vue index 939a424..ae13b92 100644 --- a/resources/js/Pages/AnnualSummary.vue +++ b/resources/js/Pages/AnnualSummary.vue @@ -74,7 +74,7 @@ - + {{ day.date.day }} + +
= DateTime.now().toISODate().toString() -} - function isInCurrentMonth(date, currentMonth) { return currentMonth.hasSame(date, 'month') } @@ -215,12 +195,3 @@ function getVacationInfo(day) { return day.isVacation ? props.vacations[day.date.toISODate()] : props.pendingVacations[day.date.toISODate()] } - - diff --git a/resources/js/Pages/Calendar.vue b/resources/js/Pages/Calendar.vue index 4f8ba54..00dfaf1 100644 --- a/resources/js/Pages/Calendar.vue +++ b/resources/js/Pages/Calendar.vue @@ -111,7 +111,7 @@