Commit Graph

29 Commits

Author SHA1 Message Date
bf66e9fa7c redo D_quit logic (tax and when we can sell shares) 2025-10-17 21:20:22 +11:00
b6b396342f fix up annotation bug where we put daily amt, not bill amt in annot 2025-10-05 12:09:21 +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 2025-09-16 23:24:19 +10:00
1c112e6f6b move future bills into bills.py, away from calc.py for file content consistency 2025-09-15 22:17:17 +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 2025-09-11 17:52:28 +10:00
c49520af7a handle simple future bills and their growth all now done 2025-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 2025-09-05 16:19:53 +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 2025-09-05 12:20:08 +10:00
ebac4aaf66 incorporate bills for dates/amounts into calculations, still need to do future bills on triggers 2025-09-03 22:35:24 +10:00
0df1d4d2d2 use shared define of END_YEAR 2025-08-18 17:43:57 +10:00
e01af0b92b payrise increse included 2025-08-09 22:51:55 +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
54adcfb701 looks like I dont get paid 12 weeks veh. allowance on leaving 2025-04-30 12:59:32 +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
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
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
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
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 2025-02-13 17:12:02 +11:00
ce38b3d1f0 add annotations properly now 2025-02-12 18:06:49 +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 2025-02-12 17:25:23 +11:00
9ac3fff5f2 add post-lease car costs 2025-02-07 17:04:43 +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 2025-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). 2025-01-30 17:24:20 +11:00
b9f54505cc removed M_* variables that are no longer relevant, cleaned up interface to have columns more ordered, updated default values in DB to be more as accurate as I can make them for now 2025-01-30 16:53:31 +11:00
01d373e731 initial commit of finplan - works, with basic csv dump, need to remove unneeded variables, reformat and improve csv next 2025-01-30 16:23:05 +11:00