From 91382b25630302ed0b7ef473292085908d3bf395 Mon Sep 17 00:00:00 2001 From: fmittag Date: Thu, 18 Sep 2014 11:47:17 +0200 Subject: [PATCH 1/3] don't show tracked race with no gps data (proxy races) as tracked in newhome races page --- .../client/place/event/regattaraces/EventRegattaRacesRace.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaraces/EventRegattaRacesRace.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaraces/EventRegattaRacesRace.java index 3f9f7f4d4e6..bd61a4bbbd0 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaraces/EventRegattaRacesRace.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaraces/EventRegattaRacesRace.java @@ -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; From e45fd9a1def0434c63449b5414f0d82b3abd7f91 Mon Sep 17 00:00:00 2001 From: fmittag Date: Thu, 18 Sep 2014 11:57:03 +0200 Subject: [PATCH 2/3] improved calculation of trackedRacesCount (for proxy races) --- .../sailing/domain/common/dto/AbstractLeaderboardDTO.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/AbstractLeaderboardDTO.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/AbstractLeaderboardDTO.java index e9231cde87f..233efb31d75 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/AbstractLeaderboardDTO.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/AbstractLeaderboardDTO.java @@ -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++; } } From 58b021455a00251ef42555a77debaa28b9ee550a Mon Sep 17 00:00:00 2001 From: fmittag Date: Sat, 20 Sep 2014 11:46:58 +0200 Subject: [PATCH 3/3] fix for bug 2306: Newhome leaderboard uses wrong font colors --- .../home/client/place/event/oldleaderboard/OldLeaderboard.css | 1 + .../client/place/event/oldleaderboard/OldLeaderboard.ui.xml | 2 +- .../place/event/oldmultileaderboard/OldMultiLeaderboard.css | 1 + .../place/event/oldmultileaderboard/OldMultiLeaderboard.ui.xml | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/oldleaderboard/OldLeaderboard.css b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/oldleaderboard/OldLeaderboard.css index 15352534e8d..2e19c7583eb 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/oldleaderboard/OldLeaderboard.css +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/oldleaderboard/OldLeaderboard.css @@ -2,4 +2,5 @@ background-color:#f8f8f8; padding: 0 10px 10px 10px; width: 100%; + font-weight: bold; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/oldleaderboard/OldLeaderboard.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/oldleaderboard/OldLeaderboard.ui.xml index de70bc348ee..78a7d793090 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/oldleaderboard/OldLeaderboard.ui.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/oldleaderboard/OldLeaderboard.ui.xml @@ -24,7 +24,7 @@
- +
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/oldmultileaderboard/OldMultiLeaderboard.css b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/oldmultileaderboard/OldMultiLeaderboard.css index aef52834f27..4dc5ec994e4 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/oldmultileaderboard/OldMultiLeaderboard.css +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/oldmultileaderboard/OldMultiLeaderboard.css @@ -2,4 +2,5 @@ background-color:#f8f8f8; padding: 0 10px 10px 10px; width: 100%; + font-weight: bold; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/oldmultileaderboard/OldMultiLeaderboard.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/oldmultileaderboard/OldMultiLeaderboard.ui.xml index 7749dcfde0f..90215f9dfed 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/oldmultileaderboard/OldMultiLeaderboard.ui.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/oldmultileaderboard/OldMultiLeaderboard.ui.xml @@ -24,7 +24,7 @@
- +