Added start/enddate rendering

This commit is contained in:
2025-01-07 10:16:36 +01:00
parent 7f23d8efd8
commit 5ee5e671e7
3 changed files with 41 additions and 3 deletions

View File

@@ -0,0 +1,15 @@
<script setup>
import dayjs from "dayjs";
const props = defineProps({
row: {
type: Object,
required: true,
default: {}
}
})
</script>
<template>
<span v-if="props.row.endDate">{{dayjs(props.row.endDate).format("DD.MM.YYYY")}}</span>
</template>

View File

@@ -0,0 +1,15 @@
<script setup>
import dayjs from "dayjs";
const props = defineProps({
row: {
type: Object,
required: true,
default: {}
}
})
</script>
<template>
<span v-if="props.row.startDate">{{dayjs(props.row.startDate).format("DD.MM.YYYY")}}</span>
</template>

View File

@@ -28,6 +28,8 @@ import usePlanning from "~/components/columnRenderings/usePlanning.vue"
import sellingPriceComposedMaterial from "~/components/columnRenderings/sellingPriceComposedMaterial.vue" import sellingPriceComposedMaterial from "~/components/columnRenderings/sellingPriceComposedMaterial.vue"
import sellingPriceComposedWorker from "~/components/columnRenderings/sellingPriceComposedWorker.vue" import sellingPriceComposedWorker from "~/components/columnRenderings/sellingPriceComposedWorker.vue"
import sellingPriceComposedTotal from "~/components/columnRenderings/sellingPriceComposedTotal.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 quantity from "~/components/helpRenderings/quantity.vue"
import {useZipCheck} from "~/composables/useZipCheck.js"; import {useZipCheck} from "~/composables/useZipCheck.js";
@@ -464,6 +466,7 @@ export const useDataStore = defineStore('data', () => {
labelSingle: "Abwesenheitsantrag", labelSingle: "Abwesenheitsantrag",
isStandardEntity: true, isStandardEntity: true,
supabaseSelectWithInformation: "*", supabaseSelectWithInformation: "*",
historyItemHolder: "absencerequest",
redirect:true, redirect:true,
filters:[], filters:[],
templateColumns:[ templateColumns:[
@@ -498,6 +501,7 @@ export const useDataStore = defineStore('data', () => {
selectValueAttribute: "label", selectValueAttribute: "label",
selectManualOptions: [ selectManualOptions: [
{label:"Urlaub"}, {label:"Urlaub"},
{label:"Berufsschule"},
{label:"unbezahlter Urlaub"}, {label:"unbezahlter Urlaub"},
{label:"Überstundenausgleich"}, {label:"Überstundenausgleich"},
{label:"Sonderurlaub(bezahlt)"}, {label:"Sonderurlaub(bezahlt)"},
@@ -511,11 +515,13 @@ export const useDataStore = defineStore('data', () => {
},{ },{
key: "startDate", key: "startDate",
label: "Start", label: "Start",
inputType: "date" inputType: "date",
component: startDate
},{ },{
key: "endDate", key: "endDate",
label: "Ende", label: "Ende",
inputType: "date" inputType: "date",
component: endDate
},{ },{
key: "note", key: "note",
label: "Notizen", label: "Notizen",
@@ -1846,6 +1852,8 @@ export const useDataStore = defineStore('data', () => {
name = "Nachname" name = "Nachname"
} else if(key === "name") { } else if(key === "name") {
name = "Name" name = "Name"
} else if(key === "approved") {
name = "Genehmigt"
} else if(key === "customer") { } else if(key === "customer") {
name = "Kunde" name = "Kunde"
if(prop.data.o) oldVal = customers.value.find(i => i.id === prop.data.o).name 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]) 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) + ')') await eval( dataType + '.value.push(' + JSON.stringify(...supabaseData) + ')')
} }