Fri, 23 Oct 2020 11:14:37 +0200
renames sort criteria PHASE to DONE, because phase 0 and 1 are combined
1.1 --- a/src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java Fri Oct 23 10:19:46 2020 +0200 1.2 +++ b/src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java Fri Oct 23 11:14:37 2020 +0200 1.3 @@ -241,7 +241,7 @@ 1.4 1.5 for (var issue : issues) issueDao.joinVersionInformation(issue); 1.6 issues.sort(new IssueSorter( 1.7 - new IssueSorter.Criteria(IssueSorter.Field.PHASE, true), 1.8 + new IssueSorter.Criteria(IssueSorter.Field.DONE, true), 1.9 new IssueSorter.Criteria(IssueSorter.Field.ETA, true), 1.10 new IssueSorter.Criteria(IssueSorter.Field.UPDATED, false) 1.11 ));
2.1 --- a/src/main/java/de/uapcore/lightpit/viewmodel/util/IssueSorter.java Fri Oct 23 10:19:46 2020 +0200 2.2 +++ b/src/main/java/de/uapcore/lightpit/viewmodel/util/IssueSorter.java Fri Oct 23 11:14:37 2020 +0200 2.3 @@ -9,7 +9,7 @@ 2.4 public class IssueSorter implements Comparator<Issue> { 2.5 2.6 public enum Field { 2.7 - PHASE, ETA, UPDATED 2.8 + DONE, ETA, UPDATED 2.9 } 2.10 2.11 public static class Criteria { 2.12 @@ -39,7 +39,7 @@ 2.13 private int compare(Issue left, Issue right, Criteria criteria) { 2.14 int result; 2.15 switch (criteria.field) { 2.16 - case PHASE: 2.17 + case DONE: 2.18 result = Boolean.compare( 2.19 left.getPhase() == IssueStatus.PHASE_DONE, 2.20 right.getPhase() == IssueStatus.PHASE_DONE);