hacky better formatting of Totals

bills.py

@@ -329,6 +329,7 @@ def process_bill_data(bd, bt, bf):
                 continue
             add_missing_bills_for_yr( bill_type, bill_info, yr )
         derive_ann_growth( bill_type, bill_info )
+    return bill_info
 
 ################################################################################
 # add_missing_bills_for_yr -- wrapper to call right func based on bill freq
@@ -444,3 +445,19 @@ def derive_ann_growth( bill_type, bill_info ):
         else:
             # failsafe (just in case fill bills failed to add enough bills to average out)
             print( f"{bill_type}: Unable to calculate growth!" )
+
+################################################################################
+# just go through this year to END_YEAR, total any bills for each year up
+# so we can display the annual estimated bills onwards...
+################################################################################
+def calc_future_totals(bill_info, bill_types):
+    total={}
+    now_yr = datetime.date.today().year
+    for bt in bill_types:
+        total[bt['id']]={}
+        for yr in range( now_yr, END_YEAR+1):
+            total[bt['id']][yr]=0
+            if bt['id'] in bill_info and yr in bill_info[bt['id']]['year']:
+                for b in bill_info[bt['id']]['year'][yr]:
+                    total[bt['id']][yr] += b['amount']
+    return total

db.py

@@ -149,8 +149,9 @@ def get_finance_data():
     return dict(finance)
 
 def get_budget_data(finance_data):
-    # annual bills - health ins (5k), rates (2.4), electricity (1.5), gas (2), internet (1.6), car insurance (.7), rego (.8), house insurance (2.4), GFC (2.2), water (1.2), eweka (.e (.7)), phones (.5), melb. pollen (.03), nabu casa (.1), eweka (.1)  --- noting phone is elevated presuming I also go onto Aldi plan, but that there is no family discount
-    bills = 21330
+    # annual bills - health ins (5k), rates (2.6), electricity (1.2), gas (2.1) - but 1.4 in 2025 due to EU trip, internet (1.6), car insurance (.7), rego (.8), house insurance (2.4), GFC (2.6), water (1.1), eweka (.1), phones (.5), melb. pollen (.03), nabu casa (.1)   --- noting phone is elevated presuming I also go onto Aldi plan, but that there is no family discount, and health will be extra after stop working
+    # fudging below - its more like 15.2 + health, and really gas will be more than 2.1 than 1.4, so about 16+5
+    bills = 21000
     BUDGET=[]
     BUDGET.append( ('Bills', f"${bills:,.2f}") )
     BUDGET.append( ('Buffer', f"${finance_data['CBA']*finance_data['CBA_price']+finance_data['TLS']*finance_data['TLS_price']:,.2f}") )

main.py

@@ -5,7 +5,7 @@ from db import init_db, get_finance_data, update_finance, get_budget_data, inser
 from db import get_bill_data, new_bill, update_bill_data, delete_bill
 from db import get_bill_ui, save_ui
 from db import get_bill_types, insert_bill_type, update_bill_type, delete_bill_type, use_growth
-from bills import process_bill_data
+from bills import process_bill_data, calc_future_totals
 from defines import END_YEAR
 from collections import defaultdict, Counter
 from datetime import datetime, date
@@ -147,9 +147,10 @@ def DisplayBillData():
     bill_types = get_bill_types()
     bill_freqs = get_bill_freqs()
     bill_ui = get_bill_ui()
-    process_bill_data(bill_data, bill_types, bill_freqs)
+    bill_info=process_bill_data(bill_data, bill_types, bill_freqs)
+    total=calc_future_totals(bill_info, bill_types)
     bill_data = get_bill_data()
-    return render_template('bills.html', bill_data=bill_data, bill_types=bill_types, bill_freqs=bill_freqs, bill_ui=bill_ui, this_year=datetime.today().year, END_YEAR=END_YEAR )
+    return render_template('bills.html', bill_data=bill_data, bill_types=bill_types, bill_freqs=bill_freqs, bill_ui=bill_ui, this_year=datetime.today().year, END_YEAR=END_YEAR, total=total )
 
 @app.route('/newbilltype', methods=['POST'])
 def InsertBillType():

templates/bills.html

@@ -21,7 +21,7 @@
     <div class="pt-2 containerfluid row">
     <h3 align="center">Bill Details (go to <a href="/">Finance Tracker</a>)</h3>
 
-    <div class="mt-4 col-6">
+    <div class="mt-4 col-7">
         <div class="row align-items-center">
             <button id="new-bill-type-button" class="mb-3 px-0 offset-4 col-2 btn btn-success bg-success-subtle text-success" onCLick="StartNewBillType()"><span class="bi bi-plus-lg"> New Bill Type</span></button>
             <div class="new-bill-type-class px-0 col-2 d-none"> <input type="text" class="form-control text-end float-end border border-primary" id="new-bill-type-name"></div>
@@ -38,6 +38,7 @@
             <div class="px-0 col-2"><label class="form-control text-center border-0 fw-bold bg-body-tertiary rounded-0">Name</ ></div>
             <div class="px-0 col-2"><label class="form-control text-center border-0 fw-bold bg-body-tertiary rounded-0">Frequency</ ></div>
             <div class="px-0 col-4"><label class="form-control text-center border-0 fw-bold bg-body-tertiary rounded-0">Annual Growth Est (min/avg/max/simple)</ ></div>
+            <div class="px-0 col-1"><label class="form-control text-center border-0 fw-bold bg-body-tertiary rounded-0">{{this_year}} Total</ ></div>
             <div class="px-0 col-2"><label class="form-control text-center border-0 fw-bold bg-body-tertiary rounded-0">Actions</ ></div>
         </div>
         {% for bt in bill_types %}
@@ -80,6 +81,7 @@
                         </label>
                     </div>
                 </div>
+                <div class="px-0 col-1"><input type="text" class="bill-type-total-{{bt.id}} form-control text-center" id="bill-type-total-{{bt.id}}" value="${{total[bt.id][this_year]}}" disabled> </div>
                 <button id="bill-type-chg-{{bt.id}}" class="px-0 col-1 btn btn-success bg-success-subtle text-success" onClick="StartUpdateBillType( {{bt.id}} )"><span class="bi bi-pencil-square"> Change</button>
                 <button id="bill-type-del-{{bt.id}}" class="px-0 col-1 btn btn-danger bg-danger-subtle text-danger" onClick="DelBillType({{bt.id}})"><span class="bi bi-trash3"> Delete</button>
                 <button id="bill-type-save-{{bt.id}}" class="px-0 col-1 btn btn-success bg-success-subtle text-success d-none" onClick="UpdateBillType( {{bt.id}} )"><spam class="bi bi-floppy"> Save</button>
@@ -94,10 +96,10 @@
                 {% endif %}
             {% endfor %}
             <div class="row">
-                <div class="pt-4 col text-end display-6">
+                <div class="pt-4 offset-4 col text-end h4">
                     Total bills in {{yr}}
                 </div>
-                <div class="pt-4 col display-6 text-primary">
+                <div class="pt-4 col h4 text-primary">
                     ${{'%.2f'|format(total.sum)}}
                 </div>
             </div>
@@ -106,7 +108,7 @@
 
     <!-- right-hand-side, bill types (e.g. gas, phone, etc.) -->
 
-    <div class="pt-4 col-6">
+    <div class="pt-4 col-5">
         <div class="row align-items-center">
             <button id="new-bill-data-button" class="mb-3 px-0 offset-6 col-2 btn btn-success bg-success-subtle text-success" onCLick="StartNewBillData()"><span class="bi bi-plus-lg"> New Bill</span></button>
             <div class="new-bill-data-class px-0 col-2 d-none"> <select id="new-bill-data-type" class="form-select text-end float-end border border-primary">
@@ -146,7 +148,7 @@
                     <div class="p-0 col-2"> <label class="form-control text-center border-0 fw-bold bg-body-tertiary rounded-0">Name</ > </div>
                     <div class="p-0 col-2"> <label class="form-control text-center border-0 fw-bold bg-body-tertiary rounded-0">Date</ > </div>
                     <div class="p-0 col-2"> <label class="form-control text-center border-0 fw-bold bg-body-tertiary rounded-0">Amount</ > </div>
-                    <div class="px-0 col-2"><label class="form-control text-center border-0 fw-bold bg-body-tertiary rounded-0">Actions</ ></div>
+                    <div class="px-0 col-4"><label class="form-control text-center border-0 fw-bold bg-body-tertiary rounded-0">Actions</ ></div>
                 </div>
                 {% endif %}
                 {% if bd.bill_type_id == bt.id %}
@@ -161,10 +163,10 @@
                     <div class="px-0 col-2"> <input   type="date" class="{{classes}}" id="bill-data-date-{{bd.id}}" value="{{ bd.bill_date }}" disabled> </div>
                     <div class="px-0 col-2"> <input type="number" class="{{classes}}" id="bill-data-amount-{{bd.id}}" value="{{ bd.amount }}" disabled> </div>
                     {% if bd.estimated == 0 %}
-                    <button id="bill-data-chg-{{bd.id}}" class="px-0 col-1 btn btn-success bg-success-subtle text-success" onClick="StartUpdateBill( {{bd.id}} )"><span class="bi bi-pencil-square"> Change</button>
-                    <button id="bill-data-del-{{bd.id}}" class="px-0 col-1 btn btn-danger bg-danger-subtle text-danger" onClick="DeleteBill( {{bd.id }} )"><span class="bi bi-trash3"> Delete
-                    <button id="bill-data-save-{{bd.id}}" class="px-0 col-1 btn btn-success bg-success-subtle text-success d-none" onClick="UpdateBill( {{bd.id}} )"><span class="bi bi-floppy"> Save</button>
-                    <button id="bill-data-canc-{{bd.id}}" class="px-0 col-1 btn btn-danger bg-danger-subtle text-danger d-none" 
+                    <button id="bill-data-chg-{{bd.id}}" class="px-0 col-2 btn btn-success bg-success-subtle text-success" onClick="StartUpdateBill( {{bd.id}} )"><span class="bi bi-pencil-square"> Change</button>
+                    <button id="bill-data-del-{{bd.id}}" class="px-0 col-2 btn btn-danger bg-danger-subtle text-danger" onClick="DeleteBill( {{bd.id }} )"><span class="bi bi-trash3"> Delete
+                    <button id="bill-data-save-{{bd.id}}" class="px-0 col-2 btn btn-success bg-success-subtle text-success d-none" onClick="UpdateBill( {{bd.id}} )"><span class="bi bi-floppy"> Save</button>
+                    <button id="bill-data-canc-{{bd.id}}" class="px-0 col-2 btn btn-danger bg-danger-subtle text-danger d-none" 
                         onClick="CancelUpdateBill({{bd.id}}, '{{bd.name}}', '{{bd.bill_date}}', '{{bd.amount}}')"> <span class="bi bi-x"> Cancel</button>
                     </button>
                     {% endif %}