This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 148837e7b87a045a9be17dec2e747f95e60f5f93 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 30 15:58:27 2015 +0200 impact Export API in Report service --- .../tutti/service/report/ReportGenerationRequest.java | 13 +++++++++++++ .../tutti/service/report/ReportGenerationService.java | 5 +++-- .../tutti/ui/swing/content/report/ReportUIHandler.java | 4 ++++ .../tutti/ui/swing/content/report/ReportUIModel.java | 10 ++++++++++ 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationRequest.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationRequest.java index f9e42ea..23ba176 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationRequest.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationRequest.java @@ -43,6 +43,11 @@ public class ReportGenerationRequest implements Serializable { protected File report; /** + * Selected program id. + */ + protected String programId; + + /** * Selected cruise id (of fishing operation). */ protected String cruiseId; @@ -60,6 +65,14 @@ public class ReportGenerationRequest implements Serializable { this.report = report; } + public String getProgramId() { + return programId; + } + + public void setProgramId(String programId) { + this.programId = programId; + } + public String getCruiseId() { return cruiseId; } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationService.java index 4698ff8..d435bd2 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationService.java @@ -80,6 +80,7 @@ public class ReportGenerationService extends AbstractTuttiService { Preconditions.checkNotNull(request); Preconditions.checkNotNull(request.getReport()); Preconditions.checkState(request.getReport().exists()); + Preconditions.checkNotNull(request.getProgramId()); Preconditions.checkNotNull(request.getCruiseId()); Preconditions.checkNotNull(request.getFishingOperationId()); @@ -91,7 +92,7 @@ public class ReportGenerationService extends AbstractTuttiService { // export fishing operation progressionModel.increments(t("tutti.report.step.export.fishingOperation")); GenericFormatExportService service = getService(GenericFormatExportService.class); - GenericFormatExportConfiguration exportConfiguration = service.createExportConfigurationForFishingOperation(request.getCruiseId(), request.getFishingOperationId(), null); + GenericFormatExportConfiguration exportConfiguration = service.createExportConfigurationForFishingOperation(request.getProgramId(), request.getCruiseId(), request.getFishingOperationId(), null); GenericFormatExportResult exportResult = service.export(exportConfiguration, progressionModel); @@ -206,7 +207,7 @@ public class ReportGenerationService extends AbstractTuttiService { int result = 4; GenericFormatExportService service = getService(GenericFormatExportService.class); - GenericFormatExportConfiguration exportConfiguration = service.createExportConfigurationForFishingOperation(request.getCruiseId(), request.getFishingOperationId(), null); + GenericFormatExportConfiguration exportConfiguration = service.createExportConfigurationForFishingOperation(request.getProgramId(), request.getCruiseId(), request.getFishingOperationId(), null); result += service.getExportNbSteps(exportConfiguration); return result; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java index 67e49a0..344e76e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java @@ -59,6 +59,10 @@ public class ReportUIHandler extends AbstractTuttiUIHandler<ReportUIModel, Repor ReportUIModel model = new ReportUIModel(); + // set programId + String programId = getDataContext().getProgramId(); + model.setProgramId(programId); + // set cruiseId String cruiseId = getDataContext().getCruiseId(); model.setCruiseId(cruiseId); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel.java index 22ea0f8..7b29788 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel.java @@ -63,6 +63,8 @@ public class ReportUIModel extends AbstractTuttiBeanUIModel<ReportGenerationRequ /** Report to use. */ protected File report; + protected String programId; + protected String cruiseId; protected FishingOperation fishingOperation; @@ -99,6 +101,14 @@ public class ReportUIModel extends AbstractTuttiBeanUIModel<ReportGenerationRequ firePropertyChange(PROPERTY_REPORT, oldValue, report); } + public String getProgramId() { + return programId; + } + + public void setProgramId(String programId) { + this.programId = programId; + } + public String getCruiseId() { return cruiseId; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.