Merge branch 'main' into #44-vacation-summary-of-all-employees

# Conflicts:
#	resources/js/Shared/MainMenu.vue
This commit is contained in:
Adrian Hopek
2022-03-23 09:12:17 +01:00
33 changed files with 945 additions and 1468 deletions

View File

@@ -65,7 +65,7 @@ const types = [
},
]
export function useVacationTypeInfo() {
export default function useVacationTypeInfo() {
const getTypes = () => types
const findType = value => types.find(type => type.value === value)

View File

@@ -1,5 +1,5 @@
import {computed} from 'vue'
import {usePage} from '@inertiajs/inertia-vue3'
import { computed } from 'vue'
import { usePage } from '@inertiajs/inertia-vue3'
export default function useCurrentYearPeriodInfo() {
const minDate = computed(() => new Date(usePage().props.value.years.current, 0, 1))