From 29860684cb55a770a7b37f1fc0e28151b3099eaf Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Wed, 5 Mar 2025 18:54:13 +0100
Subject: [PATCH] Fixed displayIncomeAndExpenditure.vue

---
 components/displayIncomeAndExpenditure.vue | 10 +++-
 pages/index.vue                            | 62 ++++++++++++----------
 2 files changed, 42 insertions(+), 30 deletions(-)

diff --git a/components/displayIncomeAndExpenditure.vue b/components/displayIncomeAndExpenditure.vue
index 736d963..aea8564 100644
--- a/components/displayIncomeAndExpenditure.vue
+++ b/components/displayIncomeAndExpenditure.vue
@@ -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))
diff --git a/pages/index.vue b/pages/index.vue
index e48f58b..99a879f 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -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>