feat: Buchungs-Pagination, Inbox-Scan-Button, Grafana-Direktansteuerung, UI-Feinschliff

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
2026-07-19 16:18:54 +02:00
parent 0bad69bf42
commit d71c22adce
10 changed files with 149 additions and 13 deletions

View File

@@ -19,10 +19,12 @@ from app.routers.planning import list_planned as _list_planned
from app.routers.planning import list_recurring as _list_recurring
from app.routers.planning import recurring_suggestions as _recurring_suggestions
from app.routers.scenarios import list_scenarios as _list_scenarios
from app.routers.transactions import list_transactions
from app.routers.transactions import count_transactions, list_transactions
from app.services.balances import account_balance, total_balance
from app.version import get_version
PAGE_SIZE = 50
templates = Jinja2Templates(directory="app/templates")
templates.env.globals["app_version"] = get_version()
router = APIRouter()
@@ -81,8 +83,21 @@ def buchungen(
category_id: int | None = None,
q: str | None = None,
status: str = "confirmed",
page: int = 1,
session: Session = Depends(get_session),
):
page = max(1, page)
total = count_transactions(
account_id=account_id,
date_from=date_from,
date_to=date_to,
category_id=category_id,
q=q,
status=status,
session=session,
)
total_pages = max(1, -(-total // PAGE_SIZE)) # ceil division
page = min(page, total_pages)
txs = list_transactions(
account_id=account_id,
date_from=date_from,
@@ -90,8 +105,8 @@ def buchungen(
category_id=category_id,
q=q,
status=status,
limit=200,
offset=0,
limit=PAGE_SIZE,
offset=(page - 1) * PAGE_SIZE,
session=session,
)
accounts = session.execute(select(Account)).scalars().all()
@@ -108,6 +123,8 @@ def buchungen(
"q": q or "",
"status": status,
},
"page": page,
"total_pages": total_pages,
})

View File

@@ -3,7 +3,7 @@ from decimal import Decimal
from fastapi import APIRouter, Depends, HTTPException
from pydantic import BaseModel, ConfigDict
from sqlalchemy import or_, select
from sqlalchemy import func, or_, select
from sqlalchemy.orm import Session
from app.auth import require_auth
@@ -46,19 +46,18 @@ class TransactionPatch(BaseModel):
category_id: int | None = None
@router.get("", response_model=list[TransactionOut])
def list_transactions(
def _apply_transaction_filters(
stmt,
account_id: int | None = None,
date_from: date | None = None,
date_to: date | None = None,
category_id: int | None = None,
q: str | None = None,
status: str = "confirmed",
limit: int = 200,
offset: int = 0,
session: Session = Depends(get_session),
):
stmt = select(Transaction)
"""Wendet die Buchungs-Filter auf ein select()-Statement an. Wird sowohl fuer
die Liste als auch fuer die dazugehoerige Gesamtanzahl (Pagination) genutzt,
damit beide garantiert dieselben Ergebnisse zaehlen/zeigen."""
if status:
stmt = stmt.where(Transaction.status == status)
if account_id is not None:
@@ -73,10 +72,47 @@ def list_transactions(
like = f"%{q}%"
stmt = stmt.where(or_(Transaction.purpose.ilike(like),
Transaction.counterparty.ilike(like)))
return stmt
@router.get("", response_model=list[TransactionOut])
def list_transactions(
account_id: int | None = None,
date_from: date | None = None,
date_to: date | None = None,
category_id: int | None = None,
q: str | None = None,
status: str = "confirmed",
limit: int = 200,
offset: int = 0,
session: Session = Depends(get_session),
):
stmt = _apply_transaction_filters(
select(Transaction), account_id=account_id, date_from=date_from,
date_to=date_to, category_id=category_id, q=q, status=status,
)
stmt = stmt.order_by(Transaction.booking_date, Transaction.id).offset(offset).limit(limit)
return [TransactionOut.model_validate(t) for t in session.execute(stmt).scalars()]
def count_transactions(
account_id: int | None = None,
date_from: date | None = None,
date_to: date | None = None,
category_id: int | None = None,
q: str | None = None,
status: str = "confirmed",
session: Session = Depends(get_session),
) -> int:
"""Gesamtanzahl der Buchungen fuer die gleichen Filter wie list_transactions
(ohne limit/offset) - Grundlage fuer die Seitenzahl in der GUI-Pagination."""
stmt = _apply_transaction_filters(
select(func.count(Transaction.id)), account_id=account_id, date_from=date_from,
date_to=date_to, category_id=category_id, q=q, status=status,
)
return session.execute(stmt).scalar_one()
@router.post("", response_model=TransactionOut, status_code=201)
def create_transaction(data: TransactionIn, session: Session = Depends(get_session)):
if session.get(Account, data.account_id) is None: