comparison: src/main/kotlin/de/uapcore/lightpit/viewmodel/Issues.kt
src/main/kotlin/de/uapcore/lightpit/viewmodel/Issues.kt
- changeset 271
- f8f5e82944fa
- parent 268
- ca5501d851fa
- child 284
- 671c1c8fbf1c
equal
deleted
inserted
replaced
| 270:8c088c628a20 | 271:f8f5e82944fa |
|---|---|
| 36 import de.uapcore.lightpit.types.* | 36 import de.uapcore.lightpit.types.* |
| 37 import kotlin.math.roundToInt | 37 import kotlin.math.roundToInt |
| 38 | 38 |
| 39 class IssueSorter(private vararg val criteria: Criteria) : Comparator<Issue> { | 39 class IssueSorter(private vararg val criteria: Criteria) : Comparator<Issue> { |
| 40 enum class Field { | 40 enum class Field { |
| 41 DONE, PHASE, STATUS, CATEGORY, ETA, UPDATED, CREATED | 41 DONE, PHASE, STATUS, CATEGORY, ETA, UPDATED, CREATED; |
| 42 } | 42 |
| 43 | 43 val resourceKey: String by lazy { |
| 44 data class Criteria(val field: Field, val asc: Boolean = true) | 44 if (this == DONE) "issue.filter.sort.done" |
| 45 else if (this == PHASE) "issue.filter.sort.phase" | |
| 46 else "issue.${this.name.lowercase()}" | |
| 47 } | |
| 48 } | |
| 49 | |
| 50 data class Criteria(val field: Field, val asc: Boolean = true) { | |
| 51 override fun toString(): String { | |
| 52 return "$field.$asc" | |
| 53 } | |
| 54 } | |
| 45 | 55 |
| 46 override fun compare(left: Issue, right: Issue): Int { | 56 override fun compare(left: Issue, right: Issue): Int { |
| 47 if (left == right) { | 57 if (left == right) { |
| 48 return 0 | 58 return 0 |
| 49 } | 59 } |
| 168 | 178 |
| 169 class IssueFilter(http: HttpRequest) { | 179 class IssueFilter(http: HttpRequest) { |
| 170 | 180 |
| 171 val issueStatus = IssueStatus.values() | 181 val issueStatus = IssueStatus.values() |
| 172 val issueCategory = IssueCategory.values() | 182 val issueCategory = IssueCategory.values() |
| 183 val sortCriteria = IssueSorter.Field.values().flatMap { listOf(IssueSorter.Criteria(it, true), IssueSorter.Criteria(it, false)) } | |
| 173 val flagIncludeDone = "f.0" | 184 val flagIncludeDone = "f.0" |
| 174 val flagMine = "f.1" | 185 val flagMine = "f.1" |
| 175 val flagBlocker = "f.2" | 186 val flagBlocker = "f.2" |
| 176 | 187 |
| 177 val includeDone: Boolean = evalFlag(http, flagIncludeDone) | 188 val includeDone: Boolean = evalFlag(http, flagIncludeDone) |
| 178 val onlyMine: Boolean = evalFlag(http, flagMine) | 189 val onlyMine: Boolean = evalFlag(http, flagMine) |
| 179 val onlyBlocker: Boolean = evalFlag(http, flagBlocker) | 190 val onlyBlocker: Boolean = evalFlag(http, flagBlocker) |
| 180 val status: List<IssueStatus> = evalEnum(http, "s") | 191 val status: List<IssueStatus> = evalEnum(http, "s") |
| 181 val category: List<IssueCategory> = evalEnum(http, "c") | 192 val category: List<IssueCategory> = evalEnum(http, "c") |
| 193 | |
| 194 val sortPrimary: IssueSorter.Criteria = evalSort(http, "primary", IssueSorter.Criteria(IssueSorter.Field.DONE)) | |
| 195 val sortSecondary: IssueSorter.Criteria = evalSort(http, "secondary", IssueSorter.Criteria(IssueSorter.Field.ETA)) | |
| 196 val sortTertiary: IssueSorter.Criteria = evalSort(http, "tertiary", IssueSorter.Criteria(IssueSorter.Field.UPDATED, false)) | |
| 197 | |
| 198 private fun evalSort(http: HttpRequest, prio: String, defaultValue: IssueSorter.Criteria): IssueSorter.Criteria { | |
| 199 val param = http.param("sort_$prio") | |
| 200 if (param != null) { | |
| 201 http.session.removeAttribute("sort_$prio") | |
| 202 val p = param.split(".") | |
| 203 if (p.size > 1) { | |
| 204 try { | |
| 205 http.session.setAttribute("sort_$prio", IssueSorter.Criteria(enumValueOf(p[0]), p[1].toBoolean())) | |
| 206 } catch (_:IllegalArgumentException) { | |
| 207 // ignore malfored values | |
| 208 } | |
| 209 } | |
| 210 } | |
| 211 return http.session.getAttribute("sort_$prio") as IssueSorter.Criteria? ?: defaultValue | |
| 212 } | |
| 182 | 213 |
| 183 private fun evalFlag(http: HttpRequest, name: String): Boolean { | 214 private fun evalFlag(http: HttpRequest, name: String): Boolean { |
| 184 val param = http.paramArray("filter") | 215 val param = http.paramArray("filter") |
| 185 if (param.isNotEmpty()) { | 216 if (param.isNotEmpty()) { |
| 186 if (param.contains(name)) { | 217 if (param.contains(name)) { |
