54c4c38403
noting multi-year growth figures are off - e.g. internet stays same price for 3 years
Damien De Paoli2025-08-22 18:14:31 +10:00
1719032ebf
wrapped new_bill in new_estimated_bill func, that adds to DB and to local bill_info, use this better to fill in quarterly future bills. Also exclude in growth calculations the final year of real bill if it includes estimates and real figures. For now, this is usable
Damien De Paoli2025-08-22 18:10:09 +10:00
444a01ea42
removed lots of debugs, added find_next_bill to allow better estimating of bills in the past. Growth now uses bills in the past (estimated included), which simplifies the code a bit. All working now except pragmatic missing quarterly bills not started
Damien De Paoli2025-08-22 16:01:45 +10:00
1729c93bcd
cant have bills that are further than a year apart
Damien De Paoli2025-08-22 15:51:02 +10:00
78141d097f
amount needs to be cast to a float to be a .2f in new bill
Damien De Paoli2025-08-22 14:07:49 +10:00
0cf3d9897f
created find_previous_bill and use it to help work out gaps in bills - e.g. like with internet where I added only the new costs
Damien De Paoli2025-08-22 13:24:25 +10:00
3521d4c126
make radio button for min / avg / max growth value be pushed into which_growth in the DB for bill_type row, then also delete estimated bills for that bill_type, and then calling /bills, causes the estimated bills to be filled back in based on the new chosen growth model
Damien De Paoli2025-08-21 18:20:32 +10:00
ada6dfa3f5
allow growth toggle radio buttons, non-functional, just looks
Damien De Paoli2025-08-21 17:36:17 +10:00
cd7eca0c6e
simplified when we calc totals and hence growth, applied monthly growth annually
Damien De Paoli2025-08-21 16:52:37 +10:00
c469f6d281
force new bill to restrict the amount to $/c (2 decimal points)
Damien De Paoli2025-08-21 16:51:57 +10:00
3d95cd1d2e
estimates now show as italic and do not get any action buttons when shown
Damien De Paoli2025-08-20 18:30:02 +10:00
d7320e8aa8
remove num we now use - bill_info[bill_type][num_ann_bills], fix bug where we were re-adding first year bills
Damien De Paoli2025-08-20 18:21:52 +10:00
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.
Damien De Paoli2025-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
Damien De Paoli2025-08-20 18:08:44 +10:00
b43b472e4b
support esimated for new_bill - any GUI new bill is not an estimate
Damien De Paoli2025-08-20 18:07:39 +10:00
5ebd623d88
replaced ann_growth with ann_growth_min, ann_growth_avg, ann_growth_max in DB
Damien De Paoli2025-08-20 18:07:09 +10:00
676e9ab95f
really should consider quarterly bill additions as seasonal <- more likely for elec, gas, etc
Damien De Paoli2025-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
Damien De Paoli2025-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)
Damien De Paoli2025-08-18 17:45:20 +10:00
a1ed4e364c
put more energy into how to calculate future/missing bills
Damien De Paoli2025-08-18 17:44:41 +10:00
c05fa1cc61
clean up / rename derive_bill_data to be process_bill_data
Damien De Paoli2025-08-18 17:44:16 +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
Damien De Paoli2025-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
Damien De Paoli2025-08-18 11:14:21 +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
Damien De Paoli2025-08-18 11:13:31 +10:00
7bab6eabdd
finished functional bills page, all naming conventions consistent for html entities, classes, and matching DB fields
Damien De Paoli2025-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
Damien De Paoli2025-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
Damien De Paoli2025-08-14 12:15:26 +10:00
67c855b731
redo the way we do padding to be much more accurate
Damien De Paoli2025-05-24 16:19:29 +10:00
5b6b6297ea
just using deakin redunancy calc figures for leave/tax when resigning
Damien De Paoli2025-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
Damien De Paoli2025-05-09 14:22:59 +10:00
7bc62a60dc
fix for earlier in the month and vertical padding of first year
Damien De Paoli2025-05-01 14:07:16 +10:00
50461cca4c
installed sqllite3 and added an apt-update before the upgrade. Also EXPOSE/opened port 8080 (non-priv)
Damien De Paoli2025-04-30 13:55:30 +10:00
54adcfb701
looks like I dont get paid 12 weeks veh. allowance on leaving
Damien De Paoli2025-04-30 12:59:32 +10:00
3828f849a4
allow the db to persist in /srv/docker/container, if we are in PROD
Damien De Paoli2025-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
Damien De Paoli2025-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
Damien De Paoli2025-04-29 15:14:37 +10:00
3ff230b92c
added padding/blank lines so that first year dates line up with other years
Damien De Paoli2025-04-29 12:07:39 +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
Damien De Paoli2025-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
Damien De Paoli2025-03-20 17:23:48 +11:00
762746a0c1
update comments, including updated version using for inflation
Damien De Paoli2025-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.
Damien De Paoli2025-03-04 20:57:48 +11:00
a82ff530bd
just fixed up buyout needing to get more rego and insurance from nov 25 onward
Damien De Paoli2025-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
Damien De Paoli2025-02-20 17:01:01 +11:00
5fabec0125
decided to move the save / comp buttons to under the summary, just looks better
Damien De Paoli2025-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
Damien De Paoli2025-02-20 15:52:14 +11:00
4dbc8216d7
update notes around car leasing now I have phoned sgfleet and better understand options
Damien De Paoli2025-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
Damien De Paoli2025-02-20 15:51:07 +11:00
3f7ff98978
updated to support new fields Car_buyout, Car_buyout_date, Ioniq6_future
Damien De Paoli2025-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
Damien De Paoli2025-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
Damien De Paoli2025-02-20 15:48:39 +11:00
852265b820
much simpler annotations spacing, and works better - just use 4 vert levels all left-aligned, not moving x offset every 2nd
Damien De Paoli2025-02-19 12:13:51 +11:00
8cbff9e2fa
correctly show comparison data if the date is changed, not just the value for a comparison set
Damien De Paoli2025-02-15 21:09:13 +11:00
d6d2b93f42
collapse 000 to k in save name, move comp* alert to under the comp button to make it neater
Damien De Paoli2025-02-15 20:32:31 +11:00
ffa7e509ed
fix up the alert-info width to be width of column its in, rather than hard-code it
Damien De Paoli2025-02-14 16:45:03 +11:00
7751f29a0f
moved to a container, reduced default font size to 80% as it was just too large, updated requirements.txt to support containerisation (added gunicorn), but also removed locked versions
Damien De Paoli2025-02-14 16:34:16 +11:00
f3bc8d574d
added now var to support save dialog naming based on now (YYYY-MM-DD), and removed export functionality. stub for saving data is there
Damien De Paoli2025-02-14 15:17:39 +11:00
fcff9233cb
removed export button, made save button call modal dialog and it calls /save route
Damien De Paoli2025-02-14 15:16:21 +11:00
14de3f1790
change to col-auto everywhere, with some more forcing of width maximums to make the page more consistent, redid defaults to incorporate updated per fortnight lease cost, and updated inflation figure/notes/references. Updated default Living expenses to 84000 to match latest view of data, fixed up compare_to to now work, shows a graph of data to compare with, allows drop-down to be compare_to nothing or a saved set, only 1 hand saved for now. Annotations on graph for large changes in savings now work and are legible - had to allow overlap and do some overly complex left/right up/down offsetting to make them all sensible
Damien De Paoli2025-02-13 17:12:02 +11:00
3cf1f1d4de
update for clarity on progress of comparison rewrite
Damien De Paoli2025-02-13 17:09:08 +11:00
65ed02812a
converted over to using a class in disp.py that defines data about each variable in the form, and use an array of these objects to format the form in templates/index.html -- provides consistency of bootstrap classes and makes it far easier to move items around columns/rows in the future, e.g. when I resign. Also, now retrieve actual values form comparison set data (still have hardcoded cset_id for now), but also stopped using separate vars for items like CBA/TLS, and buried them into the finance_data
Damien De Paoli2025-02-12 17:25:23 +11:00
af38b45034
revamp of front-end to ditch lazy table, and use divs / bootstrap better
Damien De Paoli2025-02-10 17:38:31 +11:00
b9b6da1f7a
re-vamp of front-end to use less space. Also, first pass at using comparison data from DB, and created a function to find the last comparison value and use that in the table
Damien De Paoli2025-02-10 16:53:37 +11:00
19f422392a
more thoughts, particularly around what is hidden in my salary, forgot to post lease car costs for ioniq
Damien De Paoli2025-02-07 17:04:28 +11:00
c2886faa30
now allows downloading, defaults include health care and better leave calc. This is probably good enough now, so I have also saved a snapshot/csv of the data
Damien De Paoli2025-01-31 20:07:40 +11:00
ae867d8fac
dont double tax my leave, salary is already taxed, so this is probably closer to real - albeit, the after tax average amount vs extra at full 37% tax, its probably a little generous now).
Damien De Paoli2025-01-30 17:24:20 +11:00
Damien De Paoli