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