diff --git a/TODO b/TODO
index e4ef2af..125838d 100644
--- a/TODO
+++ b/TODO
@@ -1,14 +1,12 @@
UI:
- * rename Save to Create Comparison? (or similar)
- * create a tabbed lower interface, to give more room to graphs
- * add a graph of no comparison and a potential 3rd with comparion (if chosen on first tab of data/numbers)
+ * do I want to save the front tab?
* have a comparison management capability - somehow, at least be able to delete csets (can I put an x inside the menu? OR, have a manage button and pop-up?)
* maybe a help/note/set of links somehow, to common things: e.g. macquarie int rate page, inflation source, etc.
- - also then could effectively take those "notes" out of db.py and incorporate, so that when I update stuff it gets done right
- - in fact, I *COULD* have a basic date check/workflow, e.g. its been more than X days since Y was updated, click here ... and it walks me through the manual update steps
- and when I finish, its datestamped until next time
+ - also then could effectively take those "notes" out of db.py and incorporate, so that when I update stuff it gets done right
+ - in fact, I *COULD* have a basic date check/workflow, e.g. its been more than X days since Y was updated, click here
+ and it walks me through the manual update steps and when I finish its datestamped until next time
For bills:
* might need to be able to mark a specific bill as an outlier:
diff --git a/templates/index.html b/templates/index.html
index 8fa060c..88828f7 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -78,100 +78,121 @@
{% endfor %}
-
Fortnighthly Savings data:
- {% if COMP %}
- {# 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 ) %}
- {% else %}
- {# we dont need to do a comparison, so consider it done before we begin #}
- {% set comp_done=namespace( val=1 ) %}
- {% endif %}
-
-
-
-
2025
-
- {# inside started if below, we add blank lines to the start of the year so the dates line up #}
- {% for _ in range( 0, padding ) %}
-
- {% endfor %}
-
- {% set car_done=namespace( val=0 ) %}
-
- {% for date, dollars in savings %}
- {% set yr=date[:4] %}
- {% set mon=date[5:7] %}
- {% set day=date[8:10 ] %}
-
- {% set car_yr=key_dates['D_hyundai_owned'][:4] %}
- {% set car_mon=key_dates['D_hyundai_owned'][5:7] %}
- {% set car_day=key_dates['D_hyundai_owned'][8:10 ] %}
-
- {% if yr|int > first_yr|int and mon == '01' and day|int <= 14 %}
-
-
{{yr}}
- {% endif %}
-
-
- {% if date == key_dates['D_quit_date'] %}
-
-
-
-
-
SUMMARY/BUDGET
- {% for label, value in BUDGET %}
-
- {{label}} {{value}}
-
+
+
+
+
+
Fortnighthly Savings data:
+ {% if COMP %}
+ {# 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 ) %}
+ {% else %}
+ {# we dont need to do a comparison, so consider it done before we begin #}
+ {% set comp_done=namespace( val=1 ) %}
+ {% endif %}
+
+
+
+
2025
+
+ {# inside started if below, we add blank lines to the start of the year so the dates line up #}
+ {% for _ in range( 0, padding ) %}
+
{% endfor %}
-
-
-
-
-
-
-
- {% if COMP %}
-
Note: {{ '$%0.2f' % COMP['amount']|float }} is the final value of the compared to data (with a buffer of: {{ '$%0.2f' % COMP['buffer']|float }}). Hover over blue labels above to see what compared to values differed
+
+ {% set car_done=namespace( val=0 ) %}
+
+ {% for date, dollars in savings %}
+ {% set yr=date[:4] %}
+ {% set mon=date[5:7] %}
+ {% set day=date[8:10 ] %}
+
+ {% set car_yr=key_dates['D_hyundai_owned'][:4] %}
+ {% set car_mon=key_dates['D_hyundai_owned'][5:7] %}
+ {% set car_day=key_dates['D_hyundai_owned'][8:10 ] %}
+
+ {% if yr|int > first_yr|int and mon == '01' and day|int <= 14 %}
+
+
{{yr}}
+ {% endif %}
+
+
+ {% if date == key_dates['D_quit_date'] %}
+
+
-
+
+
+
+
SUMMARY/BUDGET
+ {% for label, value in BUDGET %}
+
+ {{label}} {{value}}
+
+ {% endfor %}
+
+
+
+
+
+
+
+ {% if COMP %}
+
Note: {{ '$%0.2f' % COMP['amount']|float }} is the final value of the compared to data (with a buffer of: {{ '$%0.2f' % COMP['buffer']|float }}). Hover over blue labels above to see what compared to values differed