|
|
@ -85,6 +85,7 @@ func (s *Service) ListScopedBetween(ctx context.Context, from, to time.Time) ([] |
|
|
|
} |
|
|
|
|
|
|
|
func (s *Service) fillMany(ctx context.Context, sprints []entities.Sprint) ([]Result, error) { |
|
|
|
now := time.Now() |
|
|
|
sort.Slice(sprints, func(i, j int) bool { |
|
|
|
si := sprints[i] |
|
|
|
sj := sprints[j] |
|
|
@ -93,6 +94,12 @@ func (s *Service) fillMany(ctx context.Context, sprints []entities.Sprint) ([]Re |
|
|
|
return si.IsTimed |
|
|
|
} |
|
|
|
|
|
|
|
siActive := si.ToTime.After(now) |
|
|
|
sjActive := sj.ToTime.After(now) |
|
|
|
if sjActive != siActive { |
|
|
|
return siActive |
|
|
|
} |
|
|
|
|
|
|
|
if !si.FromTime.Equal(sj.FromTime) { |
|
|
|
return si.FromTime.Before(sj.FromTime) |
|
|
|
} |
|
|
|