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

Fixed displayIncomeAndExpenditure.vue

Browse Source
This commit is contained in:
florianfederspiel
2025-03-05 18:54:13 +01:00
parent 4c6cce416d
commit 29860684cb
2 changed files with 42 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/displayIncomeAndExpenditure.vue
View File

@@ -12,9 +12,11 @@ let incomeData = ref({})
let expenseData = ref({})
const setup = async () => {
let incomeRawData = (await supabase.from("createddocuments").select().eq("tenant",profileStore.currentTenant).in('type',['invoices'])).data
let incomeRawData = (await supabase.from("createddocuments").select().eq("tenant",profileStore.currentTenant).in('type',['invoices','cancellationInvoices'])).data
let expenseRawData =(await supabase.from("incominginvoices").select().eq("tenant",profileStore.currentTenant)).data
expenseRawData = expenseRawData.filter(i => i.date).map(i => {
let amount = 0
@@ -66,13 +68,17 @@ const setup = async () => {
expenseData.value = expenseMonths
console.log(incomeRawData)
incomeRawData = incomeRawData.map(i => {
let amount = 0
i.rows.forEach(r => {
if(r.mode !== "pagebreak" && r.mode !== "title"){
console.log("New Row")
if(r.mode !== "pagebreak" && r.mode !== "title" && r.mode !== "text"){
amount += r.price * r.quantity * (1 - r.discountPercent/100)
}
console.log(amount)
})
amount = Number(amount.toFixed(2))

62
pages/index.vue
View File

@@ -13,37 +13,43 @@
</template>
</UDashboardNavbar>
<UDashboardPanelContent class="flex flex-row">
<UDashboardCard
class="w-1/3 h-fit mx-2 mt-3"
title="Anwesenheiten"
>
<UDashboardPanelContent class="flex flex-col">
<div>
<UDashboardCard
class="mt-3"
>
<display-income-and-expenditure/>
</UDashboardCard>
</div>
<div class="flex flex-row">
<UDashboardCard
class="w-1/3 h-fit mr-2 mt-3"
title="Anwesenheiten"
>
<display-present-profiles/>
</UDashboardCard>
<UDashboardCard
class="w-1/3 h-fit mx-2 mt-3"
>
<display-running-time/>
</UDashboardCard>
</UDashboardCard>
<UDashboardCard
class="w-1/3 h-fit mx-2 mt-3"
>
<display-running-time/>
</UDashboardCard>
<!-- <UDashboardCard
class="mt-3"
>
<display-income-and-expenditure/>
</UDashboardCard>-->
<UDashboardCard
class="w-1/3 h-fit mx-2 mt-3"
v-if="profileStore.ownTenant.features.accounting"
>
<display-open-balances/>
</UDashboardCard>
<UDashboardCard
class="w-1/3 h-fit mx-2 mt-3"
title="Projekte"
>
<display-projects-in-phases/>
</UDashboardCard>
<UDashboardCard
class="w-1/3 h-fit mx-2 mt-3"
v-if="profileStore.ownTenant.features.accounting"
>
<display-open-balances/>
</UDashboardCard>
<UDashboardCard
class="w-1/3 h-fit ml-2 mt-3"
title="Projekte"
>
<display-projects-in-phases/>
</UDashboardCard>
</div>
</UDashboardPanelContent>
</UDashboardPanel>
</UDashboardPage>