From 9b55805acdff6e0576956158f9836bb6f7f3810c Mon Sep 17 00:00:00 2001 From: Daniel Ponte Date: Fri, 7 Feb 2025 17:01:17 -0500 Subject: [PATCH] Sort tgs --- pkg/rest/talkgroups.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkg/rest/talkgroups.go b/pkg/rest/talkgroups.go index 8e251d8..5246109 100644 --- a/pkg/rest/talkgroups.go +++ b/pkg/rest/talkgroups.go @@ -4,6 +4,7 @@ import ( "errors" "fmt" "net/http" + "slices" "dynatron.me/x/stillbox/internal/forms" "dynatron.me/x/stillbox/pkg/database" @@ -181,6 +182,14 @@ func (tga *talkgroupAPI) getTGsShareRoute(_ ID, w http.ResponseWriter, r *http.R idSl = append(idSl, id) } + slices.SortFunc(idSl, func(a, b talkgroups.ID) int { + if d := int(a.System) - int(b.System); d != 0 { + return d + } + + return int(a.Talkgroup) - int(b.Talkgroup) + }) + tgRes, err := tgs.TGs(ctx, idSl) if err != nil { wErr(w, r, autoError(err))