eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-23 22:19:13 +00:00
Code Activity

Prevent scheduled races and races in startphase from showing subsequent races

Browse Source
This commit is contained in:
Bennet Brunsen
2016-04-05 17:43:45 +02:00
parent 43a87c31ad
commit 4935c7d258
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/racelog/RaceLogRaceStatus.java
+5
View File
@@ -14,6 +14,11 @@ public enum RaceLogRaceStatus {
RaceLogRaceStatus(int orderNumber) {
this.orderNumber = orderNumber;
}
public static boolean isPreRunning(RaceLogRaceStatus status) {
return status != null &&
(status.equals(SCHEDULED) || status.equals(STARTPHASE));
}
public static boolean isActive(RaceLogRaceStatus status) {
return status != null &&
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/racelist/RaceFilter.java
+4 -1
View File
@@ -141,7 +141,10 @@ public class RaceFilter extends Filter {
lastRunningRaceInFleet.put(getFleetName(raceItem), fleetCount);
currentlyRunningFleet = raceItem.getFleet();
currentUnscheduledItem = null;
} else if (RaceLogRaceStatus.isActive(status)) {
} else if(RaceLogRaceStatus.isPreRunning(status)) {
filteredItems.add(raceItem);
}
else if (RaceLogRaceStatus.isActive(status)) {
int fleetCount = fleetItemCount.get(getFleetName(raceItem));
lastRunningRaceInFleet.put(getFleetName(raceItem), fleetCount);
filteredItems.add(raceItem);