From 5b752ab7c4912b1dabd9df5bdb6e72b29084c3d5 Mon Sep 17 00:00:00 2001 From: Florian Heinz Date: Tue, 21 Apr 2026 21:49:54 +0200 Subject: [PATCH] fix: label personal accounts with user names --- app/main/routes.py | 7 +++++++ app/planning/routes.py | 7 +++++++ app/templates/planning/detail.html | 4 ++-- tests/test_routes.py | 4 ++-- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/app/main/routes.py b/app/main/routes.py index d48d669..8e48ba0 100644 --- a/app/main/routes.py +++ b/app/main/routes.py @@ -26,6 +26,7 @@ main_bp = Blueprint("main", __name__) def _community_account_cards(month, previous_month): + personal_label_map = personal_account_names() community_accounts = CommunityAccount.query.filter_by(is_active=True).order_by( CommunityAccount.sort_order.asc(), CommunityAccount.name.asc() ).all() @@ -73,9 +74,15 @@ def _community_account_cards(month, previous_month): ) assigned_budget_names = [category.name for category in assigned_categories] delta = current_total - previous_total + display_name = ( + f"Auszahlung {personal_label_map.get(community_account.linked_account_slug, community_account.name)}" + if community_account.account_type == "personal" and community_account.linked_account_slug + else community_account.name + ) cards.append( { "community_account": community_account, + "display_name": display_name, "current_total": current_total, "previous_total": previous_total, "delta": delta, diff --git a/app/planning/routes.py b/app/planning/routes.py index 2d2b490..fd296a0 100644 --- a/app/planning/routes.py +++ b/app/planning/routes.py @@ -102,6 +102,7 @@ def _resolve_avatar_url(existing: str | None = None) -> str | None: def _community_account_totals(month, previous_month, community_accounts, budget_categories): + personal_label_map = personal_account_names() current_entry_values = {item.entry_id: to_decimal(item.planned_amount) for item in month.entry_values} previous_entry_values = ( {item.entry_id: to_decimal(item.planned_amount) for item in previous_month.entry_values} @@ -157,9 +158,15 @@ def _community_account_totals(month, previous_month, community_accounts, budget_ ) assigned_budget_names = [category.name for category in assigned_categories] delta = current_total - previous_total + display_name = ( + f"Auszahlung {personal_label_map.get(community_account.linked_account_slug, community_account.name)}" + if community_account.account_type == "personal" and community_account.linked_account_slug + else community_account.name + ) cards.append( { "community_account": community_account, + "display_name": display_name, "current_total": current_total, "previous_total": previous_total, "delta": delta, diff --git a/app/templates/planning/detail.html b/app/templates/planning/detail.html index 6a9ca99..cf4f702 100644 --- a/app/templates/planning/detail.html +++ b/app/templates/planning/detail.html @@ -71,7 +71,7 @@ {% if card.is_read_only %}
- {{ card.community_account.name }} + {{ card.display_name }} Nur Anzeige
@@ -89,7 +89,7 @@ {% else %}