diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/AbstractLeaderboardsResource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/AbstractLeaderboardsResource.java
index 77193e06078..932f74fa8dd 100644
--- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/AbstractLeaderboardsResource.java
+++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/AbstractLeaderboardsResource.java
@@ -180,6 +180,7 @@ public abstract class AbstractLeaderboardsResource extends AbstractSailingServer
final JSONObject fleetJson = new JSONObject();
fleetsJson.add(fleetJson);
fleetJson.put("name", fleet.getName());
+ fleetJson.put("resultsAreOfficial", isResultsAreOfficial(raceColumn, fleet));
final TrackedRace trackedRace = raceColumn.getTrackedRace(fleet);
final JSONObject trackedRaceInfo;
if (trackedRace == null) {
@@ -195,7 +196,6 @@ public abstract class AbstractLeaderboardsResource extends AbstractSailingServer
? MillisecondsTimePoint.now().minus(trackedRace.getDelayToLiveInMillis())
: new MillisecondsTimePoint(resultTimePoint)));
trackedRaceInfo.put("delayToLiveInMillis", trackedRace.getDelayToLiveInMillis());
- trackedRaceInfo.put("resultsAreOfficial", isResultsAreOfficial(trackedRace));
if (trackedRace.getStatus() != null) {
trackedRaceInfo.put("status", trackedRace.getStatus().getStatus().toString());
trackedRaceInfo.put("loadingProgress", trackedRace.getStatus().getLoadingProgress());
@@ -206,13 +206,9 @@ public abstract class AbstractLeaderboardsResource extends AbstractSailingServer
}
}
- private boolean isResultsAreOfficial(TrackedRace trackedRace) {
- for (final RaceLog raceLog : trackedRace.getAttachedRaceLogs()) {
- if (new ResultsAreOfficialFinder(raceLog).analyze() != null) {
- return true;
- }
- }
- return false;
+ private boolean isResultsAreOfficial(RaceColumn raceColumn, Fleet fleet) {
+ final RaceLog raceLog = raceColumn.getRaceLog(fleet);
+ return new ResultsAreOfficialFinder(raceLog).analyze() != null;
}
protected TimePoint calculateTimePointForResultState(Leaderboard leaderboard, ResultStates resultState) {
diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy).launch b/java/com.sap.sailing.server/SailingServer (No Proxy).launch
index 17bf0530e86..4a07c216c14 100755
--- a/java/com.sap.sailing.server/SailingServer (No Proxy).launch
+++ b/java/com.sap.sailing.server/SailingServer (No Proxy).launch
@@ -33,192 +33,195 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, Axel).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, Axel).launch
index 1b352663e63..7f7dc2ebf79 100644
--- a/java/com.sap.sailing.server/SailingServer (No Proxy, Axel).launch
+++ b/java/com.sap.sailing.server/SailingServer (No Proxy, Axel).launch
@@ -11,6 +11,7 @@
+
@@ -32,9 +33,8 @@
-
-
-
+
+
@@ -60,6 +60,7 @@
+
@@ -72,12 +73,14 @@
-
+
+
+
@@ -91,10 +94,12 @@
+
+
@@ -107,6 +112,7 @@
+
@@ -114,6 +120,7 @@
+
@@ -166,6 +173,9 @@
+
+
+
@@ -181,15 +191,19 @@
+
-
+
+
+
+
diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest Axel).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest Axel).launch
index 32e259aa6a9..0dc10ff5bea 100644
--- a/java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest Axel).launch
+++ b/java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest Axel).launch
@@ -29,179 +29,197 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+