Tue, 03 Jan 2023 18:25:51 +0100
fix default sort criteria
1.1 --- a/src/main/kotlin/de/uapcore/lightpit/servlet/ProjectServlet.kt Tue Jan 03 18:19:40 2023 +0100 1.2 +++ b/src/main/kotlin/de/uapcore/lightpit/servlet/ProjectServlet.kt Tue Jan 03 18:25:51 2023 +0100 1.3 @@ -187,7 +187,7 @@ 1.4 val issues = dao.listIssues(project, version, component) 1.5 .sortedWith( 1.6 IssueSorter( 1.7 - IssueSorter.Criteria(IssueSorter.Field.STATUS), 1.8 + IssueSorter.Criteria(IssueSorter.Field.DONE), 1.9 IssueSorter.Criteria(IssueSorter.Field.ETA), 1.10 IssueSorter.Criteria(IssueSorter.Field.UPDATED, false) 1.11 )
2.1 --- a/src/main/kotlin/de/uapcore/lightpit/viewmodel/Issues.kt Tue Jan 03 18:19:40 2023 +0100 2.2 +++ b/src/main/kotlin/de/uapcore/lightpit/viewmodel/Issues.kt Tue Jan 03 18:25:51 2023 +0100 2.3 @@ -37,7 +37,7 @@ 2.4 2.5 class IssueSorter(private vararg val criteria: Criteria) : Comparator<Issue> { 2.6 enum class Field { 2.7 - STATUS, CATEGORY, ETA, UPDATED, CREATED 2.8 + DONE, PHASE, STATUS, CATEGORY, ETA, UPDATED, CREATED 2.9 } 2.10 2.11 data class Criteria(val field: Field, val asc: Boolean = true) 2.12 @@ -48,6 +48,8 @@ 2.13 } 2.14 for (c in criteria) { 2.15 val result = when (c.field) { 2.16 + Field.PHASE -> left.status.phase.compareTo(right.status.phase) 2.17 + Field.DONE -> (left.status.phase == IssueStatusPhase.Done).compareTo(right.status.phase == IssueStatusPhase.Done) 2.18 Field.STATUS -> left.status.compareTo(right.status) 2.19 Field.CATEGORY -> left.category.compareTo(right.category) 2.20 Field.ETA -> left.compareEtaTo(right.eta)