Merge remote-tracking branch 'server/bug2842' into bug2842

Change-Id: Icb7fe06c792b8884c7c9cc34d08cd14c8b2a2256
This commit is contained in:
Axel Uhl committed 2019-09-18 14:12:32 +02:00
commit ea5cd063ca
2 files changed
+17 -6

No files matched your search

@@ -43,7 +43,7 @@ public class BoatCertificatesPanel extends SimplePanel implements BusyDisplay {
this.regattaName = regattaName;
this.boatTable = new BoatCertificatesPanel(sailingService, userService, stringMessages, errorReporter);
this.refreshableCompetitorSelectionModel = (RefreshableMultiSelectionModel<CompetitorDTO>) boatTable.getSelectionModel();
this.refreshableCompetitorSelectionModel = null; //(RefreshableMultiSelectionModel<CompetitorDTO>) boatTable.getSelectionModel();
busyIndicator = new SimpleBusyIndicator(false, 0.8f);
VerticalPanel mainPanel = new VerticalPanel();
mainPanel.setWidth("100%");
@@ -57,7 +57,7 @@ public class BoatCertificatesPanel extends SimplePanel implements BusyDisplay {
refreshButton.ensureDebugId("RefreshButton");
final Button allowReloadButton = buttonPanel.addUnsecuredAction(stringMessages.allowReload(),
() -> boatTable.allowUpdate(refreshableCompetitorSelectionModel.getSelectedSet()));
null);//() -> boatTable.allowUpdate(refreshableCompetitorSelectionModel.getSelectedSet()));
refreshableCompetitorSelectionModel.addSelectionChangeHandler(
event -> allowReloadButton.setEnabled(!refreshableCompetitorSelectionModel.getSelectedSet().isEmpty()));
allowReloadButton.setEnabled(!refreshableCompetitorSelectionModel.getSelectedSet().isEmpty());
@@ -66,11 +66,11 @@ public class BoatCertificatesPanel extends SimplePanel implements BusyDisplay {
final Button addCompetitorButton = buttonPanel.addCreateAction(stringMessages.add(), null);
addCompetitorButton.ensureDebugId("AddCompetitorButton");
buttonPanel.addUnsecuredAction(stringMessages.selectAll(), () -> {
buttonPanel.addUnsecuredAction(stringMessages.selectAll(), /*() -> {
for (CompetitorDTO c : boatTable.getDataProvider().getList()) {
refreshableCompetitorSelectionModel.setSelected(c, true);
}
});
}
}*/ null );
// BUTTON - Import Competitors
buttonPanel.addCreateAction(stringMessages.importCompetitors(), () -> {
@@ -149,6 +149,10 @@ public class BoatCertificatesTableWrapper<S extends RefreshableSelectionModel<Bo
}
});
filterField = null;
/*
filterField = new LabeledAbstractFilterablePanel<BoatDTO>(new Label(getStringMessages().filterCompetitors()),
new ArrayList<BoatDTO>(), dataProvider, stringMessages) {
@Override
@@ -215,9 +219,11 @@ public class BoatCertificatesTableWrapper<S extends RefreshableSelectionModel<Bo
refreshCompetitorList(leaderboardName, null);
}
*/
/**
* @param leaderboardName If null, all existing competitors are loaded
*/
/*
public void refreshCompetitorList(String leaderboardName, final Callback<Iterable<BoatDTO>,
Throwable> callback) {
final AsyncCallback<Iterable<BoatDTO>> myCallback = new AsyncCallback<Iterable<BoatDTO>>() {
@@ -354,9 +360,13 @@ public class BoatCertificatesTableWrapper<S extends RefreshableSelectionModel<Bo
allowUpdate(Collections.singleton(competitor));
}
*/
/**
* This method makes rows grayed out with a tool tip
*/
/*
public void grayOutCompetitors(final List<CompetitorWithToolTipDTO> competitors) {
table.addCellPreviewHandler((CellPreviewEvent<BoatDTO> event) -> {
for (CompetitorWithToolTipDTO competitor : competitors) {
@@ -374,4 +384,5 @@ public class BoatCertificatesTableWrapper<S extends RefreshableSelectionModel<Bo
return "";
});
}
}
*/
} }