add_historical_annotations()
This commit is contained in:
3
main.py
3
main.py
@@ -1,6 +1,6 @@
|
|||||||
# main.py
|
# main.py
|
||||||
from flask import Flask, render_template, request, redirect, url_for, Response, jsonify
|
from flask import Flask, render_template, request, redirect, url_for, Response, jsonify
|
||||||
from calc import calculate_savings_depletion, calc_key_dates
|
from calc import calculate_savings_depletion, calc_key_dates, add_historical_annotations
|
||||||
from db import init_db, get_historical_data, get_finance_data, update_finance, get_budget_data
|
from db import init_db, get_historical_data, get_finance_data, update_finance, get_budget_data
|
||||||
from db import insert_cset, get_comp_set_data, get_comp_set_options, delete_cset
|
from db import insert_cset, get_comp_set_data, get_comp_set_options, delete_cset
|
||||||
from db import get_bill_freqs, get_bill_growth_types
|
from db import get_bill_freqs, get_bill_growth_types
|
||||||
@@ -32,6 +32,7 @@ def index():
|
|||||||
bill_data = get_bill_data("order_by_date_only")
|
bill_data = get_bill_data("order_by_date_only")
|
||||||
bill_types = get_bill_types()
|
bill_types = get_bill_types()
|
||||||
depletion_date, savings_per_fortnight, final_savings = calculate_savings_depletion(finance_data, bill_data, bill_types)
|
depletion_date, savings_per_fortnight, final_savings = calculate_savings_depletion(finance_data, bill_data, bill_types)
|
||||||
|
add_historical_annotations( finance_data )
|
||||||
BUDGET=get_budget_data(finance_data)
|
BUDGET=get_budget_data(finance_data)
|
||||||
|
|
||||||
if depletion_date:
|
if depletion_date:
|
||||||
|
|||||||
Reference in New Issue
Block a user