Mercurial > hg > LightPIT / changeset

     1.1 --- a/src/main/kotlin/de/uapcore/lightpit/servlet/ProjectServlet.kt	Sat Jun 04 18:29:58 2022 +0200
     1.2 +++ b/src/main/kotlin/de/uapcore/lightpit/servlet/ProjectServlet.kt	Sat Jun 04 18:35:45 2022 +0200
     1.3 @@ -188,7 +188,7 @@
     1.4              val issues = dao.listIssues(project, version, component)
     1.5                  .sortedWith(
     1.6                      IssueSorter(
     1.7 -                        IssueSorter.Criteria(IssueSorter.Field.DONE),
     1.8 +                        IssueSorter.Criteria(IssueSorter.Field.PHASE),
     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/types/IssueStatusPhase.kt	Sat Jun 04 18:29:58 2022 +0200
     2.2 +++ b/src/main/kotlin/de/uapcore/lightpit/types/IssueStatusPhase.kt	Sat Jun 04 18:35:45 2022 +0200
     2.3 @@ -25,10 +25,13 @@
     2.4  
     2.5  package de.uapcore.lightpit.types
     2.6  
     2.7 -data class IssueStatusPhase(val number: Int) {
     2.8 +data class IssueStatusPhase(val number: Int): Comparable<IssueStatusPhase> {
     2.9      companion object {
    2.10          val Open = IssueStatusPhase(0)
    2.11          val WorkInProgress = IssueStatusPhase(1)
    2.12          val Done = IssueStatusPhase(2)
    2.13      }
    2.14 +
    2.15 +    override fun compareTo(other: IssueStatusPhase): Int =
    2.16 +        number.compareTo(other.number)
    2.17  }
    2.18 \ No newline at end of file

     3.1 --- a/src/main/kotlin/de/uapcore/lightpit/viewmodel/Issues.kt	Sat Jun 04 18:29:58 2022 +0200
     3.2 +++ b/src/main/kotlin/de/uapcore/lightpit/viewmodel/Issues.kt	Sat Jun 04 18:35:45 2022 +0200
     3.3 @@ -40,7 +40,7 @@
     3.4  
     3.5  class IssueSorter(private vararg val criteria: Criteria) : Comparator<Issue> {
     3.6      enum class Field {
     3.7 -        DONE, ETA, UPDATED
     3.8 +        PHASE, ETA, UPDATED
     3.9      }
    3.10  
    3.11      data class Criteria(val field: Field, val asc: Boolean = true)
    3.12 @@ -51,7 +51,7 @@
    3.13          }
    3.14          for (c in criteria) {
    3.15              val result = when (c.field) {
    3.16 -                Field.DONE -> (left.status.phase == IssueStatusPhase.Done).compareTo(right.status.phase == IssueStatusPhase.Done)
    3.17 +                Field.PHASE -> left.status.phase.compareTo(right.status.phase)
    3.18                  Field.ETA -> {
    3.19                      val l = left.eta
    3.20                      val r = right.eta