flfeders/FEDEO
2
1
Fork 0
Code Issues 62 Pull Requests Actions Packages Projects 21 Releases Wiki Activity

Store change rest

Browse Source
This commit is contained in:
Florian Federspiel
2023-12-27 22:11:41 +01:00
parent c41b99f29d
commit 57e856c71c
3 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spaces/pages/tasks.vue
View File

@@ -42,7 +42,9 @@
class="mt-2" class="mt-2"
> >
<USelectMenu <USelectMenu
:options="usersForList" :options="dataStore.profiles"
value-attribute="id"
option-attribute="fullName"
v-model="createTaskData.users" v-model="createTaskData.users"
multiple multiple
/> />
@@ -184,7 +186,7 @@ const showDoneTasks = ref(false)
const searchString = ref("") const searchString = ref("")
const filteredRows = computed(() => { 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) { if(!searchString.value) {
return filteredTasks return filteredTasks

26
spaces/pages/timetracking.vue
View File

@@ -25,8 +25,8 @@ const timeInfo = ref({
const filteredRows = computed(() => { const filteredRows = computed(() => {
if(user.value && times.value) { if(user.value && dataStore.times) {
return times.value.filter(time => time.user === user.value.id) return dataStore.times.filter(time => time.user === user.value.id)
} else { } else {
return [] return []
} }
@@ -100,7 +100,7 @@ const startTime = async () => {
} else if(data) { } else if(data) {
timeInfo.value = data[0] timeInfo.value = data[0]
await dataStore.fetchTimes() 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)) { if(dataStore.times.find(time => time.user == user.value.id && !time.end)) {
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)
} }
@@ -158,16 +158,6 @@ const format = (date) => {
return `${dateFormat}`; return `${dateFormat}`;
} }
const selectStartedTime = () => {
runningTimeInfo.value = times.value.find(time => time.user == user.value.id && !time.end)
}
//selectStartedTime()
</script> </script>
<template> <template>
@@ -381,7 +371,7 @@ const selectStartedTime = () => {
:empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Noch keine Einträge' }" :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Noch keine Einträge' }"
> >
<template #user-data="{row}"> <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>
<template #start-data="{row}"> <template #start-data="{row}">
@@ -391,10 +381,10 @@ const selectStartedTime = () => {
{{dayjs(row.end).format("DD.MM.YY HH:mm")}} {{dayjs(row.end).format("DD.MM.YY HH:mm")}}
</template> </template>
<template #projectId-data="{row}"> <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>
<template #job-data="{row}"> <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> </template>
</UTable> </UTable>
</template> </template>

4
spaces/stores/data.ts
View File

@@ -150,7 +150,7 @@ export const useDataStore = defineStore('data', () => {
projects.value = (await supabase.from("projects").select()).data projects.value = (await supabase.from("projects").select()).data
} }
async function fetchSpaces () { 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 () { async function fetchMovements () {
movements.value = (await supabase.from("movements").select()).data 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 historyItems.value = (await supabase.from("historyItems").select()).data
} }
async function fetchVendors () { 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 () { async function fetchVendorInvoices () {
vendorInvoices.value = (await supabase.from("vendorInvoices").select()).data vendorInvoices.value = (await supabase.from("vendorInvoices").select()).data