Commit Graph

85 Commits

Author SHA1 Message Date
5556b0ef15 removed debugs, actually add new bills when needed for monthly and annual, support new growth fields, ensure growth only works on real bills not new estimated bills. 2025-08-20 18:11:00 +10:00
9cd14505bf moved new bill type button over 2 more to accom new freq field, added slider/support for show estimated and support new growth db fields 2025-08-20 18:08:44 +10:00
b43b472e4b support esimated for new_bill - any GUI new bill is not an estimate 2025-08-20 18:07:39 +10:00
5ebd623d88 replaced ann_growth with ann_growth_min, ann_growth_avg, ann_growth_max in DB 2025-08-20 18:07:09 +10:00
676e9ab95f really should consider quarterly bill additions as seasonal <- more likely for elec, gas, etc 2025-08-18 17:50:50 +10:00
7ac7acf44c major rewrite, took on-board thoughts in TODO, have completely re-written how we process bill_data, and then subsequent growth. Much simpler now (although still complex) - most is now done in one loop to take DB data nd reformat it into an in memory data structure, then process that a few different ways to see missing and future bills, and then calc growths. Still much to go, I do calc missing/future annual bills, but I am not actually adding them to the DB (want to distinguish them from real bills still in DB), not yet calculating additional bills for monthly or quarterly (so not adding them to DB either), then interface would need to show/hide real vs auto-filled bills. To note growth only takes into account real bills, BUT, it also only calcs growth on consecuttive full year data sets - e.g. years with quarterly bills for less than the full year are ignored for now 2025-08-18 17:49:36 +10:00
232f16deba made bill_freq have simple / hard-coded number of bills for a year, e.g. annual == 1, monthly == 12, etc) 2025-08-18 17:45:20 +10:00
a1ed4e364c put more energy into how to calculate future/missing bills 2025-08-18 17:44:41 +10:00
c05fa1cc61 clean up / rename derive_bill_data to be process_bill_data 2025-08-18 17:44:16 +10:00
0df1d4d2d2 use shared define of END_YEAR 2025-08-18 17:43:57 +10:00
28b07c0842 just shared defines, only 1 for now 2025-08-18 17:42:59 +10:00
cf104b5a56 added some better formatting (spacing, headers to tables, etc), flipped the left / right, so now bill type is on left with support for bill_freq being a <select> and on the right, we now have tabbed views of different bill_types 2025-08-18 11:16:32 +10:00
98fa17acd7 first pass of trying to work through deriving annual growth on bills, what info I need, etc. definitely not even close to finished 2025-08-18 11:14:21 +10:00
6403ca7775 add support for bill_freq 2025-08-18 11:13:55 +10:00
adac3eceeb added bill_freq table and referenced it, tweak growth field to ann_growth and added a set_bill_type_growth, for when we can derive a value 2025-08-18 11:13:31 +10:00
27048a450f time to have a more formal TODO 2025-08-18 11:12:21 +10:00
7bab6eabdd finished functional bills page, all naming conventions consistent for html entities, classes, and matching DB fields 2025-08-14 15:54:50 +10:00
b02e03339e Changing a bill (bill_data) now works, as does cancelling cleanly - this is now functional. I have renamed/improved the left-hand-side fields, right-hand-side next - to improve consistency between html and db and bill_data and bill_type 2025-08-14 15:32:09 +10:00
0c0745fe68 First pass of adding bills to finplan.
We now have a new page /bills that shows any bills on the left-hand side (type, date, amount)
and bill types and some derived values (frequency and annual growth rate) on the right-hand side

The new bill, and new bill type buttons/logic all work
The delete bill and bill type buttons/logic all work

The change bill type logic all works (and is a touch complex, it alters the GUI
to show/hide different buttons, and disable/re-enable content in the bill types
table

THe change bill is disabled for now and for later
2025-08-14 12:15:26 +10:00
e01af0b92b payrise increse included 2025-08-09 22:51:55 +10:00
1b0653a7fa use mara now we have DNS on modem 2025-08-09 22:51:34 +10:00
67c855b731 redo the way we do padding to be much more accurate 2025-05-24 16:19:29 +10:00
5b6b6297ea just using deakin redunancy calc figures for leave/tax when resigning 2025-05-11 12:03:36 +10:00
cea4cb9ed4 improved when I finish work vs bluring the 12 week payout and changed to using today() instead of now() as I dont need anything but dates 2025-05-09 14:22:59 +10:00
7bc62a60dc fix for earlier in the month and vertical padding of first year 2025-05-01 14:07:16 +10:00
7b1112eb76 use new /data/ location for finance.db in prod 2025-04-30 13:55:49 +10:00
50461cca4c installed sqllite3 and added an apt-update before the upgrade. Also EXPOSE/opened port 8080 (non-priv) 2025-04-30 13:55:30 +10:00
2809c01d8e updated starting values 2025-04-30 13:00:07 +10:00
54adcfb701 looks like I dont get paid 12 weeks veh. allowance on leaving 2025-04-30 12:59:32 +10:00
3828f849a4 allow the db to persist in /srv/docker/container, if we are in PROD 2025-04-29 15:15:37 +10:00
1878b3c2f3 added step to explicitly copy requirements.txt, this optimises the build process, so just a code change does not cause a rebuild of requirements/packages 2025-04-29 15:15:14 +10:00
44c5f91492 I think I will be paid out my vehicle allowance, so using that figure, but not 100% sure 2025-04-29 15:14:37 +10:00
3ff230b92c added padding/blank lines so that first year dates line up with other years 2025-04-29 12:07:39 +10:00
41451956dd updated thoughts/TODO 2025-04-29 12:06:19 +10:00
1f993397b7 updated comment to keep rough ME bank total, so I dont have to look it up 2025-04-29 12:05:51 +10:00
8e43f572c7 made tooltip smarter for when comparing 2025-04-11 17:00:57 +10:00
fdbad8a2de factor in some growth in CBA price prior to DRP, reduces amount of shares, but increases their cap value - using interest rate as a base here, its all a guess but on average will likely be higher 2025-03-27 14:22:18 +11:00
9baa3b4987 only sell shares in the first year if its not in the same financial year, also show original buffer in comparing note 2025-03-20 17:23:48 +11:00
762746a0c1 update comments, including updated version using for inflation 2025-03-04 20:58:47 +11:00
239007d733 dont hide the comments even if they are small amounts, fix the years we pay rego if we lease/buyout car, etc. 2025-03-04 20:57:48 +11:00
a82ff530bd just fixed up buyout needing to get more rego and insurance from nov 25 onward 2025-02-20 22:13:07 +11:00
545c15e276 fair change in calcs to handle switching from fortnightly lease payments while working to monthly when I quit, and allowing for a buyout instead of continuing the lease when I quit - this will be a bit dodgy until we get an accurate buyout figure and its around when I officially leave work / my final payment - so not really sure how all that will land with +12 weeks notice, etc. But, its functional/as accurate as I can make it for now - with a question still as to how many actual extra payments are made after I stop working - I presume its pay forward, so last pay will include 2 weeks of lease paid, but I am not dealing with that overlap 2 weeks / so might be short a $2k payment or even half it - Again, need accurate figures at time of quitting 2025-02-20 17:01:01 +11:00
5fabec0125 decided to move the save / comp buttons to under the summary, just looks better 2025-02-20 16:09:02 +11:00
f52a6ef033 laying ground-work for car leasing to reflect changing to monthly after-tax or even buying out. For now, no actual change in calcs, just prep work 2025-02-20 15:52:14 +11:00
4dbc8216d7 update notes around car leasing now I have phoned sgfleet and better understand options 2025-02-20 15:51:31 +11:00
a12f17d399 update to support new fields: Car_buyout, Car_buyout_date, Ioniq6_future and updated to pass in dynamic opts for drop-downs for sell shares and ioniq6 future 2025-02-20 15:51:07 +11:00
3f7ff98978 updated to support new fields Car_buyout, Car_buyout_date, Ioniq6_future 2025-02-20 15:50:31 +11:00
27f4766f10 allow passing of options into display class to remove hardcoding in html template, to support more than one select/drop-down. Also, made chaning the future for the ioniq6 payouts toggle appropiate buyout/lease vars to be readonly 2025-02-20 15:50:02 +11:00
e67bdb98cd allow passing of options into display class to remove hardcoding in html template, to support more than one select/drop-down 2025-02-20 15:48:39 +11:00
e2351b83f7 made a container for this 2025-02-19 12:14:18 +11:00