jacob1123/budgeteer
1
1
Fork 0
Code Issues 12 Pull Requests 1 Packages Releases 1 Wiki Activity

Fix calls to isAfter and so on

Browse Source
This commit is contained in:
Jan Bader 2022-04-06 21:44:43 +00:00
parent 54e591bc5e
commit 35690681cf
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/budgeting.go
View File

@ -88,7 +88,7 @@ func (*Handler) getAvailableBalance(budget postgres.Budget, month Month,
continue continue
} }
if !month.nextMonth().isAfter(bal.Date) { if !month.InPast(bal.Date) {
continue continue
} }
@ -152,19 +152,19 @@ func (h *Handler) calculateBalances(budget postgres.Budget, month Month,
} }
// skip everything in the future // skip everything in the future
if month.nextMonth().isAfter(bal.Date) { if month.InFuture(bal.Date) {
continue continue
} }
moneyUsed.SubI(bal.Assignments) moneyUsed.SubI(bal.Assignments)
categoryWithBalance.Available.AddI(bal.Assignments) categoryWithBalance.Available.AddI(bal.Assignments)
categoryWithBalance.Available.AddI(bal.Transactions) categoryWithBalance.Available.AddI(bal.Transactions)
if !categoryWithBalance.Available.IsPositive() && month.isAfter(bal.Date) { if !categoryWithBalance.Available.IsPositive() && month.InPast(bal.Date) {
moneyUsed.AddI(categoryWithBalance.Available) moneyUsed.AddI(categoryWithBalance.Available)
categoryWithBalance.Available = numeric.Zero() categoryWithBalance.Available = numeric.Zero()
} }
if month.contains(bal.Date) { if month.InPresent(bal.Date) {
categoryWithBalance.Activity = bal.Transactions categoryWithBalance.Activity = bal.Transactions
categoryWithBalance.Assigned = bal.Assignments categoryWithBalance.Assigned = bal.Assignments
} }