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 241feac89b37de70214c483a02ffc6b938d78df5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 27 13:46:40 2016 +0200 Bien export la code de prélèvement aussi (See #8252) --- .../tutti/service/genericformat/GenericFormatExportContext.java | 6 +++++- .../genericformat/GenericFormatExportOperationContext.java | 9 ++++++++- .../producer/CsvProducerForIndividualObservation.java | 6 ++++++ 3 files changed, 19 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 c13c648..32c8330 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 @@ -98,6 +98,8 @@ public class GenericFormatExportContext implements Closeable, Iterable<GenericFo private final Caracteristic copyIndividualObservationModeCaracteristic; + private final Caracteristic sampleCodeCaracteristic ; + private final Caracteristic weightMeasuredCaracteristic; private final Caracteristic pmfmIdCaracteristic; @@ -157,6 +159,7 @@ public class GenericFormatExportContext implements Closeable, Iterable<GenericFo this.deadOrAliveCaracteristic = persistenceService.getDeadOrAliveCaracteristic(); this.genderCaracteristic = persistenceService.getSexCaracteristic(); this.copyIndividualObservationModeCaracteristic = persistenceService.getCopyIndividualObservationModeCaracteristic(); + this.sampleCodeCaracteristic = persistenceService.getSampleCodeCaracteristic(); this.cruiseContexts = new LinkedHashSet<>(); List<Species> allReferentSpecies = persistenceService.getAllReferentSpecies(); @@ -327,7 +330,8 @@ public class GenericFormatExportContext implements Closeable, Iterable<GenericFo pmfmIdCaracteristic, deadOrAliveCaracteristic, genderCaracteristic, - copyIndividualObservationModeCaracteristic); + copyIndividualObservationModeCaracteristic, + sampleCodeCaracteristic); } 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 b00c996..4ccd225 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 @@ -90,6 +90,7 @@ public class GenericFormatExportOperationContext { protected final Caracteristic genderCaracteristic; private final Caracteristic copyIndividualObservationModeCaracteristic; + private final Caracteristic sampleCodeCaracteristic; private final SampleCategoryModel sampleCategoryModel; @@ -119,7 +120,8 @@ public class GenericFormatExportOperationContext { Caracteristic pmfmIdCaracteristic, Caracteristic deadOrAliveCaracteristic, Caracteristic genderCaracteristic, - Caracteristic copyIndividualObservationModeCaracteristic) { + Caracteristic copyIndividualObservationModeCaracteristic, + Caracteristic sampleCodeCaracteristic) { this.cruise = cruise; this.operation = operation; this.operationLabel = operationLabel; @@ -130,6 +132,7 @@ public class GenericFormatExportOperationContext { this.deadOrAliveCaracteristic = deadOrAliveCaracteristic; this.genderCaracteristic = genderCaracteristic; this.copyIndividualObservationModeCaracteristic = copyIndividualObservationModeCaracteristic; + this.sampleCodeCaracteristic = sampleCodeCaracteristic; this.attachmentRows = new ArrayList<>(); Integer operationId = operation.getIdAsInt(); @@ -255,6 +258,10 @@ public class GenericFormatExportOperationContext { return copyIndividualObservationModeCaracteristic; } + public Caracteristic getSampleCodeCaracteristic() { + return sampleCodeCaracteristic; + } + 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 ccc0fe8..949ef25 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 @@ -80,6 +80,12 @@ public class CsvProducerForIndividualObservation extends CsvProducer<IndividualO operationExportContext.getWeightMeasuredCaracteristic(), child.getWeight()); + addCaracteristicRow(operationExportContext, + rows, + child, + operationExportContext.getSampleCodeCaracteristic(), + child.getSamplingCode()); + Caracteristic copyIndividualObservationModeCaracteristic = operationExportContext.getCopyIndividualObservationModeCaracteristic(); CopyIndividualObservationMode copyIndividualObservationMode = child.getCopyIndividualObservationMode(); Objects.requireNonNull(copyIndividualObservationMode, "Mode de recopie null sur l'observation individuelle " + child.getId()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.