Updated the overview page to use the new debts
This commit is contained in:
@@ -1,46 +1,50 @@
|
|||||||
{{ define "overviewResults" }}
|
{{ define "overviewResults" }}
|
||||||
{{ range .expenses }}
|
{{ range .expenses }}
|
||||||
<table>
|
{{ $exp := . }}
|
||||||
<tr>
|
<table>
|
||||||
<th>ID</th>
|
<tr>
|
||||||
<th>Desc</th>
|
<th>ID</th>
|
||||||
<th>Value</th>
|
<th>Desc</th>
|
||||||
</tr>
|
<th>Value</th>
|
||||||
<tr>
|
</tr>
|
||||||
<td><a href="/expenses/{{ .Exp.ExpID }}">{{ .Exp.ExpID }}</td>
|
<tr>
|
||||||
<td spellcheck="false" contenteditable>{{ .Exp.Description }}</td>
|
<td><a href="/expenses/{{ $exp.ExpID }}">{{ $exp.ExpID }}</td>
|
||||||
<td spellcheck="false" contenteditable>{{ formatPrice .Exp.Value }}</td>
|
<td spellcheck="false" contenteditable>{{ $exp.Description }}</td>
|
||||||
</tr>
|
<td spellcheck="false" contenteditable>{{ formatPrice $exp.Value }}</td>
|
||||||
</table>
|
</tr>
|
||||||
<table>
|
</table>
|
||||||
<tr>
|
<table>
|
||||||
<th>User</th>
|
<tr>
|
||||||
<th>Sum</th>
|
<th>Debtor</th>
|
||||||
</tr>
|
<th>Creditor</th>
|
||||||
{{ range .Debtors }}
|
<th>Sum</th>
|
||||||
<tr>
|
</tr>
|
||||||
<td>{{ .Debtor.UserName }}</td>
|
{{ range $exp.Debts }}
|
||||||
<td>{{ formatPrice .Sum }}</td>
|
{{ $debt := . }}
|
||||||
</tr>
|
<tr>
|
||||||
|
<td>{{ $debt.Debtor.UserName }}</td>
|
||||||
|
<td>{{ $debt.Creditor.UserName }}</td>
|
||||||
|
<td>{{ formatPrice $debt.Sum }}</td>
|
||||||
|
</tr>
|
||||||
|
{{ end }}
|
||||||
|
</table>
|
||||||
|
<hr>
|
||||||
{{ end }}
|
{{ end }}
|
||||||
</table>
|
<br>
|
||||||
<hr>
|
|
||||||
{{ end }}
|
<p>User Debt Summary:</p>
|
||||||
<br>
|
<table>
|
||||||
|
<tr>
|
||||||
<p>User Debt Summary:</p>
|
<th>ID</th>
|
||||||
<table>
|
<th>NAME</th>
|
||||||
<tr>
|
<th>OWES</th>
|
||||||
<th>ID</th>
|
</tr>
|
||||||
<th>NAME</th>
|
{{ range $user, $value := .summary }}
|
||||||
<th>OWES</th>
|
<tr>
|
||||||
</tr>
|
<td>{{ $user.UserID }}</td>
|
||||||
{{ range $user, $value := .summary }}
|
<td>{{ $user.UserName }}</td>
|
||||||
<tr>
|
<td>{{ $value }}</td>
|
||||||
<td>{{ $user.UserID }}</td>
|
</tr>
|
||||||
<td>{{ $user.UserName }}</td>
|
{{ end }}
|
||||||
<td>{{ $value }}</td>
|
</table>
|
||||||
</tr>
|
|
||||||
{{ end }}
|
|
||||||
</table>
|
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
|||||||
+11
-16
@@ -50,34 +50,29 @@ func getResults(c *gin.Context) {
|
|||||||
log.Printf("failed to get shares: %v", err)
|
log.Printf("failed to get shares: %v", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
err = exp.App.LoadExpensePayments(&queriedExpenses[k])
|
err = exp.App.LoadExpensePayments(&queriedExpenses[k])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Printf("failed to get payments: %v", err)
|
log.Printf("failed to get payments: %v", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
err = exp.App.LoadExpenseDebts(&queriedExpenses[k])
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("failed to get debts: %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
userDebtSummary := make(map[mod.User]decimal.Decimal)
|
userDebtSummary := make(map[mod.User]decimal.Decimal)
|
||||||
expensesWithDebts := []ExpenseDebtOverview{}
|
expensesWithDebts := []*mod.Expense{}
|
||||||
for _, e := range queriedExpenses {
|
for _, e := range queriedExpenses {
|
||||||
if len(e.Shares) <= 1 {
|
if len(e.Shares) <= 1 || len(e.Debts) <= 0 {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
expenseDebts, err := exp.CalculateDebts(&e)
|
expensesWithDebts = append(expensesWithDebts, &e)
|
||||||
if err != nil {
|
for _, debt := range e.Debts {
|
||||||
// whatevs yo
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if len(expenseDebts) <= 0 {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
expensesWithDebts = append(expensesWithDebts, ExpenseDebtOverview{
|
|
||||||
Exp: &e, Debtors: expenseDebts,
|
|
||||||
})
|
|
||||||
|
|
||||||
for _, debt := range expenseDebts {
|
|
||||||
userDebtSummary[debt.Debtor] = userDebtSummary[debt.Debtor].Add(debt.Sum)
|
userDebtSummary[debt.Debtor] = userDebtSummary[debt.Debtor].Add(debt.Sum)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user