This is an automated email from the git hooks/post-receive script. New commit to branch feature/8153 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 343806dce92bb52ff785c0e70b03f8f7f00f02a7 Author: Kevin Morin <morin@codelutin.com> Date: Wed Mar 30 17:09:14 2016 +0200 ajout du code de prélèvement et du mode de recopie pour l'import export (refs #8153) --- .../catches/multipost/MultiPostExportContext.java | 4 +-- .../multipost/csv/IndividualObservationRow.java | 42 +++++++++++----------- .../csv/IndividualObservationRowModel.java | 5 +++ 3 files changed, 28 insertions(+), 23 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportContext.java index caadec3..a0ca5ff 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportContext.java @@ -241,9 +241,9 @@ public class MultiPostExportContext implements MultiPostConstants, Closeable { row.setWeight(batch.getWeight()); row.setSize(batch.getSize()); row.setLengthStepCaracteristic(batch.getLengthStepCaracteristic()); -// row.setSamplingCode(batch.getSamplingCode()); -// row.setCalcifiedPieceSamplingCode(batch.getCalcifiedPieceSamplingCode()); + row.setSamplingCode(batch.getSamplingCode()); row.setComment(batch.getComment()); + row.setCopyIndividualObservationMode(batch.getCopyIndividualObservationMode()); individualObservationRows.add(row); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/csv/IndividualObservationRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/csv/IndividualObservationRow.java index 82adf9e..43a7d16 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/csv/IndividualObservationRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/csv/IndividualObservationRow.java @@ -22,6 +22,7 @@ package fr.ifremer.tutti.service.catches.multipost.csv; * #L% */ +import fr.ifremer.tutti.persistence.entities.data.CopyIndividualObservationMode; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Species; @@ -40,10 +41,9 @@ public class IndividualObservationRow implements Serializable { public static final String SIZE = "size"; public static final String LENGTH_STEP_CARACTERISTIC = "lengthStepCaracteristic"; public static final String COMMENT = "comment"; - -// public static final String SAMPLING_CODE = "samplingCode"; + public static final String SAMPLING_CODE = "samplingCode"; + public static final String COPY_INDIVIDUAL_OBSERVATION_MODE = "copyIndividualObservationMode"; // -// public static final String CALCIFIED_PIECE_SAMPLING_CODE = "calcifiedPieceSamplingCode"; private static final long serialVersionUID = 1L; protected String batchId; protected String speciesBatchId; @@ -56,12 +56,12 @@ public class IndividualObservationRow implements Serializable { protected Caracteristic lengthStepCaracteristic; -// protected String samplingCode; -// -// protected String calcifiedPieceSamplingCode; + protected String samplingCode; protected String comment; + protected CopyIndividualObservationMode copyIndividualObservationMode; + public String getBatchId() { return batchId; } @@ -110,21 +110,13 @@ public class IndividualObservationRow implements Serializable { this.lengthStepCaracteristic = lengthStepCaracteristic; } -// public String getSamplingCode() { -// return samplingCode; -// } -// -// public void setSamplingCode(String samplingCode) { -// this.samplingCode = samplingCode; -// } -// -// public String getCalcifiedPieceSamplingCode() { -// return calcifiedPieceSamplingCode; -// } -// -// public void setCalcifiedPieceSamplingCode(String calcifiedPieceSamplingCode) { -// this.calcifiedPieceSamplingCode = calcifiedPieceSamplingCode; -// } + public String getSamplingCode() { + return samplingCode; + } + + public void setSamplingCode(String samplingCode) { + this.samplingCode = samplingCode; + } public String getComment() { return comment; @@ -133,4 +125,12 @@ public class IndividualObservationRow implements Serializable { public void setComment(String comment) { this.comment = comment; } + + public CopyIndividualObservationMode getCopyIndividualObservationMode() { + return copyIndividualObservationMode; + } + + public void setCopyIndividualObservationMode(CopyIndividualObservationMode copyIndividualObservationMode) { + this.copyIndividualObservationMode = copyIndividualObservationMode; + } } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/csv/IndividualObservationRowModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/csv/IndividualObservationRowModel.java index d188147..e5711bc 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/csv/IndividualObservationRowModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/csv/IndividualObservationRowModel.java @@ -22,6 +22,7 @@ package fr.ifremer.tutti.service.catches.multipost.csv; * #L% */ +import fr.ifremer.tutti.persistence.entities.data.CopyIndividualObservationMode; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.catches.multipost.MultiPostConstants; @@ -56,6 +57,10 @@ public class IndividualObservationRowModel extends AbstractTuttiImportExportMode newColumnForImportExport(IndividualObservationRow.COMMENT); + newColumnForImportExport(IndividualObservationRow.SAMPLING_CODE); + + newColumnForImportExport(IndividualObservationRow.COPY_INDIVIDUAL_OBSERVATION_MODE, TuttiCsvUtil.newEnumByNameParserFormatter(CopyIndividualObservationMode.class)); + } public static IndividualObservationRowModel forExport() { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.