From b9f54505cc0de32e3b832584360bd408d79d29dd Mon Sep 17 00:00:00 2001 From: Damien De Paoli Date: Thu, 30 Jan 2025 16:53:31 +1100 Subject: [PATCH] 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 --- .gitignore | 1 + __pycache__/calc.cpython-312.pyc | Bin 5754 -> 0 bytes __pycache__/csv.cpython-312.pyc | Bin 3159 -> 0 bytes __pycache__/db.cpython-312.pyc | Bin 4795 -> 0 bytes __pycache__/main.cpython-312.pyc | Bin 5690 -> 0 bytes calc.py | 11 ----- db.py | 19 ++------ finance.db | Bin 12288 -> 12288 bytes main.py | 4 -- templates/index.html | 77 ++++++++++++------------------- 10 files changed, 34 insertions(+), 78 deletions(-) delete mode 100644 __pycache__/calc.cpython-312.pyc delete mode 100644 __pycache__/csv.cpython-312.pyc delete mode 100644 __pycache__/db.cpython-312.pyc delete mode 100644 __pycache__/main.cpython-312.pyc diff --git a/.gitignore b/.gitignore index 29cec9a..b704964 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ __pycache__/ .python/ +finance.db diff --git a/__pycache__/calc.cpython-312.pyc b/__pycache__/calc.cpython-312.pyc deleted file mode 100644 index fb0643d2e6750f1b2cf142fa0e0903d85396321b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5754 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 Wuzs}aJza7=6%ZCm=?&CE_x~^aTGuH6 diff --git a/__pycache__/db.cpython-312.pyc b/__pycache__/db.cpython-312.pyc deleted file mode 100644 index 55d60e4b07a1e1ba035edd3c58d6a58a435d0ec4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4795 zcmcImO>7fK6rS}@9Bjy6lk$^5hYGb>aDIS7iv+|bHo?SpsO`{#DlHrD#@VphHM^UH zfT@fMrBM!{CumjmQmIlKsfV6=tJG^Rv_)!UaigjlRjMpPFI1KKX1(j5uxqDMJF=h0 zGv9kN^WMyR-}l?Lc@eapZ$HZX)r!z#^2clrqqDvbI`fHmq=R#T zbaHNxt_6y2S|cj)w4tc~I6;!{`b7};kVfgFAf`?G<^cS1)QT~G18L>)X;-;h?&J_d ztm-X?l8AQ1uX!g0iIviPKQ}?U3Lf=}C}{lQf+sCY5}(!z&V)Q)@G0^pM1Uf(4*~p?p^=zdOq~f)w$|x&5y1F2-Wz6=;}V%3JX{JWQ9PX-9R}sT|QrF zjL7mlm7}KJm2tCI@gIe35DwGBI>KXWR({PjIOk3n z4oBjt@JKj;&m|(UVB!KE4PU^)@zhu(4pw8~c*<|78Df&G$SMn_zBMYwsGC5AnE31r zGbt;YBxI&EmC3RV?fzShWO_=LMdmcmtM#`$%qom1vl25Wu#Gojq8rbjHU?L21Z%sGNbU4Tpt!>7C*L19%TOc1mVY)TOw((Dm(bG`KHYbP#G!pjF;@k8(ym)8!yt2YhImo7|62a zM@KeXdRx$|dOv<#6I_@ygGUbj{9Pxbl`Cz(aP@U2I+ZKy$K`7Yr!{ZihJEPwp=vY6 ze_QvOhcj?hmxZ>~IUkIUhm*K>$dCWC4^8jN{QOz=#MzI(4rIKf_vNR7HB!{q2&EB< z;~+%1eHr?l^n5L)&wT$CY?zYn$ok1Dk}vKf0a+qYJ8!2lGmWTNjyx+Gc$r#aHmCC|68|k-O^(RosfY z&N!cLYuXZV7CVr83sJolTXi+xIeYW$?WjT+P7T>3G>&}NzXI_;lD#@q?uMfgHPgz( zELSFoB~tyek>2*#L$C!fbGJOHug*I+jr(6q{^uLo?|r_|#!d!E>mJ5>wN4;-XXVx|A6x zu_MlQ!fwaUg$N}!>2ETevdlDQMS-{sS*J_0(%2)cDv&+esxsN5s|u4nXk)=@jI56^ zsj96{HWWU4YbHgtwNz6m?d_Bcr9H%~F?A4Ch1DKaQ*iBJuQ%}6L`L<;?ONh0Za+N&*3&K}D2_lbvu`it6?fZ&H(JT9(zTWLVP<+Ft z1k!GWq}bB_NLAMJxxUO7NKeOl-hbA7d`9MGMgF9M0Yoyix*J5%Nm0~e)bhmTq}rZ% U`>FOPm#8Lc=X%>-s$EzA2La0pOaK4? diff --git a/__pycache__/main.cpython-312.pyc b/__pycache__/main.cpython-312.pyc deleted file mode 100644 index 99d4e0556c9a2943211177cb4b8f4066ea993d8b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5690 zcmbVQTWs6b89t;)in_~|FLf@Clh{s_i=8&@nl5RBCB7tW;v{u0t=fd8McSrAT}o0; ztWmA97N~<2hzk^pfwq`l26#vYWN&@kV}ZSpRf2e@EtX*gwgP)lE)QFt_8&@=WiMH^ z9e_Ny??3;~bN=&R_{UJlkDwe3d^RPwBJ@|%aSKyxJUmGubR9`ZqEwWk5>$##&?!&C zlVTD~icPR7F2PY`o>sjnKEXR}kLpYL6aG{n5l96SL1&CnL#c2g?6g@ml8PiEPMcGs zi73!>YD=PpMlvP0-T7yFh2+>wyw+)`B(IB?_z#hbPP9J-?UVdd)Xl&R zy1IlEY@q3Q3Qb4~ucC=G&~(bJQuN|>gtQn?KieQ!ttqwKtbY-O=D0a79{YjJ#W~E5 zsG@!mM>IJt$(mrusjMm*GWKfnyE$1mFt5pyqRB}Edvls9OlCC9zb@<9Oj?)Y6keYc z)nty42)a0{q^ER2lC!F8D4BHJgS|>xF$8G>N2g>%m{ihYIw=d1XoxtR%R()?gRoXW zk|)KSYDh}bfG$s_4J9RyJ*Ebeji2R%jt8EHSw}aF+G(Ns-WQNT=AB|9_jKN75h_px zy5K1=1=ggrs7cMh*xKTrV1bgT0yl*UUei0{U5i4XagxX6B<3^b3wn}vxlrgSXco|{ z33}EAOXY!Y)0AGIL=sQvBwrrxjO5P;{s;QNf6xb?OmC2#b&3=+kx7}f$$-q>o8cR^ z?;l6;$e8l@MT9VWNKsY&G1Z%Ab`3l?iMd0$$w^tmzQc!pCS)}wDd)q-GihU5o$Hy% zNuU5Ya!esQA`D;7%Ah~Ga&G{kAA-O!A37(?7wgC$o+o2|1(fpgz_gK4K~=pq^}*q~ zh7nByU9D*z_MAR8jy=F0WH~c5I($0LYOqg8BcFvC2h53C;4NvyzQlPPY}84O>@aS3 z6*&tR0`%QTD^t@34iTj4YPq(ath<5W*$J`_+D2&WJiK~p8OcIA*oQmtOvI z>zDeUyzR@KeRn%|*quAdoxA446%K`3i^I!-P;q3L@qcvu%JGHK#dk~XC8HFyHtx1! z1Gkwy?#z)ARoYroZ|%4H587J}{(-SJ4_nDs+Ip9$rDN7huiCp_`)b(U zb;>$(&fa;>dh@&$zhLzXR!qFjB;6%Xl-^xBVC_38nfuIR?iR`~%+CkwHkEGE+0JZlBZ=MGp8!Fmw|bPZJoX z2@Kl=#xWN^BD1%NbsY2YBkTB@SjXQ4CeQ>X*aRlj1SZ@BCej2Z+61Ph2~2Afm{=2- zwk9y`O<+2jz;rf&d8P?WR}+|Z1T(n~Ty)*_uDECl8Ffe7;EdM0&eg5K4Q&|1{E#p% zs-iZB`Qu=iomShBFqTWL*lk_NigUQ__>)Eh>H zBRD`>6QZhSGHI9Lb4US<_`v7Yt3wV&8F5yC^{XmBAppDvPtSkhvsFf|3UJHmBp@kN|#7(5FRM z0M=U78xn}OtrZs$XTQsz<`v{(|7`YiT947AE!l2dcsC0%uw|5xO^a&Zl!3Qln^ zW`Q&5A#{Eap|`;S7rX@?qTzZ}>7t1%b}1ys;TC)*XFBd@hD2;@is?1^#t8f4XBlLK zT#)4X5SiQz38K~%HCYE(eKJnsByJUM^r>GJb)})u$0DGDGbDUoQ|c!XGq$-?W=!%*yyR1;oBkW* z20#HP5`f%tw?;z6Wc?~Yha?Ak;d%HRyk3LE|2i_!c~GzdwUTU_brt>?8 z0R=3gM;ro+{$CP60@(DqQI7Q%k1cO__5q^VpV<5}^ZY{pa-{Rxdsp9EOqL^CO3&Jn zzIkSuZ(BHR^Xu;No5A0e_AQ;Ywmg4_f1$zx*&{#Nun9Ei%L8}!kJ0X89UGIx*j0T*Ec_OFB1K9?}AwxvODAD*p9CwJC?h5EIn^` z@43}tcklfqu)r+H%hA|%|0n*%p;F)C%Xgyjd$snn&10D_kB7w`l0r;yKL53+YnkzWGeJf* diff --git a/calc.py b/calc.py index 828830a..a53b581 100644 --- a/calc.py +++ b/calc.py @@ -4,9 +4,7 @@ from datetime import datetime, timedelta def calculate_savings_depletion(finance): # Extract all the financial data from the database D_Salary = finance['D_Salary'] - M_salary = finance['M_salary'] D_Num_fortnights_pay = finance['D_Num_fortnights_pay'] - M_Num_fortnights_pay = finance['M_Num_fortnights_pay'] School_Fees = finance['School_Fees'] Car_loan_via_pay = finance['Car_loan_via_pay'] Car_loan = finance['Car_loan'] @@ -15,7 +13,6 @@ def calculate_savings_depletion(finance): Savings = finance['Savings'] Interest_Rate = finance['Interest_Rate'] Inflation = finance['Inflation'] - M_payout = finance['M_payout'] Mich_present = finance['Mich_present'] Overseas_trip = finance['Overseas_trip'] Mark_reno = finance['Mark_reno'] @@ -59,7 +56,6 @@ def calculate_savings_depletion(finance): # significant dates - but who knows when? :) overseas_trip_date = datetime.strptime( finance['Overseas_trip_date'], "%Y-%m-%d") mark_reno_date = datetime.strptime( finance['Mark_reno_date'], "%Y-%m-%d") - M_payout_date = datetime.strptime( finance['M_payout_date'], "%Y-%m-%d") # to force deakin pay cycles to match reality, we work from the 8th of Jan as our "day-zero" so we are paid on the 8/1/25, 22/1/25, etc. days_count = ( current_date - datetime(2025,1,1) ).days @@ -84,9 +80,6 @@ def calculate_savings_depletion(finance): if D_Num_fortnights_pay > 0: fortnight_income += D_Salary D_Num_fortnights_pay -= 1 - if M_Num_fortnights_pay > 0: - fortnight_income += M_salary - M_Num_fortnights_pay -= 1 if D_Num_fortnights_pay == 0 and D_leave_after_tax > 0: print(f"D has resigned {current_date}: get paid out my 9 weeks leave and lose 45% to tax - ${D_leave_after_tax}" ) @@ -116,10 +109,6 @@ def calculate_savings_depletion(finance): daily_living_expenses = Living_Expenses / 365 #print(f"Living Exp inceased {current_date}: ${Living_Expenses}") - if current_date.date() == M_payout_date.date(): - current_savings += M_payout - print(f"payout={current_date} + {M_payout}") - if current_date.date() == school_fees_date.date(): current_savings -= School_Fees print(f"school fees={current_date} - {School_Fees}") diff --git a/db.py b/db.py index 8044471..e4e332a 100644 --- a/db.py +++ b/db.py @@ -12,9 +12,7 @@ def init_db(): cur.execute('''CREATE TABLE IF NOT EXISTS finance ( id INTEGER PRIMARY KEY AUTOINCREMENT, D_Salary INTEGER, - M_salary INTEGER, D_Num_fortnights_pay INTEGER, - M_Num_fortnights_pay INTEGER, School_Fees INTEGER, Car_loan_via_pay INTEGER, Car_loan INTEGER, @@ -23,7 +21,6 @@ def init_db(): Savings INTEGER, Interest_Rate REAL, Inflation REAL, - M_payout INTEGER, Mich_present INTEGER, Overseas_trip INTEGER, Mark_reno INTEGER, @@ -35,20 +32,16 @@ def init_db(): CBA_price REAL, Overseas_trip_date STRING, Mark_reno_date STRING, - M_payout_date STRING, Sell_shares INTEGER )''') # Check if table is empty, if so insert default values cur.execute('SELECT COUNT(*) FROM finance') if cur.fetchone()[0] == 0: - cur.execute('''INSERT INTO finance (D_Salary, M_salary, D_Num_fortnights_pay, M_Num_fortnights_pay, - School_Fees, Car_loan_via_pay, Car_loan, Car_balloon, Living_Expenses, Savings, Interest_Rate, - Inflation, M_payout, Mich_present, Overseas_trip, Mark_reno, D_leave_owed_in_days, D_TLS_shares, - M_TLS_shares, D_CBA_shares, TLS_price, CBA_price, Overseas_trip_date, Mark_reno_date, - M_payout_date, Sell_shares) - VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)''', - (4762.29, 1962.56, 7, 1, 22000, 620, 1001.12, 45824.68, 65000, 297000, 5.0, 3.9, 96000,10000,28000,10000,90.6,1000,750,1095,4.03,156.21,'2025-06-01','2025-09-01', '2025-01-20', 6)) + cur.execute('''INSERT INTO finance (D_Salary, D_Num_fortnights_pay, School_Fees, Car_loan_via_pay, Car_loan, Car_balloon, Living_Expenses, Savings, Interest_Rate, + Inflation, Mich_present, Overseas_trip, Mark_reno, D_leave_owed_in_days, D_TLS_shares, M_TLS_shares, D_CBA_shares, TLS_price, CBA_price, Overseas_trip_date, Mark_reno_date, Sell_shares) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)''', + (4762.29, 6, 22000, 620, 1001.12, 45824.68, 78000, 412000, 5.0, 3.9, 10000, 32000, 10000, 90.6, 1000, 750, 1095, 3.99, 160.61, '2025-06-01', '2025-09-01', 5)) # NOTE: 1001.12 car-pay -- is 1017.99 (actual rate) - 16.87 (car park) # NOTE: o/s trip. ~ $4kpp flights x3, then ~$3k / week in barcelona accom, $100pp/pd for food ($2k), + spending money conn.commit() @@ -68,9 +61,7 @@ def update_finance(data): cur = conn.cursor() cur.execute('''UPDATE finance SET D_Salary = ?, - M_salary = ?, D_Num_fortnights_pay = ?, - M_Num_fortnights_pay = ?, School_Fees = ?, Car_loan_via_pay = ?, Car_loan = ?, @@ -79,7 +70,6 @@ def update_finance(data): Savings = ?, Interest_Rate = ?, Inflation = ?, - M_payout = ?, Mich_present = ?, Overseas_trip = ?, Mark_reno = ?, @@ -91,7 +81,6 @@ def update_finance(data): CBA_price = ?, Overseas_trip_date = ?, Mark_reno_date = ?, - M_payout_date = ?, Sell_shares = ? WHERE id = 1''', data) conn.commit() diff --git a/finance.db b/finance.db index b97d5ee98285a9b535a5a7400a5d596c7695f981..66a0ca2ef743f73f724ec83c9197335bcee456ca 100644 GIT binary patch delta 166 zcmZojXh@hK&B!%T##xYyL9eWnmw|zSiF-B!_gn7Sn*{~5xhH?-3gYSzU}P7UmS*fP zpX|>)f3gUV(dG&sSH{hcc~3D;zRs`D(#XKyxLHu4oL{__QG$V;k%@_&otc@Doe9VQ zVfM*Whz#(i|8VE4IV0y>m?!f=LRc=S%8;2BOFg^L9yvXMN H@{9riUL7nW delta 227 zcmZojXh@hK%~&{5##ykCL9eWnmw|zSiR&{1w=37@jfKrzlV@`WadlcSvWrVgGfr}! z{GEF~yKj7PVoqYwBwqQ+(|C*+eK$|%DPv@hFG#G+FD;qO$Sb#*hwn5ahc8T|i(hH- zb$)%8N(TPQ&4L2?{4$L!j4}-D9E==HOziB;%#0ug6FUgAD^8vvuj1w`$;zTGP|Kh$ z;1I6y^-zC|Ci4rXcP#D>{6MzG*TW9UJAe*lU@$T;GSxLO(={-Juq@#$LtP_-&Hv>Y F1pw5^I|~2+ diff --git a/main.py b/main.py index 234decf..df8c642 100644 --- a/main.py +++ b/main.py @@ -33,9 +33,7 @@ def update(): finance_data = ( request.form['D_Salary'], - request.form['M_salary'], request.form['D_Num_fortnights_pay'], - request.form['M_Num_fortnights_pay'], request.form['School_Fees'], request.form['Car_loan_via_pay'], request.form['Car_loan'], @@ -44,7 +42,6 @@ def update(): request.form['Savings'], request.form['Interest_Rate'], request.form['Inflation'], - request.form['M_payout'], request.form['Mich_present'], request.form['Overseas_trip'], request.form['Mark_reno'], @@ -56,7 +53,6 @@ def update(): request.form['CBA_price'], request.form['Overseas_trip_date'], request.form['Mark_reno_date'], - request.form['M_payout_date'], request.form['Sell_shares'], ) diff --git a/templates/index.html b/templates/index.html index ef4ce1c..b991616 100644 --- a/templates/index.html +++ b/templates/index.html @@ -19,8 +19,8 @@
- - + +
@@ -29,10 +29,10 @@
-
+
- - + +
@@ -52,8 +52,8 @@
- - + +
@@ -62,10 +62,10 @@
-
+
- - + +
@@ -79,8 +79,8 @@
- - + +
@@ -89,33 +89,14 @@
-
-
- - -
-
-
+
-
-
- - - -
-
-
-
- - -
-
@@ -124,11 +105,11 @@
- - + +
-
+
@@ -148,24 +129,12 @@
-
+
-
-
- - -
-
-
-
- - -
-
@@ -186,6 +155,18 @@
+
+
+ + +
+
+
+
+ + +
+