From 07d1496d630d9ac2b489b21f3df0885af42398b0 Mon Sep 17 00:00:00 2001
From: xds <iam@voroninv.ru>
Date: Thu, 13 Feb 2025 16:58:48 +0300
Subject: [PATCH] calendar fixs

---
 src/components/budgets/BudgetView2.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/budgets/BudgetView2.vue b/src/components/budgets/BudgetView2.vue
index 4f81513..faf5ba4 100644
--- a/src/components/budgets/BudgetView2.vue
+++ b/src/components/budgets/BudgetView2.vue
@@ -646,7 +646,7 @@ watch([budget, plannedExpenses], () => {
     const expenses = plannedExpenses.value.filter((transaction) => {
       return transaction.date === formattedDate;
     });
-    const expensesSum = expenses.reduce((sum, expense) => sum + (expense.amount || 0), 0);
+    const expensesSum = expenses.reduce((sum, expense) => !expense.isDone ? sum + (expense.amount || 0): 0, 0);
 
     if (expenses.length == 0) {
       if (!periodStart) periodStart = new Date(currentDate); // Сохраняем начало периода без трат
@@ -1021,8 +1021,11 @@ onUnmounted(async () => {
 
                   <div v-for="day, dayOne in calendar" class="flex flex-col justify-between p-4 shadow-lg rounded-lg " v-if="calendarExpanded"
                        :class="day.date.toISOString().split('T')[0] == new Date().toISOString().split('T')[0]? 'bg-emerald-200' : 'bg-white '">
-                    <p class="font-bold text-xl">{{ day.dateStr }} <span
-                        v-if="day.expensesSum>0"> Траты по плану: {{ formatAmount(day.expensesSum) }} ₽</span></p>
+                    <div class="flex flex-row gap-2 items-center ">
+                    <span class="font-bold text-xl">{{ day.dateStr }} </span>
+                    <span
+                        v-if="day.expensesSum>0">Трат по плану: {{ formatAmount(day.expensesSum) }} ₽</span>
+                    </div>
 
                     <BudgetTransactionView v-for="expense in day.expenses" :key="expense.id"
                                            :transaction="expense"