diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardDTO.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardDTO.java index bc123d32675..a051f344539 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardDTO.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardDTO.java @@ -124,7 +124,7 @@ public class LeaderboardDTO extends AbstractLeaderboardDTO implements Serializab return competitorOrderingPerRaceColumnName.get(raceColumn.getName()); } - public int getRank(CompetitorDTO competitor) { + public int getTotalRank(CompetitorDTO competitor) { return competitors.indexOf(competitor) + 1; }; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicGPSFixMovingTrackImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicGPSFixMovingTrackImpl.java index 49606070f68..81c9585b386 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicGPSFixMovingTrackImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicGPSFixMovingTrackImpl.java @@ -95,11 +95,12 @@ public class DynamicGPSFixMovingTrackImpl extends DynamicTrackImpl rawFixes, GPSFixMoving e) { @@ -111,22 +112,22 @@ public class DynamicGPSFixMovingTrackImpl extends DynamicTrackImpl event) { -// pauseMedia(); + this.closing = true; this.popupCloseListener.popupClosed(); } @@ -126,14 +133,14 @@ public class YoutubeEmbeddedPlayer extends AbstractMediaPlayer implements VideoP @Override public void pauseMedia() { - if (!isEdited()) { + if (!isEdited() && !this.closing) { videoControl.pause(); } } @Override public void playMedia() { - if (!isEdited()) { + if (!isEdited() && !this.closing) { videoControl.play(); } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/CompetitorTotalRankFilter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/CompetitorTotalRankFilter.java index a987fba5df4..1f51d5fa257 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/CompetitorTotalRankFilter.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/CompetitorTotalRankFilter.java @@ -28,7 +28,7 @@ public class CompetitorTotalRankFilter extends AbstractNumberFilter 0 && operator != null && getLeaderboard() != null) { - int totalRank = getLeaderboard().getRank(competitorDTO); + int totalRank = getLeaderboard().getTotalRank(competitorDTO); result = operator.matchValues(value, totalRank); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java index 5846df300e4..522d3041433 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java @@ -151,7 +151,7 @@ public class LeaderboardPanel extends FormPanel implements TimeListener, PlaySta private LeaderboardDTO leaderboard; - private final RankColumn rankColumn; + private final TotalRankColumn totalRankColumn; /** * Passed to the {@link ManeuverCountRaceColumn}. Modifications to this list will modify the column's children list @@ -1293,8 +1293,8 @@ public class LeaderboardPanel extends FormPanel implements TimeListener, PlaySta } } - private class RankColumn extends SortableColumn { - public RankColumn() { + private class TotalRankColumn extends SortableColumn { + public TotalRankColumn() { super(new TextCell(), SortingOrder.ASCENDING); setHorizontalAlignment(ALIGN_CENTER); setSortable(true); @@ -1302,8 +1302,8 @@ public class LeaderboardPanel extends FormPanel implements TimeListener, PlaySta @Override public String getValue(LeaderboardRowDTO object) { - final int rank = getLeaderboard().getRank(object.competitor); - return "" + (rank == 0 ? "" : rank); + final int totalRank = getLeaderboard().getTotalRank(object.competitor); + return "" + (totalRank == 0 ? "" : totalRank); } @Override @@ -1311,9 +1311,9 @@ public class LeaderboardPanel extends FormPanel implements TimeListener, PlaySta return new InvertibleComparatorAdapter() { @Override public int compare(LeaderboardRowDTO o1, LeaderboardRowDTO o2) { - final int rank1 = getLeaderboard().getRank(o1.competitor); - final int rank2 = getLeaderboard().getRank(o2.competitor); - return rank1 == 0 ? rank2 == 0 ? 0 : 1 : rank2 == 0 ? -1 : rank1 - rank2; + final int totalRank1 = getLeaderboard().getTotalRank(o1.competitor); + final int totalRank2 = getLeaderboard().getTotalRank(o2.competitor); + return totalRank1 == 0 ? totalRank2 == 0 ? 0 : 1 : totalRank2 == 0 ? -1 : totalRank1 - totalRank2; } }; } @@ -1411,7 +1411,7 @@ public class LeaderboardPanel extends FormPanel implements TimeListener, PlaySta setRaceColumnSelectionToLastNStrategy(settings.getNumberOfLastRacesToShow()); break; } - rankColumn = new RankColumn(); + totalRankColumn = new TotalRankColumn(); RACE_COLUMN_HEADER_STYLE = tableResources.cellTableStyle().cellTableRaceColumnHeader(); LEG_COLUMN_HEADER_STYLE = tableResources.cellTableStyle().cellTableLegColumnHeader(); LEG_DETAIL_COLUMN_HEADER_STYLE = tableResources.cellTableStyle().cellTableLegDetailColumnHeader(); @@ -2057,8 +2057,8 @@ public class LeaderboardPanel extends FormPanel implements TimeListener, PlaySta } } - private RankColumn getRankColumn() { - return rankColumn; + private TotalRankColumn getRankColumn() { + return totalRankColumn; } protected void setLeaderboard(LeaderboardDTO leaderboard) { @@ -2318,7 +2318,7 @@ public class LeaderboardPanel extends FormPanel implements TimeListener, PlaySta if (getLeaderboardTable().getColumnCount() == RANK_COLUMN_INDEX) { addColumn(getDefaultSortColumn()); } else { - if (!(getLeaderboardTable().getColumn(RANK_COLUMN_INDEX) instanceof RankColumn)) { + if (!(getLeaderboardTable().getColumn(RANK_COLUMN_INDEX) instanceof TotalRankColumn)) { throw new RuntimeException("The first column must always be the rank column but it was of type " + getLeaderboardTable().getColumn(RANK_COLUMN_INDEX).getClass().getName()); } diff --git a/java/com.sap.sailing.www/index.html b/java/com.sap.sailing.www/index.html index 6b749806e7b..f507538150e 100644 --- a/java/com.sap.sailing.www/index.html +++ b/java/com.sap.sailing.www/index.html @@ -32,38 +32,15 @@

Sailing Events

- + - -

2013

+ --> + + +

Upcoming

-
-
- July 25 - 28 -
-
- -
    -
  • - Extreme Sailing Series 2013 -
    • -
  • - Porto, Portugal -
    • -
- -
-

Extreme Sailing Series 2013

- SAP Sailing Analytics
- Official website -
-
July 19 - 28 @@ -85,6 +62,34 @@ Official website
+
+ +
+ +

2013

+
+
+
+ July 3 - 7 +
+
+ +
    +
  • + 49er European Championship 2013 +
    • +
  • + Aarhus, Denmark +
    • +
+ +
+

49er European Championship 2013

+ SAP Sailing Analytics
+ Official website +
+
+
June 21 - 30 @@ -102,11 +107,33 @@ Official website
+ +
+
+ July 25 - 28 +
+
+ +
    +
  • + Extreme Sailing Series 2013 +
    • +
  • + Porto, Portugal +
    • +
+ +
+

Extreme Sailing Series 2013

+ SAP Sailing Analytics
+ Official website +
+
+
May 1 - 5
-
+
April 29 - May 4
-
    @@ -139,7 +166,8 @@
-

2012

+ +

2012

Championships

@@ -148,7 +176,6 @@
September 9 - 15
-