diff --git a/components/columnRenderings/endDate.vue b/components/columnRenderings/endDate.vue new file mode 100644 index 0000000..984152e --- /dev/null +++ b/components/columnRenderings/endDate.vue @@ -0,0 +1,15 @@ + + + diff --git a/components/columnRenderings/startDate.vue b/components/columnRenderings/startDate.vue new file mode 100644 index 0000000..19db5f4 --- /dev/null +++ b/components/columnRenderings/startDate.vue @@ -0,0 +1,15 @@ + + + diff --git a/stores/data.js b/stores/data.js index 181b3be..b67f95d 100644 --- a/stores/data.js +++ b/stores/data.js @@ -28,6 +28,8 @@ import usePlanning from "~/components/columnRenderings/usePlanning.vue" import sellingPriceComposedMaterial from "~/components/columnRenderings/sellingPriceComposedMaterial.vue" import sellingPriceComposedWorker from "~/components/columnRenderings/sellingPriceComposedWorker.vue" import sellingPriceComposedTotal from "~/components/columnRenderings/sellingPriceComposedTotal.vue" +import startDate from "~/components/columnRenderings/startDate.vue" +import endDate from "~/components/columnRenderings/endDate.vue" import quantity from "~/components/helpRenderings/quantity.vue" import {useZipCheck} from "~/composables/useZipCheck.js"; @@ -464,6 +466,7 @@ export const useDataStore = defineStore('data', () => { labelSingle: "Abwesenheitsantrag", isStandardEntity: true, supabaseSelectWithInformation: "*", + historyItemHolder: "absencerequest", redirect:true, filters:[], templateColumns:[ @@ -498,6 +501,7 @@ export const useDataStore = defineStore('data', () => { selectValueAttribute: "label", selectManualOptions: [ {label:"Urlaub"}, + {label:"Berufsschule"}, {label:"unbezahlter Urlaub"}, {label:"Überstundenausgleich"}, {label:"Sonderurlaub(bezahlt)"}, @@ -511,11 +515,13 @@ export const useDataStore = defineStore('data', () => { },{ key: "startDate", label: "Start", - inputType: "date" + inputType: "date", + component: startDate },{ key: "endDate", label: "Ende", - inputType: "date" + inputType: "date", + component: endDate },{ key: "note", label: "Notizen", @@ -1846,6 +1852,8 @@ export const useDataStore = defineStore('data', () => { name = "Nachname" } else if(key === "name") { name = "Name" + } else if(key === "approved") { + name = "Genehmigt" } else if(key === "customer") { name = "Kunde" if(prop.data.o) oldVal = customers.value.find(i => i.id === prop.data.o).name @@ -2035,7 +2043,7 @@ export const useDataStore = defineStore('data', () => { await generateHistoryItems(dataType, supabaseData[0]) - if(!["statementallocations", "productcategories", "projecttypes", "checks", "profiles","services", "inventoryitems"].includes(dataType) ){ + if(!["statementallocations","absencerequests", "productcategories", "projecttypes", "checks", "profiles","services", "inventoryitems"].includes(dataType) ){ await eval( dataType + '.value.push(' + JSON.stringify(...supabaseData) + ')') }