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 2d72c41595dab9f1be732aa646f40ae31be5496e Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 27 12:23:48 2016 +0200 Modification du modèle d'import/export des observations individuelles pour y ajouter l'id du lot + le rankOrder + impacts sur l'export (See #8252) --- .../csv/IndividualObservationModel.java | 11 +++++++++-- .../genericformat/csv/IndividualObservationRow.java | 20 ++++++++++++++++++-- .../CsvProducerForIndividualObservation.java | 4 +++- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/IndividualObservationModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/IndividualObservationModel.java index 9bce9a0..f388d86 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/IndividualObservationModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/IndividualObservationModel.java @@ -74,9 +74,12 @@ public class IndividualObservationModel extends AbstractTuttiImportExportModel<I newColumnForExport("Id_Operation", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); newColumnForExport("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); - newColumnForExport("Id_Lot", IndividualObservationRow.PROPERTY_BATCH_ID, TuttiCsvUtil.PRIMITIVE_INTEGER); + newColumnForExport("Id_Lot", IndividualObservationBatch.PROPERTY_BATCH_ID, TuttiCsvUtil.PRIMITIVE_INTEGER); newColumnForExport("Code_Taxon", IndividualObservationBatch.PROPERTY_SPECIES, TuttiCsvUtil.SPECIES_TECHNICAL_FORMATTER); newColumnForExport("Nom_Scientifique", IndividualObservationBatch.PROPERTY_SPECIES, TuttiCsvUtil.SPECIES_FORMATTER); + + newColumnForExport("Id_Echantillon", IndividualObservationBatch.PROPERTY_ID, TuttiCsvUtil.PRIMITIVE_INTEGER); + newColumnForExport("Numero_Ordre", IndividualObservationBatch.PROPERTY_RANK_ORDER, TuttiCsvUtil.PRIMITIVE_INTEGER); newColumnForExport("Commentaire", IndividualObservationBatch.PROPERTY_COMMENT, TuttiCsvUtil.COMMENT_PARSER_FORMATTER); newColumnForExport("Code_PMFM", IndividualObservationRow.PROPERTY_CARACTERISTIC, TuttiCsvUtil.CARACTERISTIC_TECHNICAL_FORMATTER); newColumnForExport("Libelle_PMFM", IndividualObservationRow.PROPERTY_CARACTERISTIC, TuttiCsvUtil.CARACTERISTIC_FORMATTER); @@ -85,6 +88,7 @@ public class IndividualObservationModel extends AbstractTuttiImportExportModel<I newColumnForExport("Serie_Id", Cruise.PROPERTY_PROGRAM, TuttiCsvUtil.PROGRAM_TECHNICAL_FORMATTER); newColumnForExport("Valeur_Id", IndividualObservationRow.PROPERTY_CARACTERISTIC_VALUE, TuttiCsvUtil.CARACTERISTIC_VALUE_TECHNICAL_FORMATTER); + } protected void forImport(GenericFormatImportEntityParserFactory parserFactory) { @@ -97,9 +101,12 @@ public class IndividualObservationModel extends AbstractTuttiImportExportModel<I newMandatoryColumn("Id_Operation", FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER, TuttiCsvUtil.INTEGER); newMandatoryColumn("Poche", FishingOperation.PROPERTY_MULTIRIG_AGGREGATION); - newMandatoryColumn("Id_Lot", IndividualObservationRow.PROPERTY_BATCH_ID, TuttiCsvUtil.PRIMITIVE_INTEGER); + newMandatoryColumn("Id_Lot", IndividualObservationBatch.PROPERTY_BATCH_ID, TuttiCsvUtil.PRIMITIVE_INTEGER); newMandatoryColumn("Code_Taxon", IndividualObservationBatch.PROPERTY_SPECIES, parserFactory.getSpeciesParser()); newIgnoredColumn("Nom_Scientifique"); + + newMandatoryColumn("Id_Echantillon", IndividualObservationBatch.PROPERTY_ID, TuttiCsvUtil.PRIMITIVE_INTEGER); + newMandatoryColumn("Numero_Ordre", IndividualObservationBatch.PROPERTY_RANK_ORDER, TuttiCsvUtil.PRIMITIVE_INTEGER); newMandatoryColumn("Commentaire", IndividualObservationBatch.PROPERTY_COMMENT, TuttiCsvUtil.COMMENT_PARSER_FORMATTER); newMandatoryColumn("Code_PMFM", IndividualObservationRow.PROPERTY_CARACTERISTIC, parserFactory.getCaracteristicWithProtectedParser()); newIgnoredColumn("Libelle_PMFM"); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/IndividualObservationRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/IndividualObservationRow.java index de5dcdd..4754297 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/IndividualObservationRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/IndividualObservationRow.java @@ -37,12 +37,12 @@ public class IndividualObservationRow extends RowWithOperationContextSupport { private static final long serialVersionUID = 1L; - public static final String PROPERTY_BATCH_ID = "batchId"; - public static final String PROPERTY_CARACTERISTIC = "caracteristic"; public static final String PROPERTY_CARACTERISTIC_VALUE = "caracteristicValue"; + private Integer id; + private Integer batchId; protected Species species; @@ -52,6 +52,7 @@ public class IndividualObservationRow extends RowWithOperationContextSupport { protected Caracteristic caracteristic; protected Serializable caracteristicValue; + private Integer rankOrder; public static IndividualObservationRow newEmptyInstance() { IndividualObservationRow row = new IndividualObservationRow(); @@ -59,6 +60,10 @@ public class IndividualObservationRow extends RowWithOperationContextSupport { return row; } + public void setId(Integer id) { + this.id = id; + } + public void setBatchId(Integer batchId) { this.batchId = batchId; } @@ -79,6 +84,10 @@ public class IndividualObservationRow extends RowWithOperationContextSupport { this.comment = comment; } + public Integer getId() { + return id; + } + public Integer getBatchId() { return batchId; } @@ -99,4 +108,11 @@ public class IndividualObservationRow extends RowWithOperationContextSupport { return species; } + public void setRankOrder(Integer rankOrder) { + this.rankOrder = rankOrder; + } + + public Integer getRankOrder() { + return rankOrder; + } } 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 ddf3cf7..ccc0fe8 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 @@ -128,7 +128,9 @@ public class CsvProducerForIndividualObservation extends CsvProducer<IndividualO row.setComment(individualObservationBatch.getComment()); row.setSpecies(individualObservationBatch.getSpecies()); - row.setBatchId(individualObservationBatch.getIdAsInt()); + row.setId(individualObservationBatch.getIdAsInt()); + row.setBatchId(individualObservationBatch.getBatchId()); + row.setRankOrder(individualObservationBatch.getRankOrder()); row.setCaracteristic(caracteristic); row.setCaracteristicValue(caracteristicValue); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.