branch develop updated (69901f81 -> 9941b726)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 69901f81 Merge branch 'develop' of gitlab.nuiton.org:codelutin/echobase into develop new 9941b726 fixes #9743 : Pb avec sizeCategory à l'import des données biometry The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 9941b726123cc91b40933f7ad2aa91dd7d0e8c3c Author: Jean Couteau <jean.couteau@gmail.com> Date: Thu Mar 1 17:05:26 2018 +0100 fixes #9743 : Pb avec sizeCategory à l'import des données biometry Summary of changes: .../csv/VoyageCatchesBiometrySampleImportExportModel.java | 2 +- .../csv/VoyageCatchesBiometrySampleImportRow.java | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 9941b726123cc91b40933f7ad2aa91dd7d0e8c3c Author: Jean Couteau <jean.couteau@gmail.com> Date: Thu Mar 1 17:05:26 2018 +0100 fixes #9743 : Pb avec sizeCategory à l'import des données biometry --- .../csv/VoyageCatchesBiometrySampleImportExportModel.java | 2 +- .../csv/VoyageCatchesBiometrySampleImportRow.java | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesBiometrySampleImportExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesBiometrySampleImportExportModel.java index 922e54a7..61f8c75a 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesBiometrySampleImportExportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesBiometrySampleImportExportModel.java @@ -45,7 +45,7 @@ public class VoyageCatchesBiometrySampleImportExportModel extends EchoBaseImport VoyageCatchesBiometrySampleImportExportModel model = new VoyageCatchesBiometrySampleImportExportModel(importDataContext.getCsvSeparator()); model.newForeignKeyColumn(EchoBaseCsvUtil.OPERATION_ID, VoyageCatchesBiometrySampleImportRow.PROPERTY_OPERATION, Operation.class, Operation.PROPERTY_ID, importDataContext.getVoyageOperationsById()); model.newForeignKeyColumn(Species.PROPERTY_BARACOUDA_CODE, VoyageCatchesBiometrySampleImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, importDataContext.getSpeciesByBaracoudaCode()); - model.newForeignKeyColumn(VoyageCatchesSubSampleImportRow.PROPERTY_SIZE_CATEGORY, SizeCategory.class, SizeCategory.PROPERTY_NAME, importDataContext.getSizeCategoriesByName()); + model.newForeignKeyColumn(VoyageCatchesSubSampleImportRow.PROPERTY_SIZE_CATEGORY, VoyageCatchesBiometrySampleImportRow.PROPERTY_SIZE_CATEGORY, SizeCategory.class, SizeCategory.PROPERTY_NAME, importDataContext.getSizeCategoriesByName()); model.newMandatoryColumn(VoyageCatchesBiometrySampleImportRow.PROPERTY_NUM_FISH, EchoBaseCsvUtil.PRIMITIVE_INTEGER); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesBiometrySampleImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesBiometrySampleImportRow.java index ee89f298..e6568e24 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesBiometrySampleImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesBiometrySampleImportRow.java @@ -24,6 +24,7 @@ import fr.ifremer.echobase.entities.data.Operation; import fr.ifremer.echobase.entities.data.SampleData; import fr.ifremer.echobase.entities.data.SampleDataImpl; import fr.ifremer.echobase.entities.references.SampleDataType; +import fr.ifremer.echobase.entities.references.SizeCategory; import fr.ifremer.echobase.entities.references.Species; /** @@ -40,20 +41,25 @@ public class VoyageCatchesBiometrySampleImportRow { public static final String PROPERTY_SPECIES = "species"; + public static final String PROPERTY_SIZE_CATEGORY = "sizeCategory"; + protected final SampleData sampleData; + protected SizeCategory sizeCategory; + protected Operation operation; protected Species species; protected int numFish; - public static VoyageCatchesBiometrySampleImportRow of(Operation operation, Species species, SampleData sampleData, int numFish) { + public static VoyageCatchesBiometrySampleImportRow of(Operation operation, Species species, SizeCategory sizeCategory, SampleData sampleData, int numFish) { VoyageCatchesBiometrySampleImportRow row = new VoyageCatchesBiometrySampleImportRow(sampleData); row.setOperation(operation); row.setSpecies(species); row.setNumFish(numFish); + row.setSizeCategory(sizeCategory); return row; } @@ -118,4 +124,11 @@ public class VoyageCatchesBiometrySampleImportRow { return sampleData; } + public SizeCategory getSizeCategory() { + return sizeCategory; + } + + public void setSizeCategory(SizeCategory sizeCategory) { + this.sizeCategory = sizeCategory; + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm