From 367ed437188f7f8147e898f1626cf14970fe0bfc Mon Sep 17 00:00:00 2001 From: Papick Garcia Taboada Date: Tue, 18 Jul 2017 16:48:15 +0200 Subject: [PATCH] Removed dependency to leaderboard --- .../regattaoverview/RegattaOverview.gwt.xml | 2 +- .../client/RegattaOverviewPanel.java | 95 ------------------- .../AbstractSortableColumnWithMinMax.java | 1 - .../controls}/SortableColumnWithMinMax.java | 0 4 files changed, 1 insertion(+), 97 deletions(-) rename java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/{leaderboard => client/shared/controls}/SortableColumnWithMinMax.java (100%) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/RegattaOverview.gwt.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/RegattaOverview.gwt.xml index 9288fa44332..11fbb97b740 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/RegattaOverview.gwt.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/RegattaOverview.gwt.xml @@ -35,12 +35,12 @@ - + diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RegattaOverviewPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RegattaOverviewPanel.java index b010dcb1bf7..de213336df2 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RegattaOverviewPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RegattaOverviewPanel.java @@ -7,32 +7,22 @@ import java.util.List; import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.event.logical.shared.ValueChangeEvent; -import com.google.gwt.event.logical.shared.ValueChangeHandler; -import com.google.gwt.user.client.Window; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.Anchor; -import com.google.gwt.user.client.ui.CheckBox; import com.google.gwt.user.client.ui.FlexTable; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.SimplePanel; -import com.google.gwt.user.client.ui.TabPanel; import com.google.gwt.user.client.ui.VerticalPanel; import com.sap.sailing.gwt.common.client.SharedResources; import com.sap.sailing.gwt.regattaoverview.client.RegattaRaceStatesComponent.EntryHandler; -import com.sap.sailing.gwt.settings.client.leaderboard.LeaderboardSettings; import com.sap.sailing.gwt.settings.client.regattaoverview.RegattaOverviewContextDefinition; import com.sap.sailing.gwt.settings.client.regattaoverview.RegattaRaceStatesSettings; import com.sap.sailing.gwt.settings.client.utils.StoredSettingsLocationFactory; -import com.sap.sailing.gwt.ui.client.CompetitorSelectionModel; import com.sap.sailing.gwt.ui.client.SailingServiceAsync; import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.leaderboard.LeaderboardPanel; import com.sap.sailing.gwt.ui.shared.EventDTO; import com.sap.sailing.gwt.ui.shared.RaceGroupDTO; -import com.sap.sailing.gwt.ui.shared.StrippedLeaderboardDTO; import com.sap.sse.gwt.client.ErrorReporter; -import com.sap.sse.gwt.client.async.AsyncActionsExecutor; import com.sap.sse.gwt.client.async.MarkedAsyncCallback; import com.sap.sse.gwt.client.player.TimeListener; import com.sap.sse.gwt.client.player.Timer; @@ -66,11 +56,9 @@ public class RegattaOverviewPanel extends SimplePanel { private RegattaRaceStatesComponent regattaRaceStatesComponent; - private TabPanel leaderboardsTabPanel; private final Anchor settingsButton; private final Anchor refreshNowButton; private final Anchor startStopUpdatingButton; - private CheckBox leaderboardCheckBox; private final FlowPanel repeatedInfoLabel = new FlowPanel(); private VerticalPanel mainPanel; private UserService userService; @@ -235,13 +223,6 @@ public class RegattaOverviewPanel extends SimplePanel { // TODO create a perspective and add this parameter to the perspectiveOwnSettings - final boolean showLeaderboardButton = Window.Location.getParameter("enableLeaderboard") != null - && Window.Location.getParameter("enableLeaderboard").equalsIgnoreCase("true"); - if (showLeaderboardButton) { - leaderboardCheckBox = addLeaderboardEnablerButton(); - } else { - leaderboardCheckBox = null; - } FlowPanel flowPanelLeft = new FlowPanel(); flowPanelLeft.addStyleName(style.functionBarLeft()); flowPanelLeft.add(repeatedInfoLabel); @@ -251,9 +232,6 @@ public class RegattaOverviewPanel extends SimplePanel { FlowPanel flowPanelRight = new FlowPanel(); flowPanelRight.addStyleName(style.functionBar()); - if (leaderboardCheckBox != null) { - flowPanelRight.add(leaderboardCheckBox); - } // flexTable.add(refreshNowButton); flowPanelRight.add(startStopUpdatingButton); flowPanelRight.add(settingsButton); @@ -266,82 +244,9 @@ public class RegattaOverviewPanel extends SimplePanel { mainPanel.add(leftRightToolbar); mainPanel.add(regattaRaceStatesComponent); - if (showLeaderboardButton) { - leaderboardsTabPanel = new TabPanel(); - leaderboardsTabPanel.setStyleName(style.leaderboards()); - leaderboardsTabPanel.setVisible(false); - mainPanel.add(leaderboardsTabPanel); - } else { - leaderboardsTabPanel = null; - } checkToEnableSettingsButton(); } - - private CheckBox addLeaderboardEnablerButton() { - final CheckBox checkBox = new CheckBox(stringMessages.leaderboard()); - - checkBox.setEnabled(true); - checkBox.setValue(false); - checkBox.setTitle(stringMessages.showHideComponent("Leaderboard")); - // checkBox.getElement().getStyle().setMarginRight(10, Unit.PX); - checkBox.setStyleName(RES.mainCss().button()); - checkBox.addStyleName(style.button()); - checkBox.addStyleName(style.buttonLeaderboard()); - checkBox.addValueChangeHandler(new ValueChangeHandler() { - @Override - public void onValueChange(ValueChangeEvent newValue) { - boolean visible = checkBox.getValue(); - showLeaderboard = visible; - loadLeaderboard(); - } - }); - - return checkBox; - } - private void loadLeaderboard() { - /* - * Load a tabbed widget with one tab per regatta. Each tab contains the leaderboard for the regatta. - */ - if (leaderboardsTabPanel != null) { - if (showLeaderboard) { - final CompetitorSelectionModel competitorSelectionProvider = new CompetitorSelectionModel(/* hasMultiSelection */ true); - final LeaderboardSettings leaderboardSettings = new LeaderboardSettings(); - sailingService.getLeaderboardsByEvent(eventDTO, new MarkedAsyncCallback>( - new AsyncCallback>() { - @Override - public void onSuccess(List result) { - leaderboardsTabPanel.clear(); - for (StrippedLeaderboardDTO leaderboard : result) { - LeaderboardPanel leaderboardPanel = new LeaderboardPanel(null, null, sailingService, - new AsyncActionsExecutor(), leaderboardSettings, false, - /*preSelectedRace*/null, - competitorSelectionProvider, - null, leaderboard.name, - errorReporter, stringMessages, /* showRaceDetails */false); - leaderboardsTabPanel.add(leaderboardPanel, - (leaderboard.getDisplayName() == null ? leaderboard.name : leaderboard.getDisplayName()) - + " " + stringMessages.leaderboard()); - } - if (!result.isEmpty()) { - leaderboardsTabPanel.setVisible(true); - leaderboardsTabPanel.selectTab(0); - } else { - leaderboardCheckBox.setValue(false); - errorReporter.reportError(stringMessages.errorLoadingLeaderBoardByEvent()); - } - } - @Override - public void onFailure(Throwable caught) { - } - })); - } else { - leaderboardsTabPanel.clear(); - leaderboardsTabPanel.setVisible(false); - } - } - } - private void checkToEnableSettingsButton() { if (eventDTO != null && raceGroupDTOs.size() > 0) { settingsButton.setEnabled(true); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/controls/AbstractSortableColumnWithMinMax.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/controls/AbstractSortableColumnWithMinMax.java index 09101e49517..b89604e2fb4 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/controls/AbstractSortableColumnWithMinMax.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/controls/AbstractSortableColumnWithMinMax.java @@ -2,7 +2,6 @@ package com.sap.sailing.gwt.ui.client.shared.controls; import com.google.gwt.cell.client.Cell; import com.sap.sailing.domain.common.SortingOrder; -import com.sap.sailing.gwt.ui.leaderboard.SortableColumnWithMinMax; public abstract class AbstractSortableColumnWithMinMax extends SortableColumn implements SortableColumnWithMinMax { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/SortableColumnWithMinMax.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/controls/SortableColumnWithMinMax.java similarity index 100% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/SortableColumnWithMinMax.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/controls/SortableColumnWithMinMax.java