finish with week? #VC

resources/js/Shared/Widgets/Calendar/ViewModeOptions.js

@@ -0,0 +1,12 @@
+function isViewModeKey(key) {
+  return this.key === key.value
+}
+
+export const viewModes = [
+  { key: 'week', name: 'Widok tygodnia', shortcut: 'Tydzień', is: isViewModeKey },
+  { key: 'month', name: 'Widok miesiąca', shortcut: 'Miesiąc', is: isViewModeKey },
+]
+
+export function find(modeKey) {
+  return viewModes.find(mode => mode.key === modeKey)
+}

resources/js/Shared/Widgets/VacationCalendar.vue

@@ -2,17 +2,17 @@
   <section class="bg-white shadow-md">
     <div class="grid grid-cols-3 grid-rows-1 items-center justify-center p-4 sm:px-6">
       <h2 class="text-lg font-medium leading-6 text-gray-900">
-        {{ monthName }} {{ calendar.currents.year !== selectedYear ? calendar.currents.year : undefined }}
+        {{ calendarState.monthName }} {{ !calendarState.isActualYear ? calendar.currents.year : undefined }}
       </h2>
       <div class="flex justify-center">
         <div class="flex items-center rounded-md shadow-sm md:items-stretch">
           <button
-            v-if="calendar.currents.month > 1"
+            v-if="calendarState.isPrevious"
             type="button"
             class="flex items-center justify-center rounded-l-md border border-r-0 border-gray-300 bg-white py-2 pl-3 pr-4 text-gray-400 hover:text-gray-500 focus:relative md:w-9 md:px-2 md:hover:bg-gray-50"
             @click="toLast"
           >
-            <span class="sr-only">Previous {{ viewMode.key }}</span>
+            <span class="sr-only">Poprzedni {{ calendarState.viewMode.details.shortcut }}</span>
             <ChevronLeftIcon
               class="h-5 w-5"
               aria-hidden="true"
@@ -21,19 +21,19 @@
           <button
             type="button"
             class="hidden border-t border-b border-gray-300 bg-white px-3.5 text-sm font-medium text-gray-700 hover:bg-gray-50 hover:text-gray-900 focus:relative md:block"
-            :class="[calendar.currents.month === 1 ? 'rounded-l-md border border-r-0' : undefined, calendar.currents.month === 12 ? 'rounded-r-md border border-l-0' : undefined]"
+            :class="{ 'rounded-l-md border border-r-0': !calendarState.isPrevious, 'rounded-r-md border border-l-0': !calendarState.isNext }"
-            @click="resetCalendar"
+            @click="goToToday"
           >
-            Today
+            Dziś
           </button>
           <span class="relative -mx-px h-5 w-px bg-gray-300 md:hidden" />
           <button
-            v-if="calendar.currents.month < 12"
+            v-if="calendarState.isNext"
             type="button"
             class="flex items-center justify-center rounded-r-md border border-l-0 border-gray-300 bg-white py-2 pl-4 pr-3 text-gray-400 hover:text-gray-500 focus:relative md:w-9 md:px-2 md:hover:bg-gray-50"
             @click="toNext"
           >
-            <span class="sr-only">Next {{ viewMode.key }}</span>
+            <span class="sr-only">Następny {{ calendarState.viewMode.details.shortcut }}</span>
             <ChevronRightIcon
               class="h-5 w-5"
               aria-hidden="true"
@@ -49,7 +49,7 @@
           type="button"
           class="flex items-center rounded-md border border-gray-300 bg-white py-2 pl-3 pr-2 text-sm font-medium text-gray-700 shadow-sm hover:bg-gray-50"
         >
-          {{ viewMode.name }}
+          {{ calendarState.viewMode.details.name }}
           <ChevronDownIcon
             class="ml-2 h-5 w-5 text-gray-400"
             aria-hidden="true"
@@ -68,7 +68,7 @@
           <MenuItems class="absolute right-0 mt-3 w-36 origin-top-right overflow-hidden rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none">
             <div class="py-1">
               <MenuItem
-                v-for="option in viewModeOptions"
+                v-for="option in viewModes"
                 :key="option.key"
                 v-slot="{ active }"
               >
@@ -76,9 +76,9 @@
                   :class="[active ? 'bg-gray-100 text-gray-900' : 'text-gray-700', 'flex px-4 py-2 text-sm text-left w-full']"
                   @click="updateViewMode(option.key)"
                 >
-                  {{ option.name }}
+                  {{ option.shortcut }}
                   <CheckIcon
-                    v-if="option.key === viewMode.key"
+                    v-if="option.is(calendar.viewMode)"
                     class="ml-2 w-5 h-5 text-blumilk-500"
                   />
                 </button>
@@ -90,7 +90,7 @@
     </div>
     <div class="ring-1 ring-black ring-opacity-5 lg:flex lg:flex-auto lg:flex-col">
       <div
-        v-if="viewMode.key === 'month'"
+        v-if="calendarState.viewMode.isMonth"
         class="grid grid-cols-7 gap-px border-b border-gray-300 bg-gray-200 text-center text-xs font-semibold leading-6 text-gray-700 lg:flex-none"
       >
         <div class="bg-white py-2">
@@ -116,12 +116,15 @@
         </div>
       </div>
       <div class="flex bg-gray-200 text-xs leading-6 text-gray-700 lg:flex-auto">
-        <div :class="[viewMode.key === 'week' ? 'grid-rows-1' : 'grid-rows-5', 'w-full grid grid-cols-7 gap-px']">
+        <div
+          class="w-full grid grid-cols-7 gap-px"
+          :class="{ 'grid-rows-1': calendarState.viewMode.isWeek }"
+        >
           <div
             v-for="(day, index) in days"
             :key="index"
             class="flex flex-col"
-            :class="[day.isCurrentMonth ? 'bg-white' : 'bg-gray-50 text-gray-500', viewMode.key === 'week' && index !== 0 && (index % 5 === 0 || index % 6 === 0) ? 'bg-red-100' : undefined, viewMode.key === 'week' ? 'day' : 'month-day', 'relative py-2 px-3']"
+            :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"
@@ -143,116 +146,176 @@ import { ref, watch, computed, reactive } from 'vue'
 import { DateTime } from 'luxon'
 import useCurrentYearPeriodInfo from '@/Composables/yearPeriodInfo'
 import { useMonthInfo } from '@/Composables/monthInfo'
+import { viewModes, find as findViewMode } from '@/Shared/Widgets/Calendar/ViewModeOptions'
 
 let days = ref([])
 const months = useMonthInfo().getMonths()
 function getCurrentDate() {
   const { year, month, weekNumber } = DateTime.now()
-  return { year, month, weekNumber }
+  return { year, month, week: weekNumber }
 }
 const selectedYear = useCurrentYearPeriodInfo().year.value
 const currentDate = getCurrentDate()
-let viewModeOptions = [
+
-  { key: 'week', name: 'Week view' },
-  { key: 'month', name: 'Month view' },
-]
 const calendar = {
   viewMode: ref('week'),
   currents: reactive({
     year: selectedYear,
     month: selectedYear === currentDate.year ? currentDate.month : 1,
-    week: selectedYear === currentDate.year ? currentDate.weekNumber : 1,
+    week: selectedYear === currentDate.year ? currentDate.week : 0,
   }),
 }
-watch([calendar.viewMode, calendar.currents], () => {
+
-  loadCalendar()
+const calendarState = reactive({
+  viewMode: {
+    isWeek: computed(() => calendar.viewMode.value === 'week'),
+    isMonth: computed(() => calendar.viewMode.value === 'month'),
+    details: computed(() => findViewMode(calendar.viewMode.value)),
+  },
+  monthName: computed(() => months[calendar.currents.month - 1]?.name),
+  isActualYear: computed(() => calendar.currents.year === DateTime.now().year),
+  isPrevious: computed(() => calendarState.viewMode.isMonth ? calendar.currents.month !== 1 : calendar.currents.week > 0),
+  isNext: computed(() => calendarState.viewMode.isMonth ? calendar.currents.month !== 12 : calendar.currents.week < DateTime.fromObject({ year: selectedYear, month: 12, day: 31 }).weekNumber),
 })
 
-const viewMode = computed(() => {
+const customCalendar = {
-  const key = calendar.viewMode.value
+  generateCalendar() {
-  return {
+    const date = DateTime.fromObject({
-    key,
-    name: viewModeOptions.find((obj) => obj.key === key)?.name,
-  }
-})
-const monthName = computed(() => months[calendar.currents.month - 1]?.name)
-
-loadCalendar()
-
-function loadCalendar() {
-  let focusDate = DateTime.fromObject({
       year: calendar.currents.year,
-    month: calendar.currents.month,
+      month: calendarState.viewMode.isMonth ? calendar.currents.month : 1,
+      day: 1,
     })
-  let start, end
+    days.value = this.generateCalendarData(date)
+  },
+  generateCalendarData(date) {
+    const firstMonthDay = date.startOf('month')
+    const lastMonthDay = date.endOf('month')
 
-  if (viewMode.value.key === 'week') {
+    if (calendarState.viewMode.isWeek) {
-    if (currentDate.year === selectedYear)
+      return this.generateWeekData(firstMonthDay.startOf('week'))
-      focusDate = DateTime.fromObject({ weekNumber: calendar.currents.week })
+    } else if (calendarState.viewMode.isMonth) {
+      return this.generateMonthData(firstMonthDay.startOf('week'), lastMonthDay.endOf('week'))
+    }
+    return []
+  },
+  generateWeekData(start) {
+    let days = [], startWeek
+    if (calendar.currents.month === 1 && calendar.currents.week === 0)
+      startWeek = DateTime.fromObject({ year: calendar.currents.year, month: 1, day: 1 }).startOf('week')
+    else if (calendarState.isActualYear)
+      startWeek = DateTime.fromObject({ weekNumber: calendar.currents.week })
     else
-      focusDate = focusDate.plus({ week: calendar.currents.week - 1 } )
+      startWeek = start.plus({ week: calendar.currents.week })
-    start = focusDate.startOf('week')
+    const endWeek = startWeek.endOf('week')
-    end = focusDate.endOf('week')
+    for (let day = startWeek; day < endWeek; day = day.plus({ day: 1 })) {
-  } else if (viewMode.value.key === 'month') {
+      days.push(this.prepareDay(day))
-    focusDate = focusDate.startOf('month')
+    }
-    start = focusDate.startOf('week')
+    return days
-    end = focusDate.endOf('month').endOf('week')
+  },
+  generateMonthData(start, end) {
+    let days = []
+    for (let day = start; day < end; day = day.plus({ day: 1 })) {
+      days.push(this.prepareDay(day))
     }
 
-  generateCalendarData(start, end, focusDate)
+    return days
-}
+  },
-
+  prepareDay(day) {
-function generateCalendarData(startDate, endDate, focusDate) {
+    return {
-  const tmpDays = []
-  for (let day = startDate; day < endDate; day = day.plus({ day: 1 })) {
-    const isCurrentMonth = isInCurrentMonth(day, focusDate)
-    const okIsToday = isToday(day)
-
-    tmpDays.push({
       date: day.toISODate(),
-      isCurrentMonth,
+      dayNumber: day.day,
-      isToday: okIsToday,
+      isCurrentMonth: isInCurrentMonth(day),
-    })
+      isToday: isToday(day),
     }
-
+  },
-  days.value = tmpDays
 }
 
+watch([calendar.viewMode, calendar.currents], () => {
+  customCalendar.generateCalendar()
+})
+
+customCalendar.generateCalendar()
+
 function toLast() {
-  if (viewMode.value.key === 'week')
+  if (calendar.viewMode.value === 'week')
-    addWeeks(-1)
+    minusWeek()
   else
     addMonths(-1)
 }
 
 function toNext() {
-  if (viewMode.value.key === 'week') {
+  if (calendar.viewMode.value === 'week') {
-    addWeeks()
+    addWeek()
   } else
     addMonths()
 }
 
-function resetCalendar() {
+function resetCalendar(config = {}) {
-  calendar.currents.year = selectedYear
+  const currentMonth = isUndefined(config.month) ? currentDate.month : config.month
-  calendar.currents.month = selectedYear === currentDate.year ? currentDate.month : 1
+  const currentWeek = isUndefined(config.week) ? currentDate.week : config.week
-  calendar.currents.week = selectedYear === currentDate.year ? currentDate.weekNumber : 1
+
+  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
 }
 
-function addWeeks(howMany = 1) {
+function isUndefined(value) {
+  return value === undefined
+}
+
+function addWeek(minus = false) {
+  const howMany = minus ? -1: 1
+  let nextMonth, date = DateTime.fromObject({
+    year: calendar.currents.year,
+    month: 1,
+    day: 1,
+  })
+
+  date = date.plus({ week: calendar.currents.week + howMany })
+
+  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)
+    calendar.currents.week--
+  } else if (howMany > 0 && startWeekDay.day === 1) {
+    console.log('next', endWeekDay.day, endWeekDay.daysInMonth)
+    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
+    if (calendar.currents.week === 1)
+      calendar.currents.week = 0
+    return
+  }
   calendar.currents.week += howMany
 }
 
+function minusWeek() {
+  addWeek(true)
+}
+
 function addMonths(howMany = 1) {
   calendar.currents.month += howMany
 }
 
+function goToToday() {
+  resetCalendar({ year: currentDate.year, months: currentDate.month, week: currentDate.week })
+}
+
 function updateViewMode(type) {
+  if (type === 'month')
+    resetCalendar({ week: 1 })
+  else
     resetCalendar()
   calendar.viewMode.value = type
 }
 
-function isInCurrentMonth(date, currentMonth) {
+function isInCurrentMonth(date) {
-  return currentMonth.hasSame(date, 'month')
+  return calendar.currents.month === date.month
 }
 
 function isToday(date) {