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 2106d05d2f3617365ff08435b9d4abcf66f6ece1 Merge: 5a9a6fa 1980d1f Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun May 1 13:21:54 2016 +0200 Livrable #8297 Merge branch 'feature/8297' into develop .../WorkingDbMigrationCallBackForVersion3_902.java | 33 +++++++ .../3.902-0-add-SpeciesCategory_lengthClass.sql | 1 + echobase-domain/src/main/xmi/echobase.properties | 2 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 90396 -> 90472 bytes .../echobase/services/csv/EchoBaseCsvUtil.java | 2 +- .../services/service/UserDbPersistenceService.java | 4 + .../service/importdata/ImportDataService.java | 6 +- .../service/importdata/ResultCategoryCache.java | 2 + .../service/importdata/SpeciesCategoryCache.java | 6 +- .../VoyageCatchesBiometrySampleImportAction.java | 2 +- .../VoyageCatchesSubSampleImportAction.java | 2 +- .../VoyageCatchesTotalSampleImportAction.java | 2 +- ...ndSpeciesCategoryAndLengthCellImportAction.java | 72 +++++++++++++++ ...EchotypeAndSpeciesCategoryCellImportAction.java | 1 + ...sEsduSpeciesAndAgeCategoryCellImportAction.java | 2 +- ...EsduSpeciesAndSizeCategoryCellImportAction.java | 63 ------------- .../VoyageResultsMapFishCellImportAction.java | 1 + .../VoyageResultsRegionResultsImportAction.java | 1 + ...geResultsVoyageLengthWeightKeyImportAction.java | 2 +- .../VoyageResultsImportConfiguration.java | 12 +-- ...dSpeciesCategoryAndLengthImportExportModel.java | 100 +++++++++++++++++++++ ...otypeAndSpeciesCategoryAndLengthImportRow.java} | 39 ++++++-- ...chotypeAndSpeciesCategoryImportExportModel.java | 4 +- ...yageResultsEsduByEchotypeImportExportModel.java | 4 +- ...duBySpeciesAndAgeCategoryImportExportModel.java | 4 +- ...uBySpeciesAndSizeCategoryImportExportModel.java | 93 ------------------- .../i18n/echobase-services_en_GB.properties | 2 +- .../i18n/echobase-services_fr_FR.properties | 2 +- ...ndSpeciesCategoryAndLengthImportServiceIT.java} | 30 +++---- ...iesCategoryAndLength_SmallImportServiceIT.java} | 20 ++--- .../resources/echobase-importDb-referentiel.zip | Bin 50920 -> 50556 bytes .../echobase-catches-and-voyage-result.h2.db.gz | Bin 632318 -> 826644 bytes .../import-data/echobase-catches.h2.db.gz | Bin 754466 -> 754845 bytes .../import-data/echobase-commonData.h2.db.gz | Bin 183714 -> 184388 bytes .../resources/import-data/echobase-nodata.h2.db.gz | Bin 136848 -> 137434 bytes .../echobase-operation-total-samples.h2.db.gz | Bin 602363 -> 601307 bytes .../import-data/echobase-operation.h2.db.gz | Bin 328618 -> 327903 bytes .../byEchotypeAndSpeciesCategoryAndLength.csv.gz | Bin 0 -> 709794 bytes ...chotypeAndSpeciesCategoryAndLength_small.csv.gz | Bin 0 -> 2585 bytes .../result/esdu/bySpeciesAndSizeCategory.csv.gz | Bin 709007 -> 0 bytes .../esdu/bySpeciesAndSizeCategory_small.csv.gz | Bin 2544 -> 0 bytes .../actions/importData/ConfigureResultsImport.java | 12 +-- .../resources/i18n/echobase-ui_en_GB.properties | 2 +- .../resources/i18n/echobase-ui_fr_FR.properties | 2 +- .../jsp/importData/configureResultsImport.jsp | 4 +- 45 files changed, 306 insertions(+), 228 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.