diff --git a/frontend/components/displayBankaccounts.vue b/frontend/components/displayBankaccounts.vue index 07978a7..5fe2512 100644 --- a/frontend/components/displayBankaccounts.vue +++ b/frontend/components/displayBankaccounts.vue @@ -6,9 +6,13 @@ let unallocatedStatements = ref(0) let bankaccounts = ref([]) const setupPage = async () => { - let bankstatements = (await useEntities("bankstatements").select("*, statementallocations(*)","date",true)).filter(i => !i.archived) + const [statementItems, accountItems] = await Promise.all([ + useEntities("bankstatements").select("*, statementallocations(*)", "date", true), + useEntities("bankaccounts").select() + ]) + let bankstatements = statementItems.filter(i => !i.archived) unallocatedStatements.value = bankstatements.filter(i => Number(calculateOpenSum(i)) !== 0).length - bankaccounts.value = await useEntities("bankaccounts").select() + bankaccounts.value = accountItems } setupPage() @@ -51,4 +55,4 @@ const calculateOpenSum = (statement) => { \ No newline at end of file + diff --git a/frontend/components/displayOpenBalances.vue b/frontend/components/displayOpenBalances.vue index b23082f..fe8e9c5 100644 --- a/frontend/components/displayOpenBalances.vue +++ b/frontend/components/displayOpenBalances.vue @@ -10,9 +10,11 @@ let draftInvoicesSum = ref(0) let draftInvoicesCount = ref(0) let countPreparedOpenIncomingInvoices = ref(0) +const { loadCoreData } = useDashboardData() const setupPage = async () => { - let items = (await useEntities("createddocuments").select("*, statementallocations(*), customer(id,name), linkedDocument(*)")).filter(i => !i.archived) + const { createdDocuments, incomingInvoices } = await loadCoreData() + let items = createdDocuments.filter(i => !i.archived) let documents = items.filter(i => i.type === "invoices" ||i.type === "advanceInvoices") let draftDocuments = documents.filter(i => i.state === "Entwurf") @@ -36,7 +38,7 @@ const setupPage = async () => { }) draftInvoicesCount.value = draftDocuments.length - countPreparedOpenIncomingInvoices.value = (await useEntities("incominginvoices").select("id, state")).filter(i => i.state === "Vorbereitet" && !i.archived).length + countPreparedOpenIncomingInvoices.value = incomingInvoices.filter(i => i.state === "Vorbereitet" && !i.archived).length } setupPage() diff --git a/frontend/composables/useDashboardData.ts b/frontend/composables/useDashboardData.ts index d92acf8..61c4a40 100644 --- a/frontend/composables/useDashboardData.ts +++ b/frontend/composables/useDashboardData.ts @@ -32,7 +32,7 @@ export const useDashboardData = () => { if (!force && cache.pendingRequest) return cache.pendingRequest cache.pendingRequest = Promise.all([ - useEntities("createddocuments").select(), + useEntities("createddocuments").select("*, statementallocations(*), customer(id,name), linkedDocument(*)"), useEntities("incominginvoices").select() ]) .then(([createdDocuments, incomingInvoices]) => {