From 5987b7c8e1d1734cb67af4fb6dbd1f3b7b952d3d Mon Sep 17 00:00:00 2001
From: Gisle Aune <dev@gisle.me>
Date: Wed, 13 Jul 2022 22:13:47 +0200
Subject: [PATCH] fix sprint sorting.

---
 .../src/lib/modals/StatCreateEditModal.svelte     |  2 +-
 usecases/sprints/service.go                       | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/frontend/src/lib/modals/StatCreateEditModal.svelte b/frontend/src/lib/modals/StatCreateEditModal.svelte
index 7112a8c..1877763 100644
--- a/frontend/src/lib/modals/StatCreateEditModal.svelte
+++ b/frontend/src/lib/modals/StatCreateEditModal.svelte
@@ -103,7 +103,7 @@ import Checkbox from "$lib/components/layout/Checkbox.svelte";
 </script>
 
 <form on:submit|preventDefault={submit}>
-  <Modal closable show={show} verb={op} noun="Item" disabled={loading} error={error}>
+  <Modal closable show={show} verb={op} noun="Stat" disabled={loading} error={error}>
     <ModalBody>
       <label for="name">Name</label>
       <input name="name" type="text" bind:value={stat.name} />
diff --git a/usecases/sprints/service.go b/usecases/sprints/service.go
index 07e0b01..8bbe9dc 100644
--- a/usecases/sprints/service.go
+++ b/usecases/sprints/service.go
@@ -85,6 +85,21 @@ func (s *Service) ListScopedBetween(ctx context.Context, from, to time.Time) ([]
 }
 
 func (s *Service) fillMany(ctx context.Context, sprints []entities.Sprint) ([]Result, error) {
+	sort.Slice(sprints, func(i, j int) bool {
+		si := sprints[i]
+		sj := sprints[j]
+
+		if si.IsTimed != sj.IsTimed {
+			return si.IsTimed
+		}
+
+		if !si.FromTime.Equal(sj.FromTime) {
+			return si.FromTime.Before(sj.FromTime)
+		}
+
+		return si.ID < sj.ID
+	})
+
 	parts, err := s.Repository.ListParts(ctx, sprints...)
 	if err != nil {
 		return nil, err