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 42a1150b4526d00dd619806a4c1630019fb99fac Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 13 15:58:35 2015 +0200 refs #6942 import-export du drapeau espèce à confirmer --- .../genericformat/consumer/CsvConsumerForCatch.java | 2 ++ .../tutti/service/genericformat/csv/CatchModel.java | 2 ++ .../tutti/service/genericformat/csv/CatchRow.java | 18 +++++++++++++----- .../genericformat/producer/CsvProducerForCatch.java | 2 ++ 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForCatch.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForCatch.java index 4e848c7..d7a8ced 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForCatch.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForCatch.java @@ -150,6 +150,7 @@ public class CsvConsumerForCatch extends CsvComsumer<CatchRow, CatchModel> { batch = SpeciesBatchs.newSpeciesBatch(); batch.setId(getNextBatchId()); batch.setSpecies(species); + batch.setSpeciesToConfirm(bean.isSpeciesToConfirm()); batch.setFishingOperation(operationContext.getFishingOperation()); if (log.isInfoEnabled()) { @@ -198,6 +199,7 @@ public class CsvConsumerForCatch extends CsvComsumer<CatchRow, CatchModel> { batch = BenthosBatchs.newBenthosBatch(); batch.setId(getNextBatchId()); batch.setSpecies(species); + batch.setSpeciesToConfirm(bean.isSpeciesToConfirm()); batch.setFishingOperation(operationContext.getFishingOperation()); if (log.isInfoEnabled()) { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchModel.java index f33af11..28d81cc 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchModel.java @@ -90,6 +90,7 @@ public class CatchModel extends AbstractTuttiImportExportModel<CatchRow> { newColumnForExport("Code_Espece_Campagne", SpeciesBatch.PROPERTY_SPECIES, TuttiCsvUtil.SPECIES_SURVEY_CODE_FORMATTER); newColumnForExport("Nom_Scientifique", SpeciesBatch.PROPERTY_SPECIES, TuttiCsvUtil.SPECIES_FORMATTER); newColumnForExport("Benthos", CatchRow.PROPERTY_BENTHOS, TuttiCsvUtil.BOOLEAN); + newColumnForExport("Espece_A_Confirmer", CatchRow.PROPERTY_SPECIES_TO_CONFIRM, TuttiCsvUtil.BOOLEAN); for (SampleCategoryModelEntry entry : sampleCategoryModel.getCategory()) { @@ -150,6 +151,7 @@ public class CatchModel extends AbstractTuttiImportExportModel<CatchRow> { newIgnoredColumn("Code_Espece_Campagne"); newIgnoredColumn("Nom_Scientifique"); newMandatoryColumn("Benthos", CatchRow.PROPERTY_BENTHOS, TuttiCsvUtil.BOOLEAN); + newMandatoryColumn("Espece_A_Confirmer", CatchRow.PROPERTY_SPECIES_TO_CONFIRM, TuttiCsvUtil.BOOLEAN); for (SampleCategoryModelEntry entry : sampleCategoryModel.getCategory()) { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchRow.java index b9d54b1..ea7abbc 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchRow.java @@ -27,8 +27,6 @@ import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; import fr.ifremer.tutti.persistence.entities.data.SpeciesAbleBatchFrequency; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Species; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import java.util.ArrayList; import java.util.List; @@ -43,11 +41,10 @@ public class CatchRow extends RowWithOperationContextSupport { private static final long serialVersionUID = 1L; - /** Logger. */ - private static final Log log = LogFactory.getLog(CatchRow.class); - public static final String PROPERTY_BENTHOS = "benthos"; + public static final String PROPERTY_SPECIES_TO_CONFIRM = "speciesToConfirm"; + public static final String FREQUENCY_LENGTH_STEP = "frequencyLengthStep"; public static final String FREQUENCY_WEIGHT = "frequencyWeight"; @@ -96,6 +93,8 @@ public class CatchRow extends RowWithOperationContextSupport { protected boolean vrac; + protected boolean speciesToConfirm; + protected Caracteristic frequencyLengthStepCaracteristic; protected Float frequencyLengthStep; @@ -170,6 +169,10 @@ public class CatchRow extends RowWithOperationContextSupport { this.species = species; } + public void setSpeciesToConfirm(boolean speciesToConfirm) { + this.speciesToConfirm = speciesToConfirm; + } + public List<ExportSampleCategory> getSampleCategory() { return sampleCategory; } @@ -218,6 +221,10 @@ public class CatchRow extends RowWithOperationContextSupport { return batchWeightUnit; } + public boolean isSpeciesToConfirm() { + return speciesToConfirm; + } + public void setBatchWeightUnit(String batchWeightUnit) { this.batchWeightUnit = batchWeightUnit; } @@ -247,6 +254,7 @@ public class CatchRow extends RowWithOperationContextSupport { result.setFrequencyWeight(frequencyWeight); result.setSpecies(species); + result.setSpeciesToConfirm(speciesToConfirm); result.setRaisingFactor(raisingFactor); result.setReferenceWeight(referenceWeight); result.setBatchNumber(batchNumber); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForCatch.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForCatch.java index fb899a3..b012c22 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForCatch.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForCatch.java @@ -137,6 +137,7 @@ public class CsvProducerForCatch extends CsvProducer<CatchRow, CatchModel> { row.setCruise(operationExportContext.getCruise()); row.setFishingOperation(operationExportContext.getOperation()); row.setSpecies(benthosBatch.getSpecies()); + row.setSpeciesToConfirm(benthosBatch.isSpeciesToConfirm()); row.setBatchWeightUnit(batchWeightUnit); float raisingFactor = benthosCatchRaisingFactor; @@ -179,6 +180,7 @@ public class CsvProducerForCatch extends CsvProducer<CatchRow, CatchModel> { row.setCruise(operationExportContext.getCruise()); row.setFishingOperation(operationExportContext.getOperation()); row.setSpecies(speciesBatch.getSpecies()); + row.setSpeciesToConfirm(speciesBatch.isSpeciesToConfirm()); row.setBatchWeightUnit(batchWeightUnit); float raisingFactor = speciesCatchRaisingFactor; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.