QT/sure
1
0
Fork 0
mirror of https://github.com/we-promise/sure.git synced 2026-04-07 14:31:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Apply right formatting for money values in outflows section (#425)

Browse Source
This commit is contained in:
Alessio Cappa
2025-12-07 15:42:04 +01:00
committed by GitHub
parent 9bef3fd235
commit 04189dec00
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/pages_controller.rb
View File

@@ -14,7 +14,7 @@ class PagesController < ApplicationController
expense_totals = Current.family.income_statement.expense_totals(period: @period)
@cashflow_sankey_data = build_cashflow_sankey_data(income_totals, expense_totals, family_currency)
@outflows_data = build_outflows_donut_data(expense_totals)
@outflows_data = build_outflows_donut_data(expense_totals, family_currency)
@dashboard_sections = build_dashboard_sections
@@ -213,8 +213,7 @@ class PagesController < ApplicationController
{ nodes: nodes, links: links, currency_symbol: Money::Currency.new(currency_symbol).symbol }
end
def build_outflows_donut_data(expense_totals)
currency_symbol = Money::Currency.new(expense_totals.currency).symbol
def build_outflows_donut_data(expense_totals, family_currency)
total = expense_totals.total
# Only include top-level categories with non-zero amounts
@@ -226,12 +225,13 @@ class PagesController < ApplicationController
id: ct.category.id,
name: ct.category.name,
amount: ct.total.to_f.round(2),
currency: ct.currency,
percentage: ct.weight.round(1),
color: ct.category.color.presence || Category::UNCATEGORIZED_COLOR,
icon: ct.category.lucide_icon
}
end
{ categories: categories, total: total.to_f.round(2), currency_symbol: currency_symbol }
{ categories: categories, total: total.to_f.round(2), currency: family_currency, currency_symbol: Money::Currency.new(family_currency).symbol }
end
end

4
app/views/pages/dashboard/_outflows_donut.html.erb
View File

@@ -33,7 +33,7 @@
</div>
<div class="text-3xl font-medium text-primary">
<%= outflows_data[:currency_symbol] %><%= number_with_delimiter(outflows_data[:total], delimiter: ",") %>
<%= format_money Money.new(outflows_data[:total], outflows_data[:currency]) %>
</div>
</div>
@@ -84,7 +84,7 @@
<span class="text-sm font-medium text-primary truncate"><%= category[:name] %></span>
</div>
<div class="flex items-center gap-4 flex-shrink-0">
<span class="text-sm font-medium text-primary whitespace-nowrap"><%= outflows_data[:currency_symbol] %><%= number_with_delimiter(category[:amount], delimiter: ",") %></span>
<span class="text-sm font-medium text-primary whitespace-nowrap"><%= format_money Money.new(category[:amount], category[:currency]) %></span>
<span class="text-sm text-secondary whitespace-nowrap"><%= category[:percentage] %>%</span>
</div>
<% end %>