71606035fd
fix bug where growth is not calculated properly for future bills / hangover from when I assumed only simple growth as that was all we had before I added new growth menu options
master
Damien De Paoli2026-02-11 19:29:07 +11:00
b8c1edc084
fixed bug where insert cset did not show it in menu until a full reload
Damien De Paoli2026-02-11 12:02:09 +11:00
20239d72c8
put improved foreign key constraints on DB to fix bug where when I delete a cset, that was being used to compare_to, it breaks
Damien De Paoli2026-02-10 21:35:41 +11:00
e3d2d8ea08
remove jquery filter for nav-tabs now we are using nav-pills in vertical mode, it was unnecessary anyway, only one div had navlinks, so just using the rest of the filter, and this fixes the BUG too
Damien De Paoli2026-02-10 19:14:43 +11:00
e7a3cb3d7d
change formatting of fields so that we cater for scroll-bar or no scroll-bar when we show graph or not in lower part of UI, this stops the fields wrapping onto the next line when the scroll bar appears
Damien De Paoli2026-02-06 12:12:58 +11:00
2ba2ece1d0
tried to be smarter with tax, decided in the end to use non-code to come up with a figure and hard-code, hopefully not an issue soon anyway :)
Damien De Paoli2026-02-06 12:12:06 +11:00
1cf835b7e7
refined label positions, and tweaked current ME balance
Damien De Paoli2026-02-06 12:09:02 +11:00
e104dd8270
Applying several hacks to draw labels better -- still not close to great, but bearable now. First we consider 0 amts as non-negative for annotations so they go up not down on the graph :) Second, I am applying a rough approach of knowing where the last label was drawn and draw below that, only do this for negative amts, and even then the difference between y-coords in the y-axis scale and pixels for offsets of labels, just are too annoying
Damien De Paoli2026-01-18 22:23:04 +11:00
a46b8f895a
sort annotations so the historical annotations are drawn first, so up/down labels are mostly working properly
Damien De Paoli2026-01-18 22:21:14 +11:00
e05b2c7b5b
Major change: I have added finance_history * pulled old values of data via restic backups * inserted them into a new finance_history table * added a finplan user, use of sudo & better ENV (container/production) & wrapper.sh into Dockerfile (like I do for other projects) * recalculate the bills / Living Expenses now we have real bills for a year * remove tax back for now (need to handle quit date vs. end of financial year better) * hard-coded / hacked in 2026 for pay cycle dates / should be dynamic, but not sure I'll work in 2027+ * refactor front-end to handle 2026 as the current year / its more or less dynamic (via hard-coded FIRST_YEAR) variable - could not use datetime, as it was in late Dec. when I noticed the issue ('next pay' was in 2026, current year was 2025) * also added history to graphs, changed formatting to make the history / * savings projections to be orannge with circles, but historical is a solid line, future is a dash, also made all lines have lineWidth: 1 for aesthetics
Damien De Paoli2026-01-17 19:28:24 +11:00
3b33390c3e
updated ME bank amount in help, but mainly fixed year start being hard-coded to 2025, now works for any year
Damien De Paoli2025-12-26 11:09:01 +11:00
f309dfa947
redid bills UI, you can now choose CPI or FLAT X% as well, via a drop-down not a set of buttons. The changing of inflation also tweaks any bills using CPI, all works
Damien De Paoli2025-12-23 18:35:52 +11:00
ce20c57d11
added health check, forgot to add template/cset <- allows deletion of comparison sets in earlier commit, and added a new TODO
Damien De Paoli2025-11-05 01:13:22 +11:00
0a9a50f9a1
added ability to delete comparison sets, also made future bills recalc for Hydunday/D_quit dependent future bills, this is not effectively functional -v1.0 :)
Damien De Paoli2025-11-04 11:36:36 +11:00
9cc907fb62
added a basic comparison set page, with a table of the data that changes only (just to fit it in) and allowing them to be deleted
Damien De Paoli2025-11-01 22:48:21 +11:00
b6b396342f
fix up annotation bug where we put daily amt, not bill amt in annot
Damien De Paoli2025-10-05 12:09:21 +11:00
fb2fffea7b
noting need to tie bills/finance page items to recalc (change date of quit, need to redo bills future)
Damien De Paoli2025-10-05 12:08:33 +11:00
252dc23364
make payment annotations show as negatives, use this to make annotations of adding go above graph, and generally payment annotaions below the line. Then switch to have the last few annoations above the graph regardless as we run out of room at that end of the graph
Damien De Paoli2025-09-16 23:24:19 +10:00
a75db565ee
Created tabbed interface for the front page, update the TODO to match
Damien De Paoli2025-09-16 22:51:23 +10:00
b1614760a6
more thoughts/how to make this more usable longer-term
Damien De Paoli2025-09-16 12:57:11 +10:00
670a63cfd7
updated TODO, removed old ones, added new around UI changes to have tabbed lower data/graphs
Damien De Paoli2025-09-16 12:54:16 +10:00
1c112e6f6b
move future bills into bills.py, away from calc.py for file content consistency
Damien De Paoli2025-09-15 22:17:17 +10:00
8274da0ce0
fix up containerfluid to container-fluid, and add some margin for left/right on bills
Damien De Paoli2025-09-15 22:16:40 +10:00
5ca99ca1f4
update to note fortnightly pay dates are wrong on year rollover and so I am paying myself a week early at those times
Damien De Paoli2025-09-11 17:53:56 +10:00
4389045ed5
moved some hard-coded dates to top of calc.py for ease of use in multiple functions, but also just for code readability, they are more like constants than variables. Code now works out key_dates for use in dealing with future bills / next steps
Damien De Paoli2025-09-11 17:52:28 +10:00
b69ec82510
just made graph taller for now, might one day make it smaller or larger depending on whether we are comparing or not?
Damien De Paoli2025-09-11 17:50:54 +10:00
2bd39ab24c
updated TODO with progress and clarifying next steps
Damien De Paoli2025-09-11 17:50:19 +10:00
c49520af7a
handle simple future bills and their growth all now done
Damien De Paoli2025-09-05 16:32:16 +10:00
6ae1023f6e
removed debugs, add automatic annotations if bill amount is > $1000, factor in growth for ioniq6*, added debug too
Damien De Paoli2025-09-05 16:19:53 +10:00
fc1746d749
also update to reflect bill_type_id change to bill_type
Damien De Paoli2025-09-05 16:19:01 +10:00
c5cfc00793
put back ioniq 6 future bills, but use bill data to set values - assumption at present is they are yearly bills, could do better, but good enough for now. This commit also changes selects to return bill_type not bill_type_id and removed some debugs for bill amt in calc loop
Damien De Paoli2025-09-05 12:20:08 +10:00
ebac4aaf66
incorporate bills for dates/amounts into calculations, still need to do future bills on triggers
Damien De Paoli2025-09-03 22:35:24 +10:00
4b63b8bd44
complete the future bill handling, added new UI to match a need for it, also tighten up other TODO items
Damien De Paoli2025-09-02 23:03:48 +10:00
a0d9ac45cd
remove debug, and handle (by skipping) future dated bills
Damien De Paoli2025-09-02 23:03:03 +10:00
d80cffa0dd
fix up mistaken col-4 for wrong Date header, move from name to bill_type for new/update bill and support future dates by showing future in the text, rather than show an actual input type=date
Damien De Paoli2025-09-02 23:01:00 +10:00
2459dc6ea1
allow handling creating future bills - for when I quit, and will help with when switch to owning Ioniq 6
Damien De Paoli2025-09-02 22:59:45 +10:00
95d792e72f
added a set of titles when adding new bill / new bill types, allows to toggle date to be when quit or normal date, with normal date we use data, with when quit, we have growth we will use for simple growth and then date(s) can be factored in based on when I quit which is changable in the main financial data
Damien De Paoli2025-09-02 22:05:16 +10:00
c21bda8da0
the 5 is unnecessary, as the width of 6ch does the sizing anyway
Damien De Paoli2025-08-31 16:48:40 +10:00
f4490e937a
with dark mode, using info instead of primary feels easier on the eye and allows for consistency with graph colours
Damien De Paoli2025-08-31 16:41:40 +10:00
e373dd0009
Change approach with Qtr bills, all are simple based on last qtr - when we have normal Qtr bills (freq 'Quarterly') we just use last qtrs data for growth much easier. For GAS, we have the 'Quaterly (forced)' freq. which uses the forced/calc. amount per qtr for growth, its good enough for Gas bills - which dont always have 4 bills a year
Damien De Paoli2025-08-31 16:32:18 +10:00
3a5b77f12d
Change approach with Qtr bills, all are simple based on last qtr - when we have normal Qtr bills (freq 'Quarterly') we just use last qtrs data for growth much easier. For GAS, we have the 'Quaterly (forced)' freq. which uses the forced/calc. amount per qtr for growth, its good enough for Gas bills - which dont always have 4 bills a year
Damien De Paoli2025-08-31 16:32:00 +10:00
c74383f89e
added a commented out simple debug of totals to help understand bills for now - prob will make this into real table somehow in future
Damien De Paoli2025-08-31 16:29:29 +10:00
07f2a321ec
added support for Quarterly (seasonal) and Quarterly (fixed), also updated live DB to match
Damien De Paoli2025-08-31 11:07:08 +10:00
f67ca61cc7
working through future bills, we need to do quarterly future estimates differently for seasonal/fixed bills
Damien De Paoli2025-08-31 11:06:29 +10:00
9ad5089ac5
updated README, todo & bugs are now in own files
Damien De Paoli2025-08-31 11:05:57 +10:00
17f2534056
bug fixed where we had a bill deleted it then growth was still trying to be calc when it no longer could
Damien De Paoli2025-08-31 10:39:58 +10:00
2937866617
improve how we find monthly bill in a month, dont use exact date just use yy-mm, also fix BUG where kayo used estimate in jan to project for the next 5years, rather than real bill in feb (all in the future) to estimate
Damien De Paoli2025-08-31 10:24:46 +10:00
4c96a9b576
with monthly bills and < 12 in first year, wont have full yr total so cant do simple growth - fix for this
Damien De Paoli2025-08-31 10:08:14 +10:00
c41048ab82
made lhs wider, shrank rhs, put this_year total per bill type in lhs, altered totals formatting at bottom
Damien De Paoli2025-08-30 14:00:14 +10:00
7422321227
call calc_future_totals to pass data onto html so we can show per bill type annual amount in this year
Damien De Paoli2025-08-30 13:59:29 +10:00
338b63aa06
now the UI shows annual costs, updated the comments and bills figure again to be more accurate
Damien De Paoli2025-08-30 13:58:56 +10:00
de32bdc7ff
now have a calc_future_totals func that is used to allow html to show the bills as a simple annualised cost per year
Damien De Paoli2025-08-30 13:58:29 +10:00
4a2dd4d2da
want to tweak formating and have current year totals included
Damien De Paoli2025-08-30 13:14:03 +10:00
e84faffd79
when choosing a Tab, make the new bill drop-down be of that type. When we save a new bill, change the last-tab to be the type of bill we just added
Damien De Paoli2025-08-28 20:47:12 +10:00
2bdd1348b8
fixed a few bugs, annual growth was just broken, dont add another estimate bill when we have one for that year or in that quarter, removed lots of debugs, fixed a few bugs where the first data point in a new year/qtr would not have arrays initialised properly first, apportion quarterly data in future real bills - it happens with Rates
Damien De Paoli2025-08-28 19:49:41 +10:00
91ebc227b6
add support for simple growth, also remove all estimated bills when we add a new real bill
Damien De Paoli2025-08-28 19:46:51 +10:00
89fe874c5c
added simple growth, changed column widths and header formats to work better. Added a quick and dirty Total bills in 2025 section
Damien De Paoli2025-08-28 19:46:23 +10:00
dda3a3e3fe
now we have dark mode, use different colors for lines on graphs
Damien De Paoli2025-08-28 19:45:21 +10:00
706aee6947
add a quick TODO to make UI slicker when adding bills
Damien De Paoli2025-08-28 19:45:02 +10:00
742911ec1b
still this bug - adding a qtrly bill years before the rest
Damien De Paoli2025-08-28 19:44:40 +10:00
89d58e4cd3
fixed a few logic bugs with quarterly data, now accurately puts bill proportions into relevant quarters and estimates future bills based on quarterly data - all works so far
Damien De Paoli2025-08-25 18:46:24 +10:00
f3b828b051
well, calculated proportioned per quarter values - not making much difference on growth numbers, BUT, will now be able to project future estimates based on full quarter cost, not just a bill in that quarter that may only cover 2 months
Damien De Paoli2025-08-24 16:09:51 +10:00
4b5b713c20
hack to handle gass bills (for now), seems we have more than 4 for a quarterly cycle, and they are all over the shop/inconsistent. Added thoughts on how to tackle in TODO
Damien De Paoli2025-08-23 10:48:29 +10:00
Damien De Paoli