calendar fixs
This commit is contained in:
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user