eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-08 21:30:57 +00:00
Code Activity

the aborting flag of the pass before is shown properly when the race is unscheduled if available

Browse Source
This commit is contained in:
Armin Zamani committed 2013-05-26 14:42:21 +02:00
1 parent b960234f02
commit d57d41fe35
3 files changed
+11 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RegattaRaceStatesComponent.java
+1 -1
View File
@@ -139,7 +139,7 @@ public class RegattaRaceStatesComponent extends SimplePanel implements Component
numberOfFinishedRacesOfCurrentRegattaFleet++;
} else if (entry.raceInfo.lastStatus.equals(RaceLogRaceStatus.UNSCHEDULED)) {
//don't filter when the race is unscheduled and aborted before
if (entry.raceInfo.lastUpperAbortingFlag == null) {
if (!entry.raceInfo.isRaceAbortedInPassBefore) {
racesToBeShown.remove(entry);
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
+9 -4
View File
@@ -118,6 +118,7 @@ import com.sap.sailing.domain.common.impl.Util;
import com.sap.sailing.domain.common.impl.Util.Pair;
import com.sap.sailing.domain.common.impl.Util.Triple;
import com.sap.sailing.domain.common.impl.WindSourceImpl;
import com.sap.sailing.domain.common.racelog.RaceLogRaceStatus;
import com.sap.sailing.domain.leaderboard.Leaderboard;
import com.sap.sailing.domain.leaderboard.LeaderboardGroup;
import com.sap.sailing.domain.leaderboard.MetaLeaderboard;
@@ -523,11 +524,15 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
RaceLogFlagEvent abortingFlagEvent = abortingFlagFinder.getAbortingFlagEvent();
if (abortingFlagEvent != null) {
raceInfoDTO.lastUpperAbortingFlag = abortingFlagEvent.getUpperFlag();
raceInfoDTO.lastLowerAbortingFlag = abortingFlagEvent.getLowerFlag();
raceInfoDTO.isAbortingFlagDisplayed = abortingFlagEvent.isDisplayed();
raceInfoDTO.isRaceAbortedInPassBefore = true;
if (raceInfoDTO.lastStatus.equals(RaceLogRaceStatus.UNSCHEDULED)) {
raceInfoDTO.lastUpperFlag = abortingFlagEvent.getUpperFlag();
raceInfoDTO.lastLowerFlag = abortingFlagEvent.getLowerFlag();
raceInfoDTO.isLastFlagDisplayed = abortingFlagEvent.isDisplayed();
}
}
LastPublishedCourseDesignFinder courseDesignFinder = new LastPublishedCourseDesignFinder(raceLog);
raceInfoDTO.lastCourseDesign = convertCourseDesignToRaceCourseDTO(courseDesignFinder.getLastCourseDesign());
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceInfoDTO.java
+1 -3
View File
@@ -21,9 +21,7 @@ public class RaceInfoDTO implements IsSerializable {
public RaceIdentifier raceIdentifier;
public String pathfinderId;
public Long gateLineOpeningTime;
public Flags lastUpperAbortingFlag;
public Flags lastLowerAbortingFlag;
public boolean isAbortingFlagDisplayed;
public boolean isRaceAbortedInPassBefore;
// for GWT serialization
public RaceInfoDTO() { }