- modified calendar

- improved colours
#152 - added local storage
2022-07-08 14:08:28 +02:00 · 2022-07-08 13:40:50 +02:00 · 2022-07-07 15:41:21 +02:00 · 2022-07-07 12:19:44 +02:00 · 2022-07-07 10:23:55 +02:00 · 2022-07-07 10:23:44 +02:00
20 changed files with 1006 additions and 912 deletions
--- a/app/Domain/UserVacationStatsRetriever.php
+++ b/app/Domain/UserVacationStatsRetriever.php
@@ -103,6 +103,15 @@ class UserVacationStatsRetriever
        return $limit ?? 0;
    }

+    public function hasVacationDaysLimit(User $user, YearPeriod $yearPeriod): bool
+    {
+        $limit = $user->vacationLimits()
+            ->whereBelongsTo($yearPeriod)
+            ->first()?->days;
+
+        return $limit !== null;
+    }
+
    protected function getLimitableVacationTypes(): Collection
    {
        $types = VacationType::all();
--- a/app/Eloquent/Models/Resume.php
+++ b/app/Eloquent/Models/Resume.php
@@ -31,6 +31,7 @@ class Resume extends Model
        "technologies" => AsCollection::class,
        "projects" => AsCollection::class,
    ];
+    protected $perPage = 50;

    public function user(): BelongsTo
    {
--- a/app/Eloquent/Models/User.php
+++ b/app/Eloquent/Models/User.php
@@ -46,6 +46,7 @@ class User extends Authenticatable implements NotifiableInterface
    protected $with = [
        "profile",
    ];
+    protected $perPage = 50;

    public function profile(): HasOne
    {
--- a/app/Eloquent/Models/VacationRequest.php
+++ b/app/Eloquent/Models/VacationRequest.php
@@ -49,6 +49,7 @@ class VacationRequest extends Model
        "to" => "date",
        "event_ids" => AsCollection::class,
    ];
+    protected $perPage = 50;

    public function user(): BelongsTo
    {
--- a/app/Infrastructure/Http/Controllers/DashboardController.php
+++ b/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,7 +57,24 @@ 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);
+        $hasLimit = $vacationStatsRetriever->hasVacationDaysLimit($user, $yearPeriod);
        $used = $vacationStatsRetriever->getUsedVacationDays($user, $yearPeriod);
        $pending = $vacationStatsRetriever->getPendingVacationDays($user, $yearPeriod);
        $homeOffice = $vacationStatsRetriever->getHomeOfficeDays($user, $yearPeriod);
@@ -66,7 +86,21 @@ 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" => [
+                "hasLimit" => $hasLimit,
                "limit" => $limit,
                "remaining" => $remaining,
                "used" => $used,
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
        "ext-pdo": "*",
        "ext-redis": "*",
        "azuyalabs/yasumi": "^2.4",
-        "barryvdh/laravel-dompdf": "^1.0",
+        "barryvdh/laravel-dompdf": "^2.0",
        "fruitcake/laravel-cors": "^3.0",
        "guzzlehttp/guzzle": "^7.0.1",
        "inertiajs/inertia-laravel": "^0.6.2",
--- a/composer.lock
+++ b/composer.lock
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.8'

 services:
  web:
-    image: nginx:1.21-alpine
+    image: nginx:1.23-alpine
    container_name: toby-web
    working_dir: /application
    volumes:
@@ -76,7 +76,7 @@ services:
    restart: unless-stopped

  node:
-    image: node:18.1.0-alpine3.14
+    image: node:18.4.0-alpine3.16
    container_name: toby-node
    working_dir: /application
    volumes:
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
        "lintf": "./node_modules/.bin/eslint resources/js --ext .js,.vue --fix"
    },
    "dependencies": {
-        "@headlessui/vue": "^1.6.4",
+        "@headlessui/vue": "^1.6.5",
        "@heroicons/vue": "^1.0.6",
        "@inertiajs/inertia": "^0.11.0",
        "@inertiajs/inertia-vue3": "^0.6.0",
@@ -21,27 +21,27 @@
        "@tailwindcss/forms": "^0.5.2",
        "@tailwindcss/line-clamp": "^0.4.0",
        "@tailwindcss/typography": "^0.5.2",
-        "@vue/compiler-sfc": "^3.2.31",
+        "@vue/compiler-sfc": "^3.2.37",
        "autoprefixer": "^10.4.7",
        "axios": "^0.27.2",
-        "echarts": "^5.3.2",
+        "echarts": "^5.3.3",
        "flatpickr": "^4.6.13",
-        "laravel-mix": "^6.0.44",
+        "laravel-mix": "^6.0.49",
        "lodash": "^4.17.21",
-        "luxon": "^2.3.2",
+        "luxon": "^2.4.0",
        "postcss": "^8.4.14",
-        "tailwindcss": "^3.0.24",
-        "vue": "3.2.21",
-        "vue-echarts": "^6.0.2",
+        "tailwindcss": "^3.1.4",
+        "vue": "3.2.37",
+        "vue-echarts": "^6.1.0",
        "vue-flatpickr-component": "^9.0.6",
        "vue-loader": "^17.0.0",
-        "vue-material-design-icons": "^5.0.0",
+        "vue-material-design-icons": "^5.1.1",
        "vue-toastification": "^2.0.0-rc.5",
        "vue3-popper": "^1.5.0",
        "vuedraggable": "^4.1.0"
    },
    "devDependencies": {
-        "eslint": "^8.16.0",
-        "eslint-plugin-vue": "^9.1.0"
+        "eslint": "^8.19.0",
+        "eslint-plugin-vue": "^9.1.1"
    }
 }
--- a/resources/js/Pages/Calendar.vue
+++ b/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>
--- a/resources/js/Pages/Dashboard.vue
+++ b/resources/js/Pages/Dashboard.vue
@@ -3,11 +3,11 @@
  <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 />
-      <VacationStats :stats="stats" />
-    </div>
-    <div class="grid grid-cols-1 gap-4">
-      <VacationCalendar />
+      <VacationCalendar
+        :holidays="allHolidays"
+        :approved-vacations="approvedVacations"
+        :pending-vacations="pendingVacations"
+      />
      <PendingVacationRequests
        v-if="can.listAllVacationRequests"
        :requests="vacationRequests.data"
@@ -16,6 +16,9 @@
        v-else
        :requests="vacationRequests.data"
      />
+    </div>
+    <div class="grid grid-cols-1 gap-4">
+      <VacationStats :stats="stats" />
      <AbsenceList
        v-if="years.current.year === years.selected.year && absences.data.length"
        :absences="absences.data"
@@ -51,5 +54,8 @@ defineProps({
  can: Object,
  stats: Object,
  years: Object,
+  allHolidays: Object,
+  approvedVacations: Object,
+  pendingVacations: Object,
 })
 </script>
--- a/resources/js/Pages/MonthlyUsage.vue
+++ b/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>
--- a/resources/js/Pages/VacationRequest/Create.vue
+++ b/resources/js/Pages/VacationRequest/Create.vue
@@ -297,8 +297,8 @@
              <button
                type="submit"
                class="inline-flex justify-center py-2 px-4 text-sm font-medium text-white bg-blumilk-600 rounded-md border border-transparent focus:outline-none focus:ring-2 focus:ring-blumilk-500 focus:ring-offset-2 shadow-sm"
-                :class="[form.processing || !form.isDirty ? 'disabled:opacity-60' : 'hover:bg-blumilk-700']"
-                :disabled="form.processing || !form.isDirty"
+                :class="[form.processing || !isDirty ? 'disabled:opacity-60' : 'hover:bg-blumilk-700']"
+                :disabled="form.processing || !isDirty"
              >
                Zapisz
              </button>
@@ -359,6 +359,13 @@ const form = useForm({
  flowSkipped: false,
 })

+let isDirty = ref(false)
+
+watch(form, formData => {
+  const { from, to } = formData.data()
+  isDirty.value = formData.isDirty || from !== null || to !== null
+}, { immediate: true, deep: true })
+
 refreshEstimatedDays(form.from, form.to)

 const estimatedDays = ref([])
--- a/resources/js/Pages/VacationRequest/IndexForApprovers.vue
+++ b/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',
--- a/resources/js/Shared/Widgets/Calendar/DayComponent.vue
+++ b/resources/js/Shared/Widgets/Calendar/DayComponent.vue
@@ -0,0 +1,120 @@
+<template>
+  <div
+    class="box-border"
+    :class="[
+      day.isCurrentMonth ? {
+        'bg-red-100': day.isWeekend,
+        'bg-white hover:bg-blumilk-25': !day.isWeekend && !day.isHoliday,
+        'bg-red-100 text-red-800': day.isHoliday || day.isWeekend
+      } : [
+        'bg-gray-50 text-gray-500',
+        {
+          'bg-red-50': day.isWeekend
+        }
+      ],
+      day.isHoliday && 'font-bold cursor-default',
+      (day.isPendingVacation) && `pb-0 border-b-[3px] border-dashed ${day.getVacationType.border}`,
+      (day.isVacation) && `pb-0 border-b-[3px] ${day.getVacationType.border}`
+    ]"
+  >
+    <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' ]"
+      >
+        {{ 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">
+          {{ day.getHolidayInfo }}
+        </div>
+      </template>
+    </Popper>
+    <Popper
+      v-else-if="day.isVacation || day.isPendingVacation"
+      as="div"
+      open-delay="200"
+      hover
+      offset-distance="0"
+      @mouseover.passive="onMouseover"
+      @mouseleave="onMouseleave"
+    >
+      <div class="flex justify-between">
+        <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>
+        <div class="hidden md:inline-block">
+          <VacationIcon
+            :type="day.getVacationType.value"
+          />
+        </div>
+      </div>
+      <template #content>
+        <VacationPopup :vacation="day.getVacationInfo" />
+      </template>
+    </Popper>
+    <div
+      v-else-if="day.isWeekend"
+      class="text-red-800"
+    >
+      <time
+        :datetime="day.date"
+        class="cursor-default"
+        :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'
+import VacationIcon from '@/Shared/VacationTypeCalendarIcon'
+
+defineProps({
+  day: {
+    type: Object,
+    required: true,
+  },
+})
+
+const isActive = ref(false)
+
+function onMouseover() {
+  if (!isActive.value)
+    isActive.value = true
+}
+
+function onMouseleave() {
+  if (isActive.value)
+    isActive.value = false
+}
+</script>
--- a/resources/js/Shared/Widgets/VacationCalendar.vue
+++ b/resources/js/Shared/Widgets/VacationCalendar.vue
@@ -7,10 +7,10 @@
      <div class="flex justify-center">
        <div class="flex items-center rounded-md shadow-sm md:items-stretch">
          <button
-            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"
+            class="flex items-center justify-center rounded-l-md border border-r-0 border-gray-300 py-2 pl-3 pr-4 text-gray-400 focus:relative md:w-9 md:px-2"
+            :class="[ calendarState.isPrevious ? 'bg-white hover:text-gray-500 md:hover:bg-gray-50' : 'bg-gray-100' ]"
+            @click="toPrevious"
          >
            <span class="sr-only">Poprzedni {{ calendarState.viewMode.details.shortcut }}</span>
            <ChevronLeftIcon
@@ -21,16 +21,18 @@
          <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="{ 'rounded-l-md border border-r-0': !calendarState.isPrevious, 'rounded-r-md border border-l-0': !calendarState.isNext }"
            @click="goToToday"
          >
-            Dziś
+            Dzisiaj
          </button>
-          <span class="relative -mx-px h-5 w-px bg-gray-300 md:hidden" />
+          <span
+            class="relative -mx-px h-5 w-px bg-gray-300 md:hidden z-10"
+          />
          <button
-            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"
+            class="flex items-center justify-center rounded-r-md border border-l-0 border-gray-300 py-2 pl-4 pr-3 text-gray-400 focus:relative md:w-9 md:px-2"
+            :class="[ calendarState.isNext ? 'bg-white hover:text-gray-500 md:hover:bg-gray-50' : 'bg-gray-100' ]"
+            :disabled="!calendarState.isNext"
            @click="toNext"
          >
            <span class="sr-only">Następny {{ calendarState.viewMode.details.shortcut }}</span>
@@ -49,7 +51,8 @@
          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"
        >
-          {{ calendarState.viewMode.details.name }}
+          <span class="md:hidden">{{ calendarState.viewMode.details.shortcut }}</span>
+          <span class="hidden md:inline-block">{{ calendarState.viewMode.details.name }}</span>
          <ChevronDownIcon
            class="ml-2 h-5 w-5 text-gray-400"
            aria-hidden="true"
@@ -88,51 +91,45 @@
        </transition>
      </Menu>
    </div>
-    <div class="ring-1 ring-black ring-opacity-5 lg:flex lg:flex-auto lg:flex-col">
+    <div class="border border-gray-300 lg:flex lg:flex-auto lg:flex-col">
      <div
        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"
+        class="grid grid-cols-7 gap-px border-b border-gray-300 bg-gray-300 text-center text-xs font-semibold leading-6 text-gray-700 lg:flex-none"
      >
-        <div class="bg-white py-2">
-          Pn
+        <div class="py-2 bg-white">
+          Pon
        </div>
-        <div class="bg-white py-2">
+        <div class="py-2 bg-white">
          Wt
        </div>
-        <div class="bg-white py-2">
+        <div class="py-2 bg-white">
          Śr
        </div>
-        <div class="bg-white py-2">
-          Cz
+        <div class="py-2 bg-white">
+          Czw
        </div>
-        <div class="bg-white py-2">
+        <div class="py-2 bg-white">
          Pt
        </div>
-        <div class="bg-red-100 py-2">
-          Sb
+        <div class="py-2 bg-red-100 text-red-800">
+          Sob
        </div>
-        <div class="bg-red-100 py-2">
-          Nd
+        <div class="py-2 bg-red-100 text-red-800">
+          Ndz
        </div>
      </div>
-      <div class="flex bg-gray-200 text-xs leading-6 text-gray-700 lg:flex-auto">
+      <div class="flex bg-gray-300 text-xs leading-6 text-gray-700 lg:flex-auto">
        <div
          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-3 px-3"
+            :class="{ 'day': calendarState.viewMode.isWeek }"
+          />
        </div>
      </div>
    </div>
@@ -144,21 +141,33 @@ 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 weeksInYear = DateTime.fromObject({ year: selectedYear, month: 12, day: 31 }).weekNumber
+
 const calendar = {
-  viewMode: ref('week'),
+  viewMode: ref(localStorage.getItem('calendarViewMode') ?? 'week'),
  currents: reactive({
    year: selectedYear,
    month: selectedYear === currentDate.year ? currentDate.month : 1,
@@ -175,11 +184,11 @@ const calendarState = reactive({
  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),
+  isNext: computed(() => calendarState.viewMode.isMonth ? calendar.currents.month !== 12 : calendar.currents.week < weeksInYear),
 })

 const customCalendar = {
-  generateCalendar() {
+  loadCalendar() {
    const date = DateTime.fromObject({
      year: calendar.currents.year,
      month: calendarState.viewMode.isMonth ? calendar.currents.month : 1,
@@ -221,33 +230,49 @@ const customCalendar = {
    return days
  },
  prepareDay(day) {
-    return {
+    const isCurrentMonth = isInCurrentMonth(day)
+    const startDay = {
      date: day.toISODate(),
+      isVacation: isCurrentMonth && isVacation(day),
+      isPendingVacation: isCurrentMonth && isPendingVacation(day),
+      isHoliday: isHoliday(day),
+    }
+
+    return {
+      ...startDay,
      dayNumber: day.day,
-      isCurrentMonth: isInCurrentMonth(day),
+      isCurrentMonth,
      isToday: isToday(day),
+      isWeekend: isWeekend(day),
+      getHolidayInfo: startDay.isHoliday ? getHolidayInfo(startDay) : undefined,
+      getVacationType: startDay.isVacation || startDay.isPendingVacation ? getVacationType(startDay) : undefined,
+      getVacationInfo: startDay.isVacation || startDay.isPendingVacation ? getVacationInfo(startDay) : undefined,
    }
  },
 }

 watch([calendar.viewMode, calendar.currents], () => {
-  customCalendar.generateCalendar()
+  customCalendar.loadCalendar()
 })

-customCalendar.generateCalendar()
+customCalendar.loadCalendar()

-function toLast() {
-  if (calendar.viewMode.value === 'week')
-    minusWeek()
-  else
-    addMonths(-1)
+function toPrevious() {
+  if (calendarState.isPrevious) {
+    if (calendar.viewMode.value === 'week')
+      minusWeek()
+    else
+      minusMonth()
+  }
 }

 function toNext() {
-  if (calendar.viewMode.value === 'week') {
-    addWeek()
-  } else
-    addMonths()
+  if (calendarState.isNext) {
+    if (calendar.viewMode.value === 'week')
+      addWeek()
+    else
+      addMonth()
+  }
 }

 function resetCalendar(config = {}) {
@@ -256,7 +281,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 +300,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 +318,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,24 +332,53 @@ function goToToday() {

 function updateViewMode(type) {
  if (type === 'month')
-    resetCalendar({ week: 1 })
+    resetCalendar({ week: 0 })
  else
    resetCalendar()
  calendar.viewMode.value = type
+  localStorage.setItem('calendarViewMode', type)
 }

 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 getHolidayInfo(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 getVacationType(day) {
+  return findType(getVacationInfo(day).type)
+}
+
+function getVacationInfo(day) {
+  return day.isVacation ? props.approvedVacations[day.date] : props.pendingVacations[day.date]
+}
 </script>

 <style lang="css">
 .day:nth-of-type(7n - 6):before {
-  content: "Pn";
+  content: "Pon";
 }

 .day:nth-of-type(7n - 5):before {
@@ -337,27 +390,18 @@ function isToday(date) {
 }

 .day:nth-of-type(7n - 3):before {
-  content: "Cz";
+  content: "Czw";
 }

 .day:nth-of-type(7n - 2):before {
  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";
+  content: "Sob";
 }

 .day:nth-of-type(7n):before {
-  content: "Nd";
-}
-
-.month-day:nth-of-type(7n - 1), .month-day:nth-of-type(7n) {
-  background-color: #fee2e2;
+  content: "Ndz";
 }
 </style>
--- a/resources/js/Shared/Widgets/VacationStats.vue
+++ b/resources/js/Shared/Widgets/VacationStats.vue
@@ -1,84 +1,83 @@
 <template>
-  <section class="grid grid-cols-1 gap-4 md:grid-cols-2">
-    <div class="hidden p-4 bg-white shadow-md md:block">
-      <VacationChart :stats="stats" />
+  <section>
+    <div
+      v-if="stats.hasLimit"
+      class="grid grid-cols-2 gap-2 h-full"
+    >
+      <div class="py-5 px-4 bg-white shadow-md sm:p-6">
+        <dd class="mt-1 text-4xl font-semibold text-blumilk-500">
+          {{ stats.remaining }}
+        </dd>
+        <dt class="font-medium text-gray-700 truncate text-md">
+          Pozostało
+        </dt>
+      </div>
+      <div class="py-5 px-4 bg-white shadow-md sm:p-6">
+        <dd class="mt-1 text-4xl font-semibold text-blumilk-700">
+          {{ stats.used }}
+        </dd>
+        <dt class="font-medium text-gray-700 truncate text-md">
+          Wykorzystane
+        </dt>
+      </div>
+      <div class="py-5 px-4 bg-white shadow-md sm:p-6">
+        <dt class="mt-1 text-4xl font-semibold text-blumilk-200">
+          {{ stats.pending }}
+        </dt>
+        <dd class="font-medium text-gray-700 truncate text-md">
+          Rozpatrywane
+        </dd>
+      </div>
+      <div class="py-5 px-4 bg-white shadow-md sm:p-6">
+        <dt class="mt-1 text-4xl font-semibold text-blumilk-800">
+          {{ stats.limit }}
+        </dt>
+        <dd class="font-medium text-gray-700 truncate text-md">
+          Limit urlopu
+        </dd>
+      </div>
+      <div class="py-5 px-4 bg-white shadow-md sm:p-6">
+        <dt class="mt-1 text-4xl font-semibold text-gray-500">
+          {{ stats.other }}
+        </dt>
+        <dd class="font-medium text-gray-700 truncate text-md">
+          Inne urlopy
+        </dd>
+      </div>
+      <div class="py-5 px-4 bg-white shadow-md sm:p-6">
+        <dt class="mt-1 text-4xl font-semibold text-lime-500">
+          {{ stats.homeOffice }}
+        </dt>
+        <dd class="font-medium text-gray-700 truncate text-md">
+          Praca zdalna
+        </dd>
+      </div>
    </div>
-    <div class="h-full">
-      <div class="grid grid-cols-2 gap-4 h-full">
-        <div class="py-5 px-4 bg-white shadow-md sm:p-6">
-          <dd class="mt-1 text-4xl font-semibold text-blumilk-500">
-            {{ stats.remaining }}
-          </dd>
-          <dt class="font-medium text-gray-700 truncate text-md">
-            Pozostało
-          </dt>
-          <dt class="mt-2 text-sm font-medium text-gray-500">
-            Dni do wykorzystania teraz.
-          </dt>
-        </div>
-        <div class="py-5 px-4 bg-white shadow-md sm:p-6">
-          <dd class="mt-1 text-4xl font-semibold text-blumilk-700">
-            {{ stats.used }}
-          </dd>
-          <dt class="font-medium text-gray-700 truncate text-md">
-            Wykorzystane
-          </dt>
-          <dt class="mt-2 text-sm font-medium text-gray-500">
-            Dni, które zostały już wykorzystane na urlop wypoczynkowy.
-          </dt>
-        </div>
-        <div class="py-5 px-4 bg-white shadow-md sm:p-6">
-          <dt class="mt-1 text-4xl font-semibold text-blumilk-200">
-            {{ stats.pending }}
-          </dt>
-          <dd class="font-medium text-gray-700 truncate text-md">
-            Rozpatrywane
-          </dd>
-          <dt class="mt-2 text-sm font-medium text-gray-500">
-            Dni czekające na akceptację przełożonych.
-          </dt>
-        </div>
-        <div class="py-5 px-4 bg-white shadow-md sm:p-6">
-          <dt class="mt-1 text-4xl font-semibold text-blumilk-800">
-            {{ stats.limit }}
-          </dt>
-          <dd class="font-medium text-gray-700 truncate text-md">
-            Limit urlopu
-          </dd>
-          <dt class="mt-2 text-sm font-medium text-gray-500">
-            Twój roczny limit urlopu wypoczynkowego.
-          </dt>
-        </div>
-        <div class="py-5 px-4 bg-white shadow-md sm:p-6">
-          <dt class="mt-1 text-4xl font-semibold text-gray-500">
-            {{ stats.other }}
-          </dt>
-          <dd class="font-medium text-gray-700 truncate text-md">
-            Inne urlopy
-          </dd>
-          <dt class="mt-2 text-sm font-medium text-gray-500">
-            Urlopy bezpłatne, okolicznościowe, zwolnienia lekarskie, itd., które zostały już zatwierdzone.
-          </dt>
-        </div>
-        <div class="py-5 px-4 bg-white shadow-md sm:p-6">
-          <dt class="mt-1 text-4xl font-semibold text-lime-500">
-            {{ stats.homeOffice }}
-          </dt>
-          <dd class="font-medium text-gray-700 truncate text-md">
-            Praca zdalna
-          </dd>
-          <dt class="mt-2 text-sm font-medium text-gray-500">
-            Dni przepracowane poza biurem.
-          </dt>
-        </div>
+    <div
+      v-else
+      class="h-full grid grid-cols-2 gap-2 h-full"
+    >
+      <div class="py-5 px-4 bg-white shadow-md sm:p-6">
+        <dt class="mt-1 text-4xl font-semibold text-gray-500">
+          {{ stats.other }}
+        </dt>
+        <dd class="font-medium text-gray-700 truncate text-md">
+          Inne urlopy
+        </dd>
+      </div>
+      <div class="py-5 px-4 bg-white shadow-md sm:p-6">
+        <dt class="mt-1 text-4xl font-semibold text-lime-500">
+          {{ stats.homeOffice }}
+        </dt>
+        <dd class="font-medium text-gray-700 truncate text-md">
+          Praca zdalna
+        </dd>
      </div>
    </div>
  </section>
 </template>

 <script setup>
-import VacationChart from '@/Shared/VacationChart'
-
 defineProps({
  stats: Object,
 })
--- a/tailwind.config.js
+++ b/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)`
-        })
-      })
-    }),
  ],
 }
--- a/tests/Feature/UserTest.php
+++ b/tests/Feature/UserTest.php
@@ -73,10 +73,10 @@ class UserTest extends FeatureTestCase

    public function testUserListIsPaginated(): void
    {
-        User::factory()->count(15)->create();
+        User::factory()->count(50)->create();
        $admin = User::factory()->admin()->create();

-        $this->assertDatabaseCount("users", 16);
+        $this->assertDatabaseCount("users", 51);

        $this->actingAs($admin)
            ->get("/users?page=2")
Author	SHA1	Message	Date
Kamil Niemczycki	5db97ebd0c	- modified calendar	2022-07-08 14:08:28 +02:00
Kamil Niemczycki	d863422103	- improved colours	2022-07-08 13:40:50 +02:00
Kamil Niemczycki	61add6b1e8	#152 - added local storage	2022-07-07 15:41:21 +02:00
Kamil Niemczycki	cbe70315eb	#152 - updated vacation stats	2022-07-07 12:19:44 +02:00
Kamil Niemczycki	62c3c11ebf	#152 - change layout	2022-07-07 10:23:55 +02:00
Kamil Niemczycki	af25d80d2e	Merge branch '#152-dashboard-calendar-widget' into #152-dashboard-v2	2022-07-07 10:23:44 +02:00
Kamil Niemczycki	0ddbec1499	- small improvements	2022-07-07 10:02:31 +02:00
Kamil Niemczycki	94350f8a82	#152 - updated style and added icons	2022-07-07 00:15:06 +02:00
Kamil Niemczycki	0398b44141	- updated style	2022-07-06 21:33:56 +02:00
Kamil Niemczycki	783586d3ed	- improved calendar responsiveness	2022-07-06 16:28:33 +02:00
dependabot[bot]	902af64833	#5 - (js) Bump vue from 3.2.21 to 3.2.37 (#176 ) * #5 - (js) Bump vue from 3.2.21 to 3.2.37 Bumps [vue](https://github.com/vuejs/core) from 3.2.21 to 3.2.37. - [Release notes](https://github.com/vuejs/core/releases) - [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md) - [Commits](https://github.com/vuejs/core/compare/v3.2.21...v3.2.37) --- updated-dependencies: - dependency-name: vue dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * - npm dependencies update July 2022 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>	2022-07-05 08:02:34 +02:00
dependabot[bot]	d1047e8262	#5 - (php) Bump spatie/laravel-ignition from 1.2.3 to 1.3.1 (#175 ) * #5 - (php) Bump spatie/laravel-ignition from 1.2.3 to 1.3.1 Bumps [spatie/laravel-ignition](https://github.com/spatie/laravel-ignition) from 1.2.3 to 1.3.1. - [Release notes](https://github.com/spatie/laravel-ignition/releases) - [Changelog](https://github.com/spatie/laravel-ignition/blob/main/CHANGELOG.md) - [Commits](https://github.com/spatie/laravel-ignition/compare/1.2.3...1.3.1) --- updated-dependencies: - dependency-name: spatie/laravel-ignition dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * - composer dependencies update July 2022 * - docker-compose.yml update July 2022 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>	2022-07-05 08:02:23 +02:00
Kamil Niemczycki	1d7b4da903	- added new line in file	2022-07-04 10:45:14 +02:00
Kamil Niemczycki	94f433de6e	#152 - added redirections	2022-07-04 10:16:40 +02:00
Kamil Niemczycki	a9c476cb8e	wip	2022-07-04 10:16:36 +02:00
Kamil Niemczycki	5c3833d4cb	- component renamed	2022-07-04 10:16:23 +02:00
Kamil Niemczycki	6e627d11c8	#152 - added vacations	2022-07-04 10:16:19 +02:00
Kamil Niemczycki	eb644fa494	#152 - added holidays	2022-07-04 10:16:08 +02:00
Kamil Niemczycki	4392b666e1	#152 - small corrections	2022-07-01 14:57:38 +02:00
Kamil Niemczycki	e7c1028da1	#152 - updated style	2022-07-01 14:56:55 +02:00
Kamil Niemczycki	a7bc4695a7	#152 - final support for weeks	2022-06-24 11:20:18 +02:00
Kamil Niemczycki	4e16f363ac	#152 - optimization	2022-06-24 11:11:09 +02:00
Kamil Niemczycki	7893282385	#152 - wip	2022-06-24 10:22:51 +02:00
Kamil Niemczycki	db874d4395	#152 - wip	2022-06-24 10:08:48 +02:00
Kamil Niemczycki	dcc3808428	#152 - wip	2022-06-24 10:00:36 +02:00
Kamil Niemczycki	2a3e65ed5f	#152 - calendar template added	2022-06-24 09:58:21 +02:00
Kamil Niemczycki	643f546142	#173 - button behaviour in creating request (#174 ) #173 - improved button behaviour	2022-06-20 09:33:30 +02:00
Kamil Niemczycki	995c0b6696	- changed limits for item list (#171 ) * - changed limits for displayed items * - transferred to models * - updated tests	2022-06-15 10:14:58 +02:00