kamilniemczycki/toby
1
0
Fork 0
Code Issues Pull Requests 2 Projects Releases Activity

#120 - fix

Browse Source
This commit is contained in:
Adrian Hopek
2022-04-20 13:24:56 +02:00
parent d6e29affdd
commit 847d929c77
15 changed files with 132 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
resources/js/Pages/Dashboard.vue
View File

@@ -15,9 +15,13 @@
:requests="vacationRequests.data"
/>
<AbsenceList
v-if="years.current.year === years.selected.year"
v-if="years.current.year === years.selected.year && absences.data.length"
:absences="absences.data"
/>
<HomeOfficeList
v-if="years.current.year === years.selected.year && remoteDays.data.length"
:remote-days="remoteDays.data"
/>
<UpcomingHolidays
v-if="years.current.year === years.selected.year"
:holidays="holidays.data"
@@ -30,6 +34,7 @@
import Welcome from '@/Shared/Widgets/Welcome'
import VacationStats from '@/Shared/Widgets/VacationStats'
import AbsenceList from '@/Shared/Widgets/AbsenceList'
import HomeOfficeList from '@/Shared/Widgets/HomeOfficeList'
import UpcomingHolidays from '@/Shared/Widgets/UpcomingHolidays'
import UserVacationRequests from '@/Shared/Widgets/UserVacationRequests'
import PendingVacationRequests from '@/Shared/Widgets/PendingVacationRequests'
@@ -37,6 +42,7 @@ import PendingVacationRequests from '@/Shared/Widgets/PendingVacationRequests'
defineProps({
auth: Object,
absences: Object,
remoteDays: Object,
vacationRequests: Object,
holidays: Object,
can: Object,

4
resources/js/Pages/Users/Create.vue
View File

@@ -140,7 +140,7 @@
<span
v-if="selected"
:class="[active ? 'text-white' : 'text-blumilk-600', 'absolute inset-y-0 right-0 flex items-center pr-4']"
:class="['text-blumilk-600 absolute inset-y-0 right-0 flex items-center pr-4']"
>
<CheckIcon class="w-5 h-5" />
</span>
@@ -195,7 +195,7 @@
<span
v-if="selected"
:class="[active ? 'text-white' : 'text-blumilk-600', 'absolute inset-y-0 right-0 flex items-center pr-4']"
:class="['text-blumilk-600 absolute inset-y-0 right-0 flex items-center pr-4']"
>
<CheckIcon class="w-5 h-5" />
</span>

4
resources/js/Pages/Users/Edit.vue
View File

@@ -144,7 +144,7 @@
<span
v-if="selected"
:class="[active ? 'text-white' : 'text-blumilk-600', 'absolute inset-y-0 right-0 flex items-center pr-4']"
:class="['text-blumilk-600 absolute inset-y-0 right-0 flex items-center pr-4']"
>
<CheckIcon class="w-5 h-5" />
</span>
@@ -202,7 +202,7 @@
<span
v-if="selected"
:class="[active ? 'text-white' : 'text-blumilk-600', 'absolute inset-y-0 right-0 flex items-center pr-4']"
:class="['text-blumilk-600 absolute inset-y-0 right-0 flex items-center pr-4']"
>
<CheckIcon class="w-5 h-5" />
</span>

4
resources/js/Pages/VacationRequest/Create.vue
View File

@@ -86,7 +86,7 @@
<span
v-if="selected"
:class="[active ? 'text-white' : 'text-blumilk-600', 'absolute inset-y-0 right-0 flex items-center pr-4']"
:class="['text-blumilk-600 absolute inset-y-0 right-0 flex items-center pr-4']"
>
<CheckIcon class="w-5 h-5" />
</span>
@@ -173,7 +173,7 @@
<span
v-if="selected"
:class="[active ? 'text-white' : 'text-blumilk-600', 'absolute inset-y-0 right-0 flex items-center pr-4']"
:class="['text-blumilk-600 absolute inset-y-0 right-0 flex items-center pr-4']"
>
<CheckIcon class="w-5 h-5" />
</span>

2
resources/js/Pages/VacationRequest/Index.vue
View File

@@ -76,7 +76,7 @@
<span
v-if="selected"
:class="[active ? 'text-white' : 'text-blumilk-600', 'absolute inset-y-0 right-0 flex items-center pr-4']"
:class="['text-blumilk-600 absolute inset-y-0 right-0 flex items-center pr-4']"
>
<CheckIcon class="w-5 h-5" />
</span>

6
resources/js/Pages/VacationRequest/IndexForApprovers.vue
View File

@@ -69,7 +69,7 @@
<span
v-if="form.user === null"
:class="[active ? 'text-white' : 'text-blumilk-600', 'absolute inset-y-0 right-0 flex items-center pr-4']"
:class="['text-blumilk-600 absolute inset-y-0 right-0 flex items-center pr-4']"
>
<CheckIcon class="w-5 h-5" />
</span>
@@ -98,7 +98,7 @@
</div>
<span
v-if="form.user?.id === user.id"
:class="[active ? 'text-white' : 'text-blumilk-600', 'absolute inset-y-0 right-0 flex items-center pr-4']"
:class="['text-blumilk-600 absolute inset-y-0 right-0 flex items-center pr-4']"
>
<CheckIcon class="w-5 h-5" />
</span>
@@ -149,7 +149,7 @@
<span
v-if="selected"
:class="[active ? 'text-white' : 'text-blumilk-600', 'absolute inset-y-0 right-0 flex items-center pr-4']"
:class="['text-blumilk-600 absolute inset-y-0 right-0 flex items-center pr-4']"
>
<CheckIcon class="w-5 h-5" />
</span>

5
resources/js/Shared/Widgets/AbsenceList.vue
View File

@@ -25,11 +25,6 @@
</p>
</div>
</li>
<li v-if="! absences.length">
<p class="py-2">
Brak danych
</p>
</li>
</ul>
</div>
</section>

37
resources/js/Shared/Widgets/HomeOfficeList.vue Normal file
View File

@@ -0,0 +1,37 @@
<template>
<section class="bg-white shadow-md">
<div class="p-4 sm:px-6">
<h2 class="text-lg font-medium leading-6 text-gray-900">
Dzisiejsza praca zdalna
</h2>
</div>
<div class="px-4 border-t border-gray-200 sm:px-6">
<ul class="divide-y divide-gray-200">
<li
v-for="day in remoteDays"
:key="day.user.id"
class="flex py-4"
>
<img
class="w-10 h-10 rounded-full"
:src="day.user.avatar"
>
<div class="ml-3">
<p class="text-sm font-medium text-gray-900">
{{ day.user.name }}
</p>
<p class="text-sm text-gray-500">
{{ day.user.email }}
</p>
</div>
</li>
</ul>
</div>
</section>
</template>
<script setup>
defineProps({
remoteDays: Object,
})
</script>