From 1208088de5e2aaa9022bd0ce4898a1bac4eab75e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Gruszczy=C5=84ski?= Date: Thu, 31 Jul 2025 13:10:48 +0200 Subject: [PATCH] poprawa logiki liczenia w panelu --- app.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app.py b/app.py index d6c2b15..17be17d 100644 --- a/app.py +++ b/app.py @@ -755,13 +755,13 @@ def get_admin_expense_summary(): total = base_query.scalar() or 0 year_total = ( base_query.filter( - extract("year", Expense.added_at) == current_year + extract("year", ShoppingList.created_at) == current_year ).scalar() or 0 ) month_total = ( - base_query.filter(extract("year", Expense.added_at) == current_year) - .filter(extract("month", Expense.added_at) == current_month) + base_query.filter(extract("year", ShoppingList.created_at) == current_year) + .filter(extract("month", ShoppingList.created_at) == current_month) .scalar() or 0 ) @@ -780,10 +780,10 @@ def get_admin_expense_summary(): base.filter( ShoppingList.is_archived == False, ~( - (ShoppingList.is_temporary == True) & - (ShoppingList.expires_at != None) & - (ShoppingList.expires_at <= now) - ) + (ShoppingList.is_temporary == True) + & (ShoppingList.expires_at != None) + & (ShoppingList.expires_at <= now) + ), ) )