diff --git a/main.py b/main.py index 57b0a40..917dcc7 100644 --- a/main.py +++ b/main.py @@ -4,7 +4,7 @@ from calc import calculate_savings_depletion from db import init_db, get_finance_data, update_finance, get_budget_data, insert_cset, get_comp_set_data, get_comp_set_options, get_bill_freqs from db import get_bill_data, new_bill, update_bill_data, delete_bill from db import get_bill_types, insert_bill_type, update_bill_type, delete_bill_type -from bills import derive_bill_data +from bills import process_bill_data from collections import defaultdict, Counter from datetime import datetime import csv @@ -144,9 +144,8 @@ def DisplayBillData(): bill_data = get_bill_data() bill_types = get_bill_types() bill_freqs = get_bill_freqs() - now=datetime.today().strftime('%Y-%m-%d') - derive_bill_data() - return render_template('bills.html', now=now, bill_data=bill_data, bill_types=bill_types, bill_freqs=bill_freqs ) + process_bill_data(bill_data, bill_types, bill_freqs) + return render_template('bills.html', bill_data=bill_data, bill_types=bill_types, bill_freqs=bill_freqs ) @app.route('/newbilltype', methods=['POST']) def InsertBillType():