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 5a9a6fa Livrable #8298 Merge branch 'feature/8298' into develop new 59fdcac Ajout colum SpeciesCategory#lengthClass (See #8297) new 130cd48 Migration 3.902 (See #8297) new 106963e mise à jour de la base de tests après import catches new df5c305 Ajout de SpeciesCategory#lengthClass dans le cache de SpeciesCategory + renommage de l'import concerné (See #8297) new 04fb27a Renommage côté ui de l'import concerné (See #8297) new 1980d1f On remete les données de tests sur sizeCategory + ajout d'un test sur le fichier complet (mais qu'on ignore pour le moment car trop long à lancer... (See #8297) new 2106d05 Livrable #8297 Merge branch 'feature/8297' into develop The 7 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 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 commit 1980d1f5b8b61d55f33968d597d65269071b4007 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun May 1 13:21:47 2016 +0200 On remete les données de tests sur sizeCategory + ajout d'un test sur le fichier complet (mais qu'on ignore pour le moment car trop long à lancer... (See #8297) commit 04fb27a35f79577277b740379b98d82c4eaa0037 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun May 1 12:44:37 2016 +0200 Renommage côté ui de l'import concerné (See #8297) commit df5c305940ab6f45cd9865c5dfacb9aaa8c69d4c Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun May 1 12:44:12 2016 +0200 Ajout de SpeciesCategory#lengthClass dans le cache de SpeciesCategory + renommage de l'import concerné (See #8297) commit 106963ea86066a4d9b6fde8482cea00a129b78dc Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun May 1 12:43:07 2016 +0200 mise à jour de la base de tests après import catches commit 130cd48840ca9b23bd6f8561c1e6be1374b916ed Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 30 13:50:15 2016 +0200 Migration 3.902 (See #8297) commit 59fdcac71e4dae5b1a567b1d1c03ed3256bb34da Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 30 13:36:44 2016 +0200 Ajout colum SpeciesCategory#lengthClass (See #8297) Summary of changes: ...WorkingDbMigrationCallBackForVersion3_902.java} | 15 ++-- .../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} | 25 +++--- ...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, 279 insertions(+), 232 deletions(-) copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{WorkingDbMigrationCallBackForVersion3_901.java => WorkingDbMigrationCallBackForVersion3_902.java} (64%) create mode 100644 echobase-domain/src/main/resources/migration/workingDb/3.902-0-add-SpeciesCategory_lengthClass.sql create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthCellImportAction.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduSpeciesAndSizeCategoryCellImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{VoyageResultsEsduBySpeciesAndSizeCategoryImportRow.java => VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.java} (70%) delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduBySpeciesAndSizeCategoryImportExportModel.java copy echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryImportServiceIT.java => VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryAndLengthImportServiceIT.java} (82%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageResultsEsduCellOnlySpeciesAndSizeCategoryImportServiceIT.java => VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryAndLength_SmallImportServiceIT.java} (79%) create mode 100644 echobase-services/src/test/resources/import-data/result/esdu/byEchotypeAndSpeciesCategoryAndLength.csv.gz create mode 100644 echobase-services/src/test/resources/import-data/result/esdu/byEchotypeAndSpeciesCategoryAndLength_small.csv.gz delete mode 100644 echobase-services/src/test/resources/import-data/result/esdu/bySpeciesAndSizeCategory.csv.gz delete mode 100644 echobase-services/src/test/resources/import-data/result/esdu/bySpeciesAndSizeCategory_small.csv.gz -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.