From 3da2d21a9b61a00ceefe112d84e275d774a0e897 Mon Sep 17 00:00:00 2001 From: Benjamin Barth Date: Tue, 19 Dec 2017 17:55:23 +0100 Subject: [PATCH] bug4371 Show error messages which occur on expedition all-in-one import --- .../sailing/gwt/ui/adminconsole/WindPanel.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/WindPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/WindPanel.java index f35fe0383dc..a6bdcf23704 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/WindPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/WindPanel.java @@ -58,6 +58,7 @@ import com.sap.sailing.domain.common.impl.WindSourceImpl; import com.sap.sailing.gwt.common.client.suggestion.BoatClassMasterdataSuggestOracle; import com.sap.sailing.gwt.ui.adminconsole.WindImportResult.RaceEntry; import com.sap.sailing.gwt.ui.adminconsole.resulthandling.ExpeditionDataImportResponse; +import com.sap.sailing.gwt.ui.adminconsole.resulthandling.ExpeditionDataImportResultsDialog; import com.sap.sailing.gwt.ui.client.RegattaRefresher; import com.sap.sailing.gwt.ui.client.RegattasDisplayer; import com.sap.sailing.gwt.ui.client.SailingServiceAsync; @@ -459,13 +460,15 @@ public class WindPanel extends FormPanel implements RegattasDisplayer, WindShowe formPanel.addSubmitCompleteHandler(event -> { uploadButton.setEnabled(true); final ExpeditionDataImportResponse response = ExpeditionDataImportResponse.parse(event.getResults()); - Window.alert(response.getEventId() + "-" + response.getLeaderboardName() + "-" + response.getRegattaName() - + "-" + response.getRaceName()); - new ExpeditionAllInOneAfterImportHandler(response.getEventId(), response.getRegattaName(), - response.getLeaderboardGroupName(), response.getLeaderboardName(), response.getRaceName(), - response.getRaceColumnName(), response.getFleetName(), response.getGpsDeviceIds(), - response.getSensorDeviceIds(), response.getSensorFixImporterType(), sailingService, errorReporter, - stringMessages); + if (response.hasEventId()) { + new ExpeditionAllInOneAfterImportHandler(response.getEventId(), response.getRegattaName(), + response.getLeaderboardGroupName(), response.getLeaderboardName(), response.getRaceName(), + response.getRaceColumnName(), response.getFleetName(), response.getGpsDeviceIds(), + response.getSensorDeviceIds(), response.getSensorFixImporterType(), sailingService, + errorReporter, stringMessages); + } else { + ExpeditionDataImportResultsDialog.showResults(response); + } }); rootPanel.add(formPanel); final VerticalPanel contentPanel = new VerticalPanel();