Merge branch 'main' into #43-vacation-summary-for-employee

# Conflicts:
#	app/Infrastructure/Http/Controllers/HolidayController.php
#	app/Infrastructure/Http/Controllers/VacationLimitController.php
#	app/Infrastructure/Http/Controllers/VacationRequestController.php
#	composer.lock
#	resources/js/Pages/Holidays/Index.vue
#	resources/js/Pages/VacationRequest/Create.vue
This commit is contained in:
Adrian Hopek
2022-03-02 10:01:14 +01:00
51 changed files with 1993 additions and 1401 deletions

View File

@@ -213,12 +213,12 @@
>
<img
class="h-8 w-8 rounded-full"
:src="user.avatar"
:src="auth.user.avatar"
alt="Avatar"
>
<span class="hidden ml-3 text-gray-700 text-sm font-medium lg:block">
<span class="sr-only">Open user menu for </span>
{{ user.name }}
{{ auth.user.name }}
</span>
<ChevronDownIcon
class="hidden flex-shrink-0 ml-1 h-5 w-5 text-gray-400 lg:block"
@@ -324,23 +324,24 @@ export default {
setup() {
const sidebarOpen = ref(false)
const user = computed(() => usePage().props.value.auth.user)
const auth = computed(() => usePage().props.value.auth)
const years = computed(() => usePage().props.value.years)
const navigation = [
{name: 'Wnioski urlopowe', href: '/vacation-requests', icon: CollectionIcon},
{name: 'Kalendarz urlopów', href: '/vacation-calendar', icon: CalendarIcon},
{name: 'Dni wolne', href: '/holidays', icon: StarIcon},
{name: 'Limity urlopów', href: '/vacation-limits', icon: SunIcon},
{name: 'Użytkownicy', href: '/users', icon: UserGroupIcon},
]
const navigation = computed(() =>
[
{name: 'Wnioski urlopowe', href: '/vacation-requests', icon: CollectionIcon, can: true},
{name: 'Kalendarz urlopów', href: '/vacation-calendar', icon: CalendarIcon, can: true},
{name: 'Dni wolne', href: '/holidays', icon: StarIcon, can: true},
{name: 'Limity urlopów', href: '/vacation-limits', icon: SunIcon, can: auth.value.can.manageVacationLimits},
{name: 'Użytkownicy', href: '/users', icon: UserGroupIcon, can: auth.value.can.manageUsers},
].filter(item => item.can))
const userNavigation = [
{name: 'Wyloguj się', href: '/logout', method: 'post', as: 'button'},
]
return {
user,
auth,
years,
navigation,
userNavigation,

View File

@@ -1,6 +1,7 @@
<template>
<v-chart
style="height: 600px;"
:autoresize="true"
:option="option"
/>
</template>
@@ -60,10 +61,20 @@ export default {
{
name: 'Urlop wypoczynkowy',
type: 'pie',
itemStyle: {
borderRadius: 10,
borderColor: '#fff',
borderWidth: 2,
},
label: {
show: true,
textStyle: {
fontSize: 16,
position: 'inner',
formatter: param => param.value !== 0 ? param.value : '' ,
fontWeight: 'bold',
fontSize: 16,
color: '#FFFFFF',
labelLine: {
show: false,
},
},
data: [
@@ -72,23 +83,6 @@ export default {
{ value: props.stats.remaining, name: 'Pozostałe' },
],
radius: ['30%', '70%'],
itemStyle : {
normal: {
borderRadius: 10,
borderColor: '#fff',
borderWidth: 2,
label: {
position: 'inner',
formatter: param => param.value !== 0 ? param.value : '' ,
fontWeight: 'bold',
fontSize: 16,
color: '#FFFFFF',
},
labelLine: {
show: false,
},
},
},
},
],
}))