Show budget averages in family currency

Fixes #1689
maybe-finance · Jan 25, 2025 · e617d79 · e617d79
1 parent 7e0ec4b
commit e617d79
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/app/models/category.rb b/app/models/category.rb
@@ -107,6 +107,18 @@ def month_total(date: Date.current)
     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
@@ -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.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.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,22 +72,22 @@
             <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 %>
 
           <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>