flfeders/FEDEO
2
1
Fork 0
Code Issues 62 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({}) let expenseData = ref({})
const setup = async () => { 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 let expenseRawData =(await supabase.from("incominginvoices").select().eq("tenant",profileStore.currentTenant)).data
expenseRawData = expenseRawData.filter(i => i.date).map(i => { expenseRawData = expenseRawData.filter(i => i.date).map(i => {
let amount = 0 let amount = 0
@@ -66,13 +68,17 @@ const setup = async () => {
expenseData.value = expenseMonths expenseData.value = expenseMonths
console.log(incomeRawData)
incomeRawData = incomeRawData.map(i => { incomeRawData = incomeRawData.map(i => {
let amount = 0 let amount = 0
i.rows.forEach(r => { 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) amount += r.price * r.quantity * (1 - r.discountPercent/100)
} }
console.log(amount)
}) })
amount = Number(amount.toFixed(2)) amount = Number(amount.toFixed(2))

62
pages/index.vue
View File

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