From e8addb18367e222c34a3343159a63568f65e24cf Mon Sep 17 00:00:00 2001 From: Bel LaPointe Date: Wed, 25 Oct 2023 14:29:14 -0600 Subject: [PATCH] sort account names for consistent gui --- cmd/clitest/draw.sh | 1 + cmd/clitest/main.go | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cmd/clitest/draw.sh b/cmd/clitest/draw.sh index 1fcf981..708c2e0 100644 --- a/cmd/clitest/draw.sh +++ b/cmd/clitest/draw.sh @@ -7,5 +7,6 @@ go run . -http=:8080 \ -group-date ^....-.. \ -group-name '^[^:]*:[^:]*' \ -like-name '(AssetAccount|Retirement)' \ + -bpi ./bpi.dat \ "$@" \ macro.d/* diff --git a/cmd/clitest/main.go b/cmd/clitest/main.go index 5efbcec..8fe88cb 100644 --- a/cmd/clitest/main.go +++ b/cmd/clitest/main.go @@ -78,12 +78,14 @@ func main() { nameCurrencyDateValue := map[string]map[ledger.Currency]map[string]float64{} dates := []string{} + names := []string{} for date, balances := range register { dates = append(dates, date) if r.URL.Query().Get("bpi") != "" { balances = balances.WithBPIs(bpis) } for name, balance := range balances { + names = append(names, name) for currency, value := range balance { if _, ok := nameCurrencyDateValue[name]; !ok { nameCurrencyDateValue[name] = make(map[ledger.Currency]map[string]float64) @@ -96,6 +98,7 @@ func main() { } } slices.Sort(dates) + slices.Sort(names) chart := NewChart("line") if v := r.URL.Query().Get("chart"); v != "" { @@ -108,7 +111,8 @@ func main() { http.NotFound(w, r) return case "/bal": - for name, currencyDateValue := range nameCurrencyDateValue { + for _, name := range names { + currencyDateValue := nameCurrencyDateValue[name] for currency, dateValue := range currencyDateValue { series := make([]int, len(dates)) for i := range dates { @@ -127,7 +131,8 @@ func main() { } } case "/reg": - for name, currencyDateValue := range nameCurrencyDateValue { + for _, name := range names { + currencyDateValue := nameCurrencyDateValue[name] for currency, dateValue := range currencyDateValue { series := make([]int, len(dates)) for i := range dates {