This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit f6d2cc89aa9c5c53ccdb0d2a031288e1ecb9175f Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 17 13:01:39 2016 +0100 Amélioration de l'opération d'export --- .../application/swing/ui/admin/export/ExportModel.java | 6 ++++++ .../swing/ui/admin/export/ExportUIHandler.java | 17 +++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportModel.java index 044a196..c17a25b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportModel.java @@ -28,6 +28,7 @@ import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferen import fr.ird.observe.application.swing.ui.admin.AdminActionModel; import fr.ird.observe.application.swing.ui.admin.AdminStep; import fr.ird.observe.application.swing.ui.admin.AdminUIModel; +import fr.ird.observe.application.swing.ui.util.ProgressModel; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.seine.TripSeineDto; @@ -61,6 +62,7 @@ public class ExportModel extends AdminActionModel { protected ObserveSwingDataSource centralSource; protected boolean insertMissingReferentials; + private final ProgressModel progressModel = new ProgressModel(); public ExportModel() { super(AdminStep.EXPORT_DATA); @@ -139,4 +141,8 @@ public class ExportModel extends AdminActionModel { public boolean validate(AdminUIModel uiModel) { return uiModel.validate(AdminStep.SELECT_DATA) && uiModel.getStepState(step) == WizardState.SUCCESSED; } + + public ProgressModel getProgressModel() { + return progressModel; + } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java index f871165..94564b7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java @@ -35,6 +35,7 @@ import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler; import fr.ird.observe.application.swing.ui.admin.config.ConfigUI; import fr.ird.observe.application.swing.ui.tree.selection.SelectionTreeModel; import fr.ird.observe.application.swing.ui.usage.UsagesUI; +import fr.ird.observe.application.swing.ui.util.ProgressModel; import fr.ird.observe.services.dto.AbstractReference; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.IdDto; @@ -145,6 +146,8 @@ public class ExportUIHandler extends AdminTabUIHandler<ExportUI> implements UIHa } } }); + + model.getExportModel().getProgressModel().installUI(ui.getProgressBar()); } public void updateState(ExportUI tabUI, WizardState newState) { @@ -239,10 +242,20 @@ public class ExportUIHandler extends AdminTabUIHandler<ExportUI> implements UIHa DecoratorService decoratorService = getDecoratorService(); ReferentialReferenceDecorator<ProgramDto> programDecorator = decoratorService.getReferentialReferenceDecorator(ProgramDto.class); + int stepCount = 2 + 2 * tripEntries.size(); + if (insertMissingReferentials) { + stepCount++; + } + + ProgressModel progressModel = stepModel.getProgressModel(); + progressModel.setStepsCount(stepCount); + + progressModel.incrementsCurrentStep(); try (ObserveSwingDataSource localDataSource = openSource(stepModel.getSource())) { TripManagementService localTripManagementService = localDataSource.newTripManagementService(); + progressModel.incrementsCurrentStep(); try (ObserveSwingDataSource centralDataSource = openSource(stepModel.getCentralSource())) { TripManagementService centralTripManagementService = centralDataSource.newTripManagementService(); @@ -311,12 +324,15 @@ public class ExportUIHandler extends AdminTabUIHandler<ExportUI> implements UIHa sendMessage(t("observe.actions.exportData.message.add.missing.referential", decorator.toString(reference))); } } + + progressModel.incrementsCurrentStep(); centraltReferentialService.insertMissingReferentials(result.getSqlCode()); } for (TripEntry tripEntry : tripEntries) { + progressModel.incrementsCurrentStep(); ExportTripRequest exportTripRequest = new ExportTripRequest(false, tripEntry.getProgramId(), tripEntry.getTripId()); ExportTripResult exportTripResult = localTripManagementService.exportTrip(exportTripRequest); logExportResult(n("observe.actions.exportData.message.result.export.trip"), @@ -325,6 +341,7 @@ public class ExportUIHandler extends AdminTabUIHandler<ExportUI> implements UIHa tripEntry.getProgram(), tripEntry.getTrip()); + progressModel.incrementsCurrentStep(); ImportTripRequest importTripRequest = new ImportTripRequest(exportTripResult); ImportTripResult importTripResult = centralTripManagementService.importTrip(importTripRequest); logImportResult(n("observe.actions.exportData.message.result.import.trip"), -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.