bug5231: Added progress bar for tracked races import

This commit is contained in:
Alessandro Stoltenberg
2020-03-24 12:48:55 +01:00
parent 559c75345e
commit a087d1665f
9 changed files with 47 additions and 9 deletions
@@ -64,6 +64,12 @@ public enum DataImportSubProgress {
return messages.importSensorFixes();
}
},
IMPORT_TRACKED_RACES {
@Override
public String getMessage(CommonStringMessages messages) {
return messages.importTrackedRaces();
}
},
UPDATE_EVENT_LEADERBOARD_GROUP_LINKS {
@Override
public String getMessage(CommonStringMessages messages) {
@@ -12,9 +12,11 @@ public interface MasterDataImportObjectCreationCount extends Serializable {
int getRegattaCount();
int getMediaTrackCount();
int getMediaTrackCount();
Set<String> getOverwrittenRegattaNames();
void addOneMediaTrack();
void addOneMediaTrack();
int getTrackedRacesCount();
}
@@ -17,5 +17,6 @@ public interface CommonStringMessages {
String competitorRegistrationTypeClosed();
String competitorRegistrationTypeOpenModerated();
String competitorRegistrationTypeOpenUnmoderated();
String importTrackedRaces();
}
@@ -23,11 +23,13 @@ public class MasterDataImportObjectCreationCountImpl implements MasterDataImport
private int eventCount = 0;
private int regattaCount = 0;
private int mediaTrackCount = 0;
private int trackedRacesCount = 0;
private Set<String> createdLeaderboards = new HashSet<String>();
private Set<String> createdLeaderboardGroups = new HashSet<String>();
private Set<String> createdEvents = new HashSet<String>();
private Set<String> createdRegattas = new HashSet<String>();
private Set<String> createdTrackedRaces = new HashSet<String>();
private Set<String> overwrittenRegattas = new HashSet<String>();
@@ -54,6 +56,11 @@ public class MasterDataImportObjectCreationCountImpl implements MasterDataImport
regattaCount++;
}
public void addOneTrackedRace(String id) {
createdTrackedRaces.add(id);
trackedRacesCount++;
}
@Override
public void addOneMediaTrack() {
mediaTrackCount++;
@@ -64,10 +71,12 @@ public class MasterDataImportObjectCreationCountImpl implements MasterDataImport
leaderboardGroupCount = leaderboardGroupCount + toAdd.leaderboardGroupCount;
eventCount = eventCount + toAdd.eventCount;
regattaCount = regattaCount + toAdd.regattaCount;
trackedRacesCount = trackedRacesCount + toAdd.trackedRacesCount;
createdEvents.addAll(toAdd.createdEvents);
createdLeaderboardGroups.addAll(toAdd.createdLeaderboardGroups);
createdLeaderboards.addAll(toAdd.createdLeaderboards);
createdRegattas.addAll(toAdd.createdRegattas);
createdTrackedRaces.addAll(toAdd.createdTrackedRaces);
}
public boolean alreadyAddedLeaderboardWithName(String name) {
@@ -85,6 +94,10 @@ public class MasterDataImportObjectCreationCountImpl implements MasterDataImport
public boolean alreadyAddedRegattaWithId(String id) {
return createdRegattas.contains(id);
}
public boolean alreadyAddedTrackedRaceWithId(String id) {
return createdTrackedRaces.contains(id);
}
@Override
public int getLeaderboardCount() {
@@ -110,6 +123,11 @@ public class MasterDataImportObjectCreationCountImpl implements MasterDataImport
public int getMediaTrackCount() {
return mediaTrackCount;
}
@Override
public int getTrackedRacesCount() {
return trackedRacesCount;
}
@Override
public Set<String> getOverwrittenRegattaNames() {