ddp/finplan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

incorporate bills for dates/amounts into calculations, still need to do future bills on triggers

Browse Source
This commit is contained in:
Damien De Paoli
2025-09-03 22:35:24 +10:00
parent 4b63b8bd44
commit ebac4aaf66
4 changed files with 63 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
main.py
View File

@@ -25,7 +25,8 @@ init_db()
def index():
finance_data = get_finance_data()
get_comp_set_options(finance_data)
depletion_date, savings_per_fortnight, final_savings = calculate_savings_depletion(finance_data)
bill_data = get_bill_data("order_by_date_only")
depletion_date, savings_per_fortnight, final_savings = calculate_savings_depletion(finance_data, bill_data)
BUDGET=get_budget_data(finance_data)
if depletion_date:
@@ -143,13 +144,13 @@ def update():
@app.route('/bills')
def DisplayBillData():
bill_data = get_bill_data()
bill_data = get_bill_data("order_by_bill_type_then_date")
bill_types = get_bill_types()
bill_freqs = get_bill_freqs()
bill_ui = get_bill_ui()
bill_info=process_bill_data(bill_data, bill_types, bill_freqs)
total=calc_future_totals(bill_info, bill_types)
bill_data = get_bill_data()
bill_data = get_bill_data("order_by_bill_type_then_date")
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'])