From 94c7e9a3263ecda359758085e15e70f5719ba648 Mon Sep 17 00:00:00 2001 From: Steffen Schaefer Date: Thu, 19 Jan 2017 08:37:52 +0100 Subject: [PATCH] bug4029 Implemented progress for sensor fixed during master data import --- .../sap/sailing/domain/common/DataImportSubProgress.java | 6 ++++++ .../sailing/domain/common/i18n/CommonStringMessages.java | 1 + .../sap/sailing/gwt/ui/client/StringMessages.properties | 1 + .../sailing/gwt/ui/client/StringMessages_de.properties | 1 + .../ImportMasterDataOperation.java | 9 ++++++++- 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/DataImportSubProgress.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/DataImportSubProgress.java index 444b97bc7de..7d8801dbdec 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/DataImportSubProgress.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/DataImportSubProgress.java @@ -58,6 +58,12 @@ public enum DataImportSubProgress { return messages.importWindTracks(); } }, + IMPORT_SENSOR_FIXES { + @Override + public String getMessage(CommonStringMessages messages) { + return messages.importSensorFixes(); + } + }, UPDATE_EVENT_LEADERBOARD_GROUP_LINKS { @Override public String getMessage(CommonStringMessages messages) { diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/i18n/CommonStringMessages.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/i18n/CommonStringMessages.java index 932e8e12ae1..4ce29972f79 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/i18n/CommonStringMessages.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/i18n/CommonStringMessages.java @@ -12,6 +12,7 @@ public interface CommonStringMessages { String importWait(); String importLeaderboardGroups(); String importWindTracks(); + String importSensorFixes(); String updateEventLeaderboardGroupLinks(); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties index a2d8b3d743d..f999351676d 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties @@ -1561,6 +1561,7 @@ importInit=Initializing Import importWait=Waiting for other data import operations to finish importLeaderboardGroups=Importing leaderboard groups importWindTracks=Importing wind tracks +importSensorFixes=Importing sensor fixes updateEventLeaderboardGroupLinks=Updating Event-LeaderboardGroup links strategySimulatorTitle=Strategy Simulator controlSettings=Control settings diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties index f129d29bf8e..306298386de 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties @@ -1547,6 +1547,7 @@ importInit=Import wird initialisiert importWait=Warten, bis andere Datenimport-Vorgänge angeschlossen sind importLeaderboardGroups=Ranglisten-Gruppen werden importiert importWindTracks=Windmessungen werden importiert +importSensorFixes=Sensor-Fixes werden importiert updateEventLeaderboardGroupLinks=Verbindungen zwischen Veranstaltungen und Ranglisten-Gruppen werden aktualisiert strategySimulatorTitle=Strategie-Simulator controlSettings=Einstellungen diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/ImportMasterDataOperation.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/ImportMasterDataOperation.java index 6a52cdd1380..4398499236e 100755 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/ImportMasterDataOperation.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/ImportMasterDataOperation.java @@ -125,6 +125,9 @@ public class ImportMasterDataOperation extends progress.setOverAllProgressPct(0.5); progress.setCurrentSubProgressPct(0); createWindTracks(toState); + progress.setCurrentSubProgress(DataImportSubProgress.IMPORT_SENSOR_FIXES); + progress.setOverAllProgressPct(0.8); + progress.setCurrentSubProgressPct(0); importRaceLogTrackingGPSFixes(toState); if (masterData.getDeviceConfigurations() != null) { importDeviceConfigurations(toState); @@ -396,7 +399,7 @@ public class ImportMasterDataOperation extends } i++; progress.setCurrentSubProgressPct((double) i / numOfWindTracks); - progress.setOverAllProgressPct(0.5 + (0.5) * ((double) i / numOfWindTracks)); + progress.setOverAllProgressPct(0.5 + (0.3) * ((double) i / numOfWindTracks)); } } @@ -406,6 +409,8 @@ public class ImportMasterDataOperation extends Map> raceLogTrackingFixes = masterData.getRaceLogTrackingFixes(); if (raceLogTrackingFixes != null) { SensorFixStore store = toState.getSensorFixStore(); + int i = 0; + final int numberOfDevices = raceLogTrackingFixes.size(); for (Entry> entry : raceLogTrackingFixes.entrySet()) { DeviceIdentifier device = entry.getKey(); final Collection fixesToAddAsBatch = new ArrayList<>(BATCH_SIZE_FOR_IMPORTING_FIXES); @@ -426,6 +431,8 @@ public class ImportMasterDataOperation extends if (!fixesToAddAsBatch.isEmpty()) { storeFixes(store, device, fixesToAddAsBatch); } + i++; + progress.setCurrentSubProgressPct(0.8 + (0.2) * ((double) i / numberOfDevices)); } } }