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

@@ -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,
},
},
},
},
],
}))