This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 5d02bbe712d3a3571a85083a5bda07a575bbe664 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 26 16:18:50 2016 +0200 Exporter le mode de recopie des observations indidividuelles (See #8252) --- .../service/genericformat/GenericFormatExportContext.java | 6 +++++- .../genericformat/GenericFormatExportOperationContext.java | 9 ++++++++- .../producer/CsvProducerForIndividualObservation.java | 11 +++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportContext.java index 5d87c67..c13c648 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportContext.java @@ -96,6 +96,8 @@ public class GenericFormatExportContext implements Closeable, Iterable<GenericFo private final Caracteristic genderCaracteristic; + private final Caracteristic copyIndividualObservationModeCaracteristic; + private final Caracteristic weightMeasuredCaracteristic; private final Caracteristic pmfmIdCaracteristic; @@ -154,6 +156,7 @@ public class GenericFormatExportContext implements Closeable, Iterable<GenericFo this.pmfmIdCaracteristic = persistenceService.getPmfmIdCaracteristic(); this.deadOrAliveCaracteristic = persistenceService.getDeadOrAliveCaracteristic(); this.genderCaracteristic = persistenceService.getSexCaracteristic(); + this.copyIndividualObservationModeCaracteristic = persistenceService.getCopyIndividualObservationModeCaracteristic(); this.cruiseContexts = new LinkedHashSet<>(); List<Species> allReferentSpecies = persistenceService.getAllReferentSpecies(); @@ -323,7 +326,8 @@ public class GenericFormatExportContext implements Closeable, Iterable<GenericFo weightMeasuredCaracteristic, pmfmIdCaracteristic, deadOrAliveCaracteristic, - genderCaracteristic); + genderCaracteristic, + copyIndividualObservationModeCaracteristic); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportOperationContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportOperationContext.java index e694318..b00c996 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportOperationContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportOperationContext.java @@ -89,6 +89,7 @@ public class GenericFormatExportOperationContext { protected final Caracteristic deadOrAliveCaracteristic; protected final Caracteristic genderCaracteristic; + private final Caracteristic copyIndividualObservationModeCaracteristic; private final SampleCategoryModel sampleCategoryModel; @@ -117,7 +118,8 @@ public class GenericFormatExportOperationContext { Caracteristic weightMeasuredCaracteristic, Caracteristic pmfmIdCaracteristic, Caracteristic deadOrAliveCaracteristic, - Caracteristic genderCaracteristic) { + Caracteristic genderCaracteristic, + Caracteristic copyIndividualObservationModeCaracteristic) { this.cruise = cruise; this.operation = operation; this.operationLabel = operationLabel; @@ -127,6 +129,7 @@ public class GenericFormatExportOperationContext { this.pmfmIdCaracteristic = pmfmIdCaracteristic; this.deadOrAliveCaracteristic = deadOrAliveCaracteristic; this.genderCaracteristic = genderCaracteristic; + this.copyIndividualObservationModeCaracteristic = copyIndividualObservationModeCaracteristic; this.attachmentRows = new ArrayList<>(); Integer operationId = operation.getIdAsInt(); @@ -248,6 +251,10 @@ public class GenericFormatExportOperationContext { return genderCaracteristic; } + public Caracteristic getCopyIndividualObservationModeCaracteristic() { + return copyIndividualObservationModeCaracteristic; + } + public List<AccidentalBatch> getAccidentalBatches() { return accidentalBatches; } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForIndividualObservation.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForIndividualObservation.java index bff1089..ddf3cf7 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForIndividualObservation.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForIndividualObservation.java @@ -25,6 +25,7 @@ package fr.ifremer.tutti.service.genericformat.producer; */ import fr.ifremer.tutti.persistence.entities.CaracteristicMap; +import fr.ifremer.tutti.persistence.entities.data.CopyIndividualObservationMode; import fr.ifremer.tutti.persistence.entities.data.IndividualObservationBatch; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.service.csv.CsvProducer; @@ -39,6 +40,7 @@ import java.nio.file.Path; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Objects; /** * Created on 2/6/15. @@ -78,6 +80,15 @@ public class CsvProducerForIndividualObservation extends CsvProducer<IndividualO operationExportContext.getWeightMeasuredCaracteristic(), child.getWeight()); + Caracteristic copyIndividualObservationModeCaracteristic = operationExportContext.getCopyIndividualObservationModeCaracteristic(); + CopyIndividualObservationMode copyIndividualObservationMode = child.getCopyIndividualObservationMode(); + Objects.requireNonNull(copyIndividualObservationMode, "Mode de recopie null sur l'observation individuelle " + child.getId()); + addCaracteristicRow(operationExportContext, + rows, + child, + copyIndividualObservationModeCaracteristic, + copyIndividualObservationMode.getQualitativeValue(copyIndividualObservationModeCaracteristic)); + if (child.getLengthStepCaracteristic() != null) { addCaracteristicRow(operationExportContext, rows, -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.