fix: label personal accounts with user names
This commit is contained in:
@@ -26,6 +26,7 @@ main_bp = Blueprint("main", __name__)
|
|||||||
|
|
||||||
|
|
||||||
def _community_account_cards(month, previous_month):
|
def _community_account_cards(month, previous_month):
|
||||||
|
personal_label_map = personal_account_names()
|
||||||
community_accounts = CommunityAccount.query.filter_by(is_active=True).order_by(
|
community_accounts = CommunityAccount.query.filter_by(is_active=True).order_by(
|
||||||
CommunityAccount.sort_order.asc(), CommunityAccount.name.asc()
|
CommunityAccount.sort_order.asc(), CommunityAccount.name.asc()
|
||||||
).all()
|
).all()
|
||||||
@@ -73,9 +74,15 @@ def _community_account_cards(month, previous_month):
|
|||||||
)
|
)
|
||||||
assigned_budget_names = [category.name for category in assigned_categories]
|
assigned_budget_names = [category.name for category in assigned_categories]
|
||||||
delta = current_total - previous_total
|
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(
|
cards.append(
|
||||||
{
|
{
|
||||||
"community_account": community_account,
|
"community_account": community_account,
|
||||||
|
"display_name": display_name,
|
||||||
"current_total": current_total,
|
"current_total": current_total,
|
||||||
"previous_total": previous_total,
|
"previous_total": previous_total,
|
||||||
"delta": delta,
|
"delta": delta,
|
||||||
|
|||||||
@@ -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):
|
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}
|
current_entry_values = {item.entry_id: to_decimal(item.planned_amount) for item in month.entry_values}
|
||||||
previous_entry_values = (
|
previous_entry_values = (
|
||||||
{item.entry_id: to_decimal(item.planned_amount) for item in previous_month.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]
|
assigned_budget_names = [category.name for category in assigned_categories]
|
||||||
delta = current_total - previous_total
|
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(
|
cards.append(
|
||||||
{
|
{
|
||||||
"community_account": community_account,
|
"community_account": community_account,
|
||||||
|
"display_name": display_name,
|
||||||
"current_total": current_total,
|
"current_total": current_total,
|
||||||
"previous_total": previous_total,
|
"previous_total": previous_total,
|
||||||
"delta": delta,
|
"delta": delta,
|
||||||
|
|||||||
@@ -71,7 +71,7 @@
|
|||||||
{% if card.is_read_only %}
|
{% if card.is_read_only %}
|
||||||
<div class="summary-category-card summary-static-card community-account-card">
|
<div class="summary-category-card summary-static-card community-account-card">
|
||||||
<div class="summary-card-head">
|
<div class="summary-card-head">
|
||||||
<strong>{{ card.community_account.name }}</strong>
|
<strong>{{ card.display_name }}</strong>
|
||||||
<span class="icon-label muted-label">Nur Anzeige</span>
|
<span class="icon-label muted-label">Nur Anzeige</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="summary-card-meta">
|
<div class="summary-card-meta">
|
||||||
@@ -89,7 +89,7 @@
|
|||||||
{% else %}
|
{% else %}
|
||||||
<button type="button" class="summary-category-card community-account-card" data-open-dialog="community-account-item-{{ card.community_account.id }}">
|
<button type="button" class="summary-category-card community-account-card" data-open-dialog="community-account-item-{{ card.community_account.id }}">
|
||||||
<div class="summary-card-head">
|
<div class="summary-card-head">
|
||||||
<strong>{{ card.community_account.name }}</strong>
|
<strong>{{ card.display_name }}</strong>
|
||||||
<img src="{{ url_for('static', filename='icons/pencil.svg') }}" alt="" class="ui-icon small-ui-icon">
|
<img src="{{ url_for('static', filename='icons/pencil.svg') }}" alt="" class="ui-icon small-ui-icon">
|
||||||
</div>
|
</div>
|
||||||
<div class="summary-card-meta">
|
<div class="summary-card-meta">
|
||||||
|
|||||||
@@ -107,8 +107,8 @@ def test_planning_shows_budgets_and_community_accounts(logged_in_client):
|
|||||||
assert response.status_code == 200
|
assert response.status_code == 200
|
||||||
assert b"Budgets" in response.data
|
assert b"Budgets" in response.data
|
||||||
assert b"Gemeinschaftskonten" in response.data
|
assert b"Gemeinschaftskonten" in response.data
|
||||||
assert b"Privatkonto 1" in response.data
|
assert b"Auszahlung Person A" in response.data
|
||||||
assert b"Privatkonto 2" in response.data
|
assert b"Auszahlung Person B" in response.data
|
||||||
|
|
||||||
|
|
||||||
def test_community_account_can_assign_budget_categories(logged_in_client):
|
def test_community_account_can_assign_budget_categories(logged_in_client):
|
||||||
|
|||||||
Reference in New Issue
Block a user