From 24c581a35a30794e21da8edc8ce7a4aa89cb6f29 Mon Sep 17 00:00:00 2001
From: Damien De Paoli <ddp@depaoli.id.au>
Date: Sat, 30 Aug 2025 14:29:31 +1000
Subject: [PATCH] use totals to calc bill totals - should be less work, also
 improved cosmetics of totals display

---
 templates/bills.html | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/templates/bills.html b/templates/bills.html
index 37a6ff7..2961500 100644
--- a/templates/bills.html
+++ b/templates/bills.html
@@ -88,19 +88,24 @@
                 <button id="bill-type-canc-{{bt.id}}" class="px-0 col-1 btn btn-danger bg-danger-subtle text-danger d-none" onClick="CancelUpdateBillType({{bt.id}}, '{{bt.name}}')"><span class="bi bi-x"> Cancel</button>
             </div>
         {% endfor %}
+        {{ total[2][2025] }}
         {% for yr in range( this_year, END_YEAR) %}
-            {% set total=namespace( sum=0 ) %}
-            {% for bd in bill_data %}
-                {% if yr|string in bd['bill_date'] %}
-                    {% set total.sum = total.sum + bd['amount'] %}
+            {% set tot=namespace( sum=0 ) %}
+            {% for bt in bill_types %}
+                {% if bt.id in total %}
+                    {% set tot.sum = tot.sum + total[bt.id][yr] %}
                 {% endif %}
             {% endfor %}
+            {% set markup="h5" %}
+            {% if yr == this_year %}
+                {% set markup="h4 pt-4" %}
+            {% endif %}
             <div class="row">
-                <div class="pt-4 offset-4 col text-end h4">
+                <div class="offset-4 col text-end {{markup}}">
                     Total bills in {{yr}}
                 </div>
-                <div class="pt-4 col h4 text-primary">
-                    ${{'%.2f'|format(total.sum)}}
+                <div class="col {{markup}} text-primary">
+                    ${{'%.2f'|format(tot.sum)}}
                 </div>
             </div>
         {% endfor %}