diff -r 7d67245e5121 -r 6a21bb926e02 src/main/kotlin/de/uapcore/lightpit/viewmodel/Issues.kt --- a/src/main/kotlin/de/uapcore/lightpit/viewmodel/Issues.kt Fri Dec 30 19:14:04 2022 +0100 +++ b/src/main/kotlin/de/uapcore/lightpit/viewmodel/Issues.kt Tue Jan 03 17:04:39 2023 +0100 @@ -37,7 +37,7 @@ class IssueSorter(private vararg val criteria: Criteria) : Comparator { enum class Field { - PHASE, ETA, UPDATED + STATUS, CATEGORY, ETA, UPDATED, CREATED } data class Criteria(val field: Field, val asc: Boolean = true) @@ -48,16 +48,11 @@ } for (c in criteria) { val result = when (c.field) { - Field.PHASE -> left.status.phase.compareTo(right.status.phase) - Field.ETA -> { - val l = left.eta - val r = right.eta - if (l == null && r == null) 0 - else if (l == null) 1 - else if (r == null) -1 - else l.compareTo(r) - } + Field.STATUS -> left.status.compareTo(right.status) + Field.CATEGORY -> left.category.compareTo(right.category) + Field.ETA -> left.compareEtaTo(right.eta) Field.UPDATED -> left.updated.compareTo(right.updated) + Field.CREATED -> left.created.compareTo(right.created) } if (result != 0) { return if (c.asc) result else -result