1.1 --- a/src/main/kotlin/de/uapcore/lightpit/viewmodel/Issues.kt Tue Jan 03 18:19:40 2023 +0100 1.2 +++ b/src/main/kotlin/de/uapcore/lightpit/viewmodel/Issues.kt Tue Jan 03 18:25:51 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 - STATUS, CATEGORY, ETA, UPDATED, CREATED 1.8 + DONE, PHASE, STATUS, CATEGORY, ETA, UPDATED, CREATED 1.9 } 1.10 1.11 data class Criteria(val field: Field, val asc: Boolean = true) 1.12 @@ -48,6 +48,8 @@ 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.DONE -> (left.status.phase == IssueStatusPhase.Done).compareTo(right.status.phase == IssueStatusPhase.Done) 1.18 Field.STATUS -> left.status.compareTo(right.status) 1.19 Field.CATEGORY -> left.category.compareTo(right.category) 1.20 Field.ETA -> left.compareEtaTo(right.eta)