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

first hard-coded version of a compare capability

Browse Source
This commit is contained in:
Damien De Paoli
2025-02-06 10:11:45 +11:00
parent b4ba66eb4d
commit b7768d767c
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
main.py
View File

@@ -20,7 +20,12 @@ def index():
if depletion_date:
depletion_date=depletion_date.date(); # just show date
return render_template('index.html', finance=finance_data, depletion_date=depletion_date, savings=savings_per_fortnight, TLS=TLS, CBA=CBA, BUDGET=BUDGET)
# work out comparison func, but hardcode for now:
COMP={}
COMP['date']='2025-02-05'
COMP['amount']=414887
return render_template('index.html', finance=finance_data, depletion_date=depletion_date, savings=savings_per_fortnight, TLS=TLS, CBA=CBA, BUDGET=BUDGET, COMP=COMP)
@app.route('/update', methods=['POST'])
def update():

25
templates/index.html
View File

@@ -206,18 +206,39 @@ window.onload = function() {
<h3 class="mt-3" ><font color="green">We DONT run out of money before super kicks in!!! -- Details:</font></h3>
{% endif %}
{% if COMP %}
<h5><font color="blue">Note: value in blue below is value we should have been at when comparing to saved values</font></h5>
{% endif %}
<table>
<tr><td valign="top">
{# get comparison date so we can use it below in loop to know when to print it out #}
{% set comp_yr=COMP['date'][:4] %}
{% set comp_mon=COMP['date'][5:7] %}
{% set comp_day=COMP['date'][8:10 ] %}
{% set comp_done=namespace( val=0 ) %}
{% set first_yr=2025 %}
{% for date, dollars in savings %}
{% set yr=date[:4] %}
{% set mon=date[5:7] %}
{% set day=date[8:10 ] %}
{% if yr|int > first_yr|int and mon == '01' and day|int <= 14 %}
</td><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td><td valign="top">
{% if comp_done.val == 0 and yr == comp_yr and mon == comp_mon and day|int >= comp_day|int %}
<font color="blue">
{{ COMP['date'] }}:&nbsp;
{{ '$%0.2f' % COMP['amount']|float }}<br>
</font>
{% set comp_done.val=1 %}
{% endif %}
{% if yr|int > first_yr|int and mon == '01' and day|int <= 14 %}
</td><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td><td valign="top">
{% endif %}
<font color="black">
{{ date }}:&nbsp;
{{ '$%0.2f' % dollars|float }}<br>
</font>
{% endfor %}
</td><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td><td valign="top"><b>SUMMARY/BUDGET</b><br>
{% for label, value in BUDGET %}