diff --git a/app/models/category.rb b/app/models/category.rb index 90d2ce92..ebeadbf9 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -107,6 +107,18 @@ class Category < ApplicationRecord family.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 + private def category_level_limit if subcategory? && parent.subcategory? diff --git a/app/views/budget_categories/_budget_category.html.erb b/app/views/budget_categories/_budget_category.html.erb index 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 %>

- <%= format_money(budget_category.category.avg_monthly_total) %> avg + <%= format_money(budget_category.category.avg_monthly_total_money, precision: 0) %> avg

<% end %> diff --git a/app/views/budget_categories/_budget_category_form.html.erb b/app/views/budget_categories/_budget_category_form.html.erb index 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 @@

<%= budget_category.category.name %>

-

<%= format_money(Money.new(budget_category.category.avg_monthly_total, budget_category.currency), precision: 0) %>/m average

+

<%= format_money(budget_category.category.avg_monthly_total_money, precision: 0) %>/m average

diff --git a/app/views/budget_categories/show.html.erb b/app/views/budget_categories/show.html.erb index 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? %>

- <%= format_money(@budget_category.actual_spending) %> + <%= format_money(@budget_category.actual_spending_money) %> / - <%= format_money(@budget_category.budgeted_spending) %> + <%= format_money(@budget_category.budgeted_spending_money) %>

<% end %>
@@ -72,7 +72,7 @@
Budgeted
- <%= format_money @budget_category.budgeted_spending %> + <%= format_money @budget_category.budgeted_spending_money %>
<% end %> @@ -80,14 +80,14 @@
Monthly average spending
- <%= format_money @budget_category.category.avg_monthly_total %> + <%= format_money @budget_category.category.avg_monthly_total_money, precision: 0 %>
Monthly median spending
- <%= format_money @budget_category.category.median_monthly_total %> + <%= format_money @budget_category.category.median_monthly_total_money, precision: 0 %>