Store change rest
This commit is contained in:
@@ -42,7 +42,9 @@
|
||||
class="mt-2"
|
||||
>
|
||||
<USelectMenu
|
||||
:options="usersForList"
|
||||
:options="dataStore.profiles"
|
||||
value-attribute="id"
|
||||
option-attribute="fullName"
|
||||
v-model="createTaskData.users"
|
||||
multiple
|
||||
/>
|
||||
@@ -184,7 +186,7 @@ const showDoneTasks = ref(false)
|
||||
const searchString = ref("")
|
||||
const filteredRows = computed(() => {
|
||||
|
||||
let filteredTasks = dataStore.tasks.value.filter(task => !showDoneTasks.value ? task.categorie !== "Erledigt" : task.categorie === "Erledigt")
|
||||
let filteredTasks = dataStore.tasks.filter(task => !showDoneTasks.value ? task.categorie !== "Erledigt" : task.categorie === "Erledigt")
|
||||
|
||||
if(!searchString.value) {
|
||||
return filteredTasks
|
||||
|
||||
@@ -25,8 +25,8 @@ const timeInfo = ref({
|
||||
|
||||
const filteredRows = computed(() => {
|
||||
|
||||
if(user.value && times.value) {
|
||||
return times.value.filter(time => time.user === user.value.id)
|
||||
if(user.value && dataStore.times) {
|
||||
return dataStore.times.filter(time => time.user === user.value.id)
|
||||
} else {
|
||||
return []
|
||||
}
|
||||
@@ -100,7 +100,7 @@ const startTime = async () => {
|
||||
} else if(data) {
|
||||
timeInfo.value = data[0]
|
||||
await dataStore.fetchTimes()
|
||||
runningTimeInfo.value = times.value.find(time => time.user == user.value.id && !time.end)
|
||||
runningTimeInfo.value = dataStore.times.find(time => time.user === user.value.id && !time.end)
|
||||
}
|
||||
|
||||
}
|
||||
@@ -131,8 +131,8 @@ const stopStartedTime = async () => {
|
||||
}
|
||||
}
|
||||
|
||||
if(times.value.find(time => time.user == user.value.id && !time.end)) {
|
||||
runningTimeInfo.value = times.value.find(time => time.user == user.value.id && !time.end)
|
||||
if(dataStore.times.find(time => time.user == user.value.id && !time.end)) {
|
||||
runningTimeInfo.value = dataStore.times.find(time => time.user == user.value.id && !time.end)
|
||||
}
|
||||
|
||||
|
||||
@@ -158,16 +158,6 @@ const format = (date) => {
|
||||
|
||||
return `${dateFormat}`;
|
||||
}
|
||||
|
||||
const selectStartedTime = () => {
|
||||
runningTimeInfo.value = times.value.find(time => time.user == user.value.id && !time.end)
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
//selectStartedTime()
|
||||
|
||||
</script>
|
||||
|
||||
<template>
|
||||
@@ -381,7 +371,7 @@ const selectStartedTime = () => {
|
||||
:empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Noch keine Einträge' }"
|
||||
>
|
||||
<template #user-data="{row}">
|
||||
{{dataStore.profiles.find(profile => profile.id === row.user) ? dataStore.profiles.find(profile => profile.id === row.user).firstName + " " + profiles.find(profile => profile.id === row.user).lastName : row.user }}
|
||||
{{dataStore.profiles.find(profile => profile.id === row.user) ? dataStore.profiles.find(profile => profile.id === row.user).fullName : row.user }}
|
||||
</template>
|
||||
|
||||
<template #start-data="{row}">
|
||||
@@ -391,10 +381,10 @@ const selectStartedTime = () => {
|
||||
{{dayjs(row.end).format("DD.MM.YY HH:mm")}}
|
||||
</template>
|
||||
<template #projectId-data="{row}">
|
||||
{{projects.find(project => project.id === row.projectId) ? projects.find(project => project.id === row.projectId).name : ""}}
|
||||
{{dataStore.projects.find(project => project.id === row.projectId) ? dataStore.projects.find(project => project.id === row.projectId).name : ""}}
|
||||
</template>
|
||||
<template #job-data="{row}">
|
||||
{{jobs.find(job => job.id === row.job) ? jobs.find(job => job.id === row.job).title : ""}}
|
||||
{{dataStore.jobs.find(job => job.id === row.job) ? dataStore.jobs.find(job => job.id === row.job).title : ""}}
|
||||
</template>
|
||||
</UTable>
|
||||
</template>
|
||||
|
||||
@@ -150,7 +150,7 @@ export const useDataStore = defineStore('data', () => {
|
||||
projects.value = (await supabase.from("projects").select()).data
|
||||
}
|
||||
async function fetchSpaces () {
|
||||
spaces.value = (await supabase.from("spaces").select()).data
|
||||
spaces.value = (await supabase.from("spaces").select().order("spaceNumber", {ascending:true})).data
|
||||
}
|
||||
async function fetchMovements () {
|
||||
movements.value = (await supabase.from("movements").select()).data
|
||||
@@ -168,7 +168,7 @@ export const useDataStore = defineStore('data', () => {
|
||||
historyItems.value = (await supabase.from("historyItems").select()).data
|
||||
}
|
||||
async function fetchVendors () {
|
||||
vendors.value = (await supabase.from("vendors").select()).data
|
||||
vendors.value = (await supabase.from("vendors").select().order("vendorNumber", {ascending:true})).data
|
||||
}
|
||||
async function fetchVendorInvoices () {
|
||||
vendorInvoices.value = (await supabase.from("vendorInvoices").select()).data
|
||||
|
||||
Reference in New Issue
Block a user