gru/lista_zakupowa_live
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

poprawa logiki liczenia w panelu

Browse Source
This commit is contained in:
Mateusz Gruszczyński
2025-07-31 13:10:48 +02:00
parent ebc3f8f5a7
commit 1208088de5
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app.py
View File

@@ -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)
),
)
)