eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-04 01:59:35 +00:00
Code Activity

Merge remote-tracking branch 'server/vulcaintrophy'

Browse Source
This commit is contained in:
Axel Uhl committed 2014-09-20 13:36:38 +02:00
2 parents 16d536fca9 58b021455a
commit 80aeb41a6e
2 files changed
+5 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/AbstractLeaderboardDTO.java
+4 -3
View File
@@ -201,9 +201,10 @@ public abstract class AbstractLeaderboardDTO implements Serializable {
public int getTrackedRacesCount() {
int result = 0;
for (RaceColumnDTO race : getRaceList()) {
for (FleetDTO fleet : race.getFleets()) {
if (race.isTrackedRace(fleet)) {
for (RaceColumnDTO raceColumn : getRaceList()) {
for (FleetDTO fleet : raceColumn.getFleets()) {
RaceDTO race = raceColumn.getRace(fleet);
if(race != null && race.trackedRace != null && race.trackedRace.hasGPSData && race.trackedRace.hasWindData) {
result++;
}
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaraces/EventRegattaRacesRace.java
+1 -1
View File
@@ -127,7 +127,7 @@ public class EventRegattaRacesRace extends UIObject {
private SimpleRaceStates getSimpleRaceState() {
SimpleRaceStates simpleRaceState = SimpleRaceStates.NOT_TRACKED;
if(race != null && race.trackedRace != null) {
if(race != null && race.trackedRace != null && race.trackedRace.hasGPSData && race.trackedRace.hasWindData) {
simpleRaceState = SimpleRaceStates.TRACKED;
if(isLive()) {
simpleRaceState = SimpleRaceStates.TRACKED_AND_LIVE;