diff --git a/src/assets/htmx/overviewResults.html b/src/assets/htmx/overviewResults.html
index 0b9d257..6365711 100644
--- a/src/assets/htmx/overviewResults.html
+++ b/src/assets/htmx/overviewResults.html
@@ -1,46 +1,50 @@
{{ define "overviewResults" }}
{{ range .expenses }}
-
-
- | ID |
- Desc |
- Value |
-
-
- | {{ .Exp.ExpID }} |
- {{ .Exp.Description }} |
- {{ formatPrice .Exp.Value }} |
-
-
-
-
- | User |
- Sum |
-
- {{ range .Debtors }}
-
- | {{ .Debtor.UserName }} |
- {{ formatPrice .Sum }} |
-
+ {{ $exp := . }}
+
+
+ | ID |
+ Desc |
+ Value |
+
+
+ | {{ $exp.ExpID }} |
+ {{ $exp.Description }} |
+ {{ formatPrice $exp.Value }} |
+
+
+
+
+ | Debtor |
+ Creditor |
+ Sum |
+
+ {{ range $exp.Debts }}
+ {{ $debt := . }}
+
+ | {{ $debt.Debtor.UserName }} |
+ {{ $debt.Creditor.UserName }} |
+ {{ formatPrice $debt.Sum }} |
+
+ {{ end }}
+
+
{{ end }}
-
-
-{{ end }}
-
-
-User Debt Summary:
-
-
- | ID |
- NAME |
- OWES |
-
- {{ range $user, $value := .summary }}
-
- | {{ $user.UserID }} |
- {{ $user.UserName }} |
- {{ $value }} |
-
- {{ end }}
-
+
+
+ User Debt Summary:
+
+
+ | ID |
+ NAME |
+ OWES |
+
+ {{ range $user, $value := .summary }}
+
+ | {{ $user.UserID }} |
+ {{ $user.UserName }} |
+ {{ $value }} |
+
+ {{ end }}
+
{{ end }}
diff --git a/src/pages/overview.go b/src/pages/overview.go
index 329f113..9956220 100644
--- a/src/pages/overview.go
+++ b/src/pages/overview.go
@@ -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)
}
}