#90 - wip

resources/js/Pages/Dashboard.vue

@@ -14,8 +14,14 @@
         v-else
         :requests="vacationRequests.data"
       />
-      <AbsenceList :absences="absences.data" />
-      <UpcomingHolidays :holidays="holidays.data" />
+      <AbsenceList
+        v-if="years.current.year === years.selected.year"
+        :absences="absences.data"
+      />
+      <UpcomingHolidays
+        v-if="years.current.year === years.selected.year"
+        :holidays="holidays.data"
+      />
     </div>
   </div>
 </template>
@@ -35,5 +41,6 @@ defineProps({
   holidays: Object,
   can: Object,
   stats: Object,
+  years: Object,
 })
 </script>

resources/js/Pages/Holidays/Index.vue

@@ -49,9 +49,9 @@
             <tr
               v-for="holiday in holidays.data"
               :key="holiday.id"
-              class="hover:bg-blumilk-25"
+              :class="[holiday.isPast ? 'bg-gray-100' : 'hover:bg-blumilk-25']"
             >
-              <td class="p-4 text-sm font-semibold text-gray-500 capitalize whitespace-nowrap">
+              <td class="p-4 text-sm font-semibold text-gray-700 capitalize whitespace-nowrap">
                 {{ holiday.name }}
               </td>
               <td class="p-4 text-sm text-gray-500 whitespace-nowrap">

resources/js/Pages/Users/Index.vue

@@ -46,6 +46,12 @@
               >
                 Rola
               </th>
+              <th
+                scope="col"
+                class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
+              >
+                Ostatnia aktywność
+              </th>
               <th
                 scope="col"
                 class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
@@ -97,6 +103,9 @@
               <td class="p-4 text-sm text-gray-500 whitespace-nowrap">
                 {{ user.role }}
               </td>
+              <td class="p-4 text-sm text-gray-500 whitespace-nowrap">
+                {{ user.lastActiveAt ? DateTime.fromSQL(user.lastActiveAt).toRelative() : '-' }}
+              </td>
               <td class="p-4 text-sm text-gray-500 whitespace-nowrap">
                 {{ user.position }}
               </td>
@@ -150,7 +159,7 @@
                             :href="`/users/${user.id}`"
                             :class="[active ? 'bg-gray-100 text-gray-900' : 'text-gray-700', 'block w-full text-left font-medium px-4 py-2 text-sm']"
                           >
-                            <TrashIcon class="mr-2 w-5 h-5 text-red-500" /> Usuń
+                            <BanIcon class="mr-2 w-5 h-5 text-red-500" /> Zablokuj
                           </InertiaLink>
                         </MenuItem>
                       </div>
@@ -201,8 +210,9 @@ import { ref, watch } from 'vue'
 import { Inertia } from '@inertiajs/inertia'
 import { debounce } from 'lodash'
 import { SearchIcon } from '@heroicons/vue/outline'
-import { DotsVerticalIcon, PencilIcon, TrashIcon, RefreshIcon } from '@heroicons/vue/solid'
+import { DotsVerticalIcon, PencilIcon, BanIcon, RefreshIcon } from '@heroicons/vue/solid'
 import { Menu, MenuButton, MenuItem, MenuItems } from '@headlessui/vue'
+import { DateTime } from 'luxon'
 import Pagination from '@/Shared/Pagination'
 
 const props = defineProps({