The personal finance app for everyone
Show budget averages in family currency
Zach Gollwitzere617d791d332
diff --git a/app/models/category.rb b/app/models/category.rbindex 90d2ce92..ebeadbf9 100644--- a/app/models/category.rb+++ b/app/models/category.rb@@ -107,6 +107,18 @@ class Category < ApplicationRecordfamily.category_stats.month_total_for(self, date: date)end+ def avg_monthly_total_money+ Money.new(avg_monthly_total, family.currency)+ end++ def median_monthly_total_money+ Money.new(median_monthly_total, family.currency)+ end++ def month_total_money(date: Date.current)+ Money.new(month_total(date: date), family.currency)+ end+privatedef category_level_limitif subcategory? && parent.subcategory?diff --git a/app/views/budget_categories/_budget_category.html.erb b/app/views/budget_categories/_budget_category.html.erbindex e6c0e4cb..27dc80d1 100644--- a/app/views/budget_categories/_budget_category.html.erb+++ b/app/views/budget_categories/_budget_category.html.erb@@ -32,7 +32,7 @@<% end %><% else %><p class="text-sm text-gray-500 font-medium">- <%= format_money(budget_category.category.avg_monthly_total) %> avg+ <%= format_money(budget_category.category.avg_monthly_total_money, precision: 0) %> avg</p><% end %></div>diff --git a/app/views/budget_categories/_budget_category_form.html.erb b/app/views/budget_categories/_budget_category_form.html.erbindex efd98dc9..83e85f8d 100644--- a/app/views/budget_categories/_budget_category_form.html.erb+++ b/app/views/budget_categories/_budget_category_form.html.erb@@ -8,7 +8,7 @@<div class="text-sm mr-3"><p class="text-gray-900 font-medium mb-0.5"><%= budget_category.category.name %></p>- <p class="text-gray-500"><%= format_money(Money.new(budget_category.category.avg_monthly_total, budget_category.currency), precision: 0) %>/m average</p>+ <p class="text-gray-500"><%= format_money(budget_category.category.avg_monthly_total_money, precision: 0) %>/m average</p></div><div class="ml-auto">diff --git a/app/views/budget_categories/show.html.erb b/app/views/budget_categories/show.html.erbindex e9d4b759..57e6df5e 100644--- a/app/views/budget_categories/show.html.erb+++ b/app/views/budget_categories/show.html.erb@@ -10,10 +10,10 @@<% if @budget_category.budget.initialized? %><p class="text-sm text-gray-500"><span class="text-gray-900">- <%= format_money(@budget_category.actual_spending) %>+ <%= format_money(@budget_category.actual_spending_money) %></span><span>/</span>- <span><%= format_money(@budget_category.budgeted_spending) %></span>+ <span><%= format_money(@budget_category.budgeted_spending_money) %></span></p><% end %></div>@@ -72,7 +72,7 @@<div class="flex items-center justify-between text-sm"><dt class="text-gray-500">Budgeted</dt><dd class="text-gray-900 font-medium">- <%= format_money @budget_category.budgeted_spending %>+ <%= format_money @budget_category.budgeted_spending_money %></dd></div><% end %>@@ -80,14 +80,14 @@<div class="flex items-center justify-between text-sm"><dt class="text-gray-500">Monthly average spending</dt><dd class="text-gray-900 font-medium">- <%= format_money @budget_category.category.avg_monthly_total %>+ <%= format_money @budget_category.category.avg_monthly_total_money, precision: 0 %></dd></div><div class="flex items-center justify-between text-sm"><dt class="text-gray-500">Monthly median spending</dt><dd class="text-gray-900 font-medium">- <%= format_money @budget_category.category.median_monthly_total %>+ <%= format_money @budget_category.category.median_monthly_total_money, precision: 0 %></dd></div></dl>