bug4029 Implemented progress for sensor fixed during master data import

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) {

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();
 
 }

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

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

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<DeviceIdentifier, Set<Timed>> raceLogTrackingFixes = masterData.getRaceLogTrackingFixes();
         if (raceLogTrackingFixes != null) {
             SensorFixStore store = toState.getSensorFixStore();
+            int i = 0;
+            final int numberOfDevices = raceLogTrackingFixes.size();
             for (Entry<DeviceIdentifier, Set<Timed>> entry : raceLogTrackingFixes.entrySet()) {
                 DeviceIdentifier device = entry.getKey();
                 final Collection<Timed> 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));
             }
         }
     }