ddp/finplan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Damien De Paoli
2025-01-30 16:53:31 +11:00
parent 4b08f8830b
commit b9f54505cc
10 changed files with 34 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
templates/index.html
View File

@@ -19,8 +19,8 @@
</div>
<div class="col">
<div class="input-group">
<label for="M_salary" class="col-form-label me-2 text-end float-end">M Salary</label>
<input type="number" step="any" class="form-control text-end float-end " id="M_salary" name="M_salary" value="{{ finance['M_salary'] }}">
<label for="Savings" class="col-form-label me-2 text-end float-end">Savings</label>
<input type="number" step="any" class="form-control text-end float-end " id="Savings" name="Savings" value="{{ finance['Savings'] }}">
</div>
</div>
<div class="col">
@@ -29,10 +29,10 @@
<input type="number" step="any" class="form-control text-end float-end " id="Living_Expenses" name="Living_Expenses" value="{{ finance['Living_Expenses'] }}">
</div>
</div>
<div class="col">
<div class="col-2">
<div class="input-group">
<label for="Savings" class="col-form-label me-2 text-end float-end">Savings</label>
<input type="number" step="any" class="form-control text-end float-end " id="Savings" name="Savings" value="{{ finance['Savings'] }}">
<label for="Car_loan_via_pay" class="col-form-label me-2 text-end float-end">Car Loan via Pay</label>
<input type="number" step="any" class="bg-light form-control text-end float-end" id="Car_loan_via_pay" name="Car_loan_via_pay" value="{{ finance['Car_loan_via_pay'] }}" readonly>
</div>
</div>
<div class="col-4">
@@ -52,8 +52,8 @@
</div>
<div class="col">
<div class="input-group">
<label for="M_Num_fortnights_pay" class="col-form-label me-2 text-end float-end">M # Fortnights pay</label>
<input type="number" class="form-control text-end float-end" id="M_Num_fortnights_pay" name="M_Num_fortnights_pay" value="{{ finance['M_Num_fortnights_pay'] }}">
<label for="Interest_Rate" class="col-form-label me-2 text-end float-end">Interest Rate (%)</label>
<input type="number" step="any" class="form-control text-end float-end" id="Interest_Rate" name="Interest_Rate" value="{{ finance['Interest_Rate'] }}">
</div>
</div>
<div class="col">
@@ -62,10 +62,10 @@
<input type="number" step="any" class="form-control text-end float-end" id="Inflation" name="Inflation" value="{{ finance['Inflation'] }}">
</div>
</div>
<div class="col">
<div class="col-2">
<div class="input-group">
<label for="Interest_Rate" class="col-form-label me-2 text-end float-end">Interest Rate (%)</label>
<input type="number" step="any" class="form-control text-end float-end" id="Interest_Rate" name="Interest_Rate" value="{{ finance['Interest_Rate'] }}">
<label for="Car_loan" class="col-form-label me-2 text-end float-end">Car Loan</label>
<input type="number" step="any" class="bg-light form-control text-end float-end" id="Car_loan" name="Car_loan" value="{{ finance['Car_loan'] }}" readonly>
</div>
</div>
<div class="col-4">
@@ -79,8 +79,8 @@
<div class="row align-items-center">
<div class="col-2">
<div class="input-group">
<label for="D_TLS_shares" class="col-form-label me-2 text-end float-end">D TLS amount</label>
<input type="number" step="any" class="form-control text-end float-end" id="D_TLS_shares" name="D_TLS_shares" value="{{ finance['D_TLS_shares'] }}" >
<label for="D_leave_owed_in_days" class="col-form-label me-2 text-end float-end">D leave owed (in days)</label>
<input type="number" step="any" class="form-control text-end float-end" id="D_leave_owed_in_days" name="D_leave_owed_in_days" value="{{ finance['D_leave_owed_in_days'] }}" >
</div>
</div>
<div class="col-2">
@@ -89,33 +89,14 @@
<input type="number" step="any" class="form-control text-end float-end" id="M_TLS_shares" name="M_TLS_shares" value="{{ finance['M_TLS_shares'] }}" >
</div>
</div>
<div class="col-2">
<div class="input-group">
<label for="Car_loan_via_pay" class="col-form-label me-2 text-end float-end">Car Loan via Pay</label>
<input type="number" step="any" class="bg-light form-control text-end float-end" id="Car_loan_via_pay" name="Car_loan_via_pay" value="{{ finance['Car_loan_via_pay'] }}" readonly>
</div>
</div>
<div class="col-2">
<div class="offset-2 col-2">
<div class="input-group">
<label for="Car_balloon" class="col-form-label me-2 text-end float-end">Car Balloon</label>
<input type="number" step="any" class="bg-light form-control text-end float-end" id="Car_balloon" name="Car_balloon" value="{{ finance['Car_balloon'] }}" readonly>
</div>
</div>
<div class="col-4">
<div class="input-group">
<label for="M_payout" class="col-form-label me-2 text-end float-end">M VR Payout</label>
<input type="number" step="any" class="form-control text-end float-end" id="M_payout" name="M_payout" value="{{ finance['M_payout'] }}" >
<input type="date" class="form-control text-end float-end" name="M_payout_date" id="M_payout_date" value="{{finance['M_payout_date']}}" onchange="this.form.submit()">
</div>
</div>
</div class="row">
<div class="row align-items-center">
<div class="col-2">
<div class="input-group">
<label for="D_leave_owed_in_days" class="col-form-label me-2 text-end float-end">D leave owed (in days)</label>
<input type="number" step="any" class="form-control text-end float-end" id="D_leave_owed_in_days" name="D_leave_owed_in_days" value="{{ finance['D_leave_owed_in_days'] }}" >
</div>
</div>
<div class="col-2">
<div class="input-group">
<label for="D_CBA_shares" class="col-form-label me-2 text-end float-end">D CBA amount</label>
@@ -124,11 +105,11 @@
</div>
<div class="col-2">
<div class="input-group">
<label for="Car_loan" class="col-form-label me-2 text-end float-end">Car Loan</label>
<input type="number" step="any" class="bg-light form-control text-end float-end" id="Car_loan" name="Car_loan" value="{{ finance['Car_loan'] }}" readonly>
<label for="D_TLS_shares" class="col-form-label me-2 text-end float-end">D TLS amount</label>
<input type="number" step="any" class="form-control text-end float-end" id="D_TLS_shares" name="D_TLS_shares" value="{{ finance['D_TLS_shares'] }}" >
</div>
</div>
<div class="col-2">
<div class="offset-2 col-2">
<div class="input-group">
<label for="Mich_present" class="col-form-label me-2 text-end float-end float-end">Mich Present</label>
<input type="number" step="any" class="form-control text-end float-end bg-light" id="Mich_present" name="Mich_present" value="{{ finance['Mich_present'] }}" readonly>
@@ -148,24 +129,12 @@
<input type="number" step="any" class="form-control text-end float-end" id="TLS_price" name="TLS_price" value="{{ finance['TLS_price'] }}" >
</div>
</div>
<div class="col-2">
<div class="offset-2 col-2">
<div class="input-group">
<label for="School_Fees" class="col-form-label me-2 text-end float-end">School Fees</label>
<input type="number" step="any" class="bg-light form-control text-end float-end" id="School_Fees" name="School_Fees" value="{{ finance['School_Fees'] }}" readonly>
</div>
</div>
<div class="col-2">
<div class="input-group">
<label for="CBA_shares" class="col-form-label me-2 text-end float-end">FINAL # of CBA</label>
<input type="number" class="form-control text-end float-end bg-light" id="CBA_shares" value="{{CBA}}" readonly>
</div>
</div>
<div class="col-2">
<div class="input-group">
<label for="TLS_shares" class="offset-1 col-form-label me-2 text-end float-end">FINAL # of TLS</label>
<input type="number" class="form-control text-end float-end bg-light" id="TLS_shares" value="{{TLS}}" readonly>
</div>
</div>
</div>
<div class="row align-items-center mt-4">
@@ -186,6 +155,18 @@
</select>
</div>
</div>
<div class="col-2">
<div class="input-group">
<label for="CBA_shares" class="col-form-label me-2 text-end float-end">FINAL # of CBA</label>
<input type="number" class="form-control text-end float-end bg-light" id="CBA_shares" value="{{CBA}}" readonly>
</div>
</div>
<div class="col-2">
<div class="input-group">
<label for="TLS_shares" class="offset-1 col-form-label me-2 text-end float-end">FINAL # of TLS</label>
<input type="number" class="form-control text-end float-end bg-light" id="TLS_shares" value="{{TLS}}" readonly>
</div>
</div>
</div>
</form>
</div>