1.1 --- a/src/main/kotlin/de/uapcore/lightpit/viewmodel/Issues.kt Fri Dec 30 19:14:04 2022 +0100
1.2 +++ b/src/main/kotlin/de/uapcore/lightpit/viewmodel/Issues.kt Tue Jan 03 17:04:39 2023 +0100
1.3 @@ -37,7 +37,7 @@
1.4
1.5 class IssueSorter(private vararg val criteria: Criteria) : Comparator<Issue> {
1.6 enum class Field {
1.7 - PHASE, ETA, UPDATED
1.8 + STATUS, CATEGORY, ETA, UPDATED, CREATED
1.9 }
1.10
1.11 data class Criteria(val field: Field, val asc: Boolean = true)
1.12 @@ -48,16 +48,11 @@
1.13 }
1.14 for (c in criteria) {
1.15 val result = when (c.field) {
1.16 - Field.PHASE -> left.status.phase.compareTo(right.status.phase)
1.17 - Field.ETA -> {
1.18 - val l = left.eta
1.19 - val r = right.eta
1.20 - if (l == null && r == null) 0
1.21 - else if (l == null) 1
1.22 - else if (r == null) -1
1.23 - else l.compareTo(r)
1.24 - }
1.25 + Field.STATUS -> left.status.compareTo(right.status)
1.26 + Field.CATEGORY -> left.category.compareTo(right.category)
1.27 + Field.ETA -> left.compareEtaTo(right.eta)
1.28 Field.UPDATED -> left.updated.compareTo(right.updated)
1.29 + Field.CREATED -> left.created.compareTo(right.created)
1.30 }
1.31 if (result != 0) {
1.32 return if (c.asc) result else -result
