1 Commits

Author SHA1 Message Date
8d47aa336e Merge pull request 'try to do better' (#22) from feature/history into master
Some checks failed
Build and Publish Images / build-and-push (push) Failing after 3m48s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/22
2026-02-12 15:44:17 +00:00
2 changed files with 2 additions and 1 deletions

View File

@@ -153,6 +153,7 @@ impl ExpenseService {
.map(|((year, month), expenses)| { .map(|((year, month), expenses)| {
let total_amount: Decimal = expenses let total_amount: Decimal = expenses
.iter() .iter()
.filter(|e| e.active)
.map(|e| e.amount) .map(|e| e.amount)
.sum(); .sum();
MonthlyExpenseGroup { MonthlyExpenseGroup {

View File

@@ -3,7 +3,7 @@ import { useParams, useNavigate } from 'react-router-dom';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { categoryApi, expenseApi, inviteLinkApi } from '../api/client'; import { categoryApi, expenseApi, inviteLinkApi } from '../api/client';
import { useStore } from '../store/useStore'; import { useStore } from '../store/useStore';
import type { Category, InviteLinkResponse, ExpenseHistoryResponse } from '../types'; import type { Category, Expense, InviteLinkResponse, ExpenseHistoryResponse } from '../types';
import { import {
Wallet, Wallet,
TrendingDown, TrendingDown,