April 2016 - Echobase-commits - mailman.cloud.codelutin.com

branch feature/8170 updated (10975a5 -> 81dec8c)
by codelutin.com scm April 4, 2016

April 4, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 10975a5 Normalize test names + readd ITs :) new 309f240 Add more toString on entities new bff9d9b Add predicate to filter cell data new 8af3bd6 Fix i18n new c16fdde Prise en compte de la nullité d'un résultat lors de l'export new 6ead589 Prise en compte de la nullité de la qualité d'un résultat lors de l'export new 47649ae Region import ok \o/ (See #8170) new 81dec8c Can collect ids when creatin data cell 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 81dec8c1e018b7ba17740a3e3d4da4b3189de701 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 4 07:42:06 2016 +0200 Can collect ids when creatin data cell commit 47649ae66721626d0d8eb7a9d645565df2a32456 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 4 07:41:44 2016 +0200 Region import ok \o/ (See #8170) commit 6ead589b58c04a83d68e39e070eee3325a03b98f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 4 07:40:35 2016 +0200 Prise en compte de la nullité de la qualité d'un résultat lors de l'export commit c16fdde3666617cd3882bda4dcee89fb9d01ae97 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 4 07:39:36 2016 +0200 Prise en compte de la nullité d'un résultat lors de l'export commit 8af3bd6da06bff30e1f8e0d553b063aebd84d482 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Apr 3 09:58:02 2016 +0200 Fix i18n commit bff9d9b66a918c49a633c563ed9d5c2f46ce6b8f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Apr 3 09:57:33 2016 +0200 Add predicate to filter cell data commit 309f240165a54000ded40584bfe61390d74adfad Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Apr 3 09:57:09 2016 +0200 Add more toString on entities Summary of changes: .../ifremer/echobase/entities/data/CellImpl.java | 12 ++- .../fr/ifremer/echobase/entities/data/Datas.java | 33 +++++++ .../echobase/entities/references/CellTypeImpl.java | 15 ++- .../echobase/services/csv/EchoBaseCsvUtil.java | 2 +- .../services/csv/ResultValueFormatter.java | 2 +- .../actions/ImportDataActionSupport.java | 12 ++- .../actions/VoyageAcousticsImportAction.java | 3 +- .../VoyageResultsImportDataActionSupport.java | 29 +++--- .../VoyageResultsMapFishCellImportAction.java | 18 ++-- .../VoyageResultsMapOtherCellImportAction.java | 18 ++-- ...VoyageResultsRegionAssociationImportAction.java | 38 +++++++- .../actions/VoyageResultsRegionImportAction.java | 86 +++++++++++++++-- .../VoyageResultsRegionResultsImportAction.java | 106 ++++++++++++++++++++- .../csv/EchoBaseImportExportModelSupport.java | 2 +- .../RegionCellAssociationImportExportModel.java | 12 ++- .../csv/RegionCellAssociationImportRow.java | 10 +- .../importdata/csv/RegionCellImportRow.java | 22 ++++- .../importdata/csv/RegionCellResultImportRow.java | 28 +++++- .../i18n/echobase-services_fr_FR.properties | 2 +- .../VoyageResultsRegionCellImportServiceIT.java | 57 ++++++++--- .../result/region/regionAssociations_small.csv.gz | Bin 0 -> 296 bytes 21 files changed, 436 insertions(+), 71 deletions(-) create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Datas.java create mode 100644 echobase-services/src/test/resources/import-data/result/region/regionAssociations_small.csv.gz -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 7

branch feature/8170 updated (c29f78d -> 10975a5)
by codelutin.com scm April 2, 2016

April 2, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from c29f78d Operations import ok \o/ (See #8170) new 4435be2 Fix voyage commons bootstrap dbs new 3f175c7 Upgrade test import databases new c621df7 fix test results new 10975a5 Normalize test names + readd ITs :) The 4 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 10975a5daa6dd6e3c644797b4f5e2c97145784ab Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 2 15:26:10 2016 +0200 Normalize test names + readd ITs :) commit c621df7d5a10a3e4825fd5465f97f83580c16427 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 2 15:22:59 2016 +0200 fix test results commit 3f175c7dfb7b2da5e59a778057a18ab5d2784fd0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 2 15:15:45 2016 +0200 Upgrade test import databases commit 4435be218ca50aecbb75bf4e0504197eb09c2f99 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 2 14:35:52 2016 +0200 Fix voyage commons bootstrap dbs Summary of changes: echobase-services/pom.xml | 2 +- .../services/FakeEchoBaseServiceContext.java | 55 +++++---- .../services/MigrateImportDataDatabasesIT.java | 131 +++++++++++++++++++++ .../VoyageCatchesAllImportServiceIT.java | 60 +++++++--- ...eCatchesOnlyBiometrySampleImportServiceIT.java} | 4 +- ...VoyageCatchesOnlySubSampleImportServiceIT.java} | 4 +- ...yageCatchesOnlyTotalSampleImportServiceIT.java} | 4 +- .../VoyageCommonsAllImportServiceIT.java | 6 + .../VoyageCommonsImportServiceITSupport.java | 6 - ... VoyageCommonsOnlyTransectImportServiceIT.java} | 10 +- ...> VoyageCommonsOnlyTransitImportServiceIT.java} | 10 +- ...=> VoyageCommonsOnlyVoyageImportServiceIT.java} | 10 +- ...eResultsVoyageOnlyEchotypeImportServiceIT.java} | 4 +- ...ultsVoyageOnlyLengthAgeKeyImportServiceIT.java} | 4 +- ...sVoyageOnlyLengthWeightKeyImportServiceIT.java} | 4 +- .../echobase-catches-and-voyage-result.h2.db.gz | Bin 705722 -> 703063 bytes .../import-data/echobase-catches.h2.db.gz | Bin 662677 -> 659616 bytes .../import-data/echobase-commonData.h2.db.gz | Bin 178638 -> 179054 bytes .../resources/import-data/echobase-nodata.h2.db.gz | Bin 129028 -> 129703 bytes .../echobase-operation-total-samples.h2.db.gz | Bin 663495 -> 660514 bytes .../import-data/echobase-operation.h2.db.gz | Bin 324421 -> 323654 bytes 21 files changed, 247 insertions(+), 67 deletions(-) create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/MigrateImportDataDatabasesIT.java rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageCatchesImportServiceOnlyBiometrySampleIT.java => VoyageCatchesOnlyBiometrySampleImportServiceIT.java} (95%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageCatchesImportServiceOnlySubSampleIT.java => VoyageCatchesOnlySubSampleImportServiceIT.java} (95%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageCatchesImportServiceOnlyTotalSampleIT.java => VoyageCatchesOnlyTotalSampleImportServiceIT.java} (95%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageCommonsTransectImportServiceIT.java => VoyageCommonsOnlyTransectImportServiceIT.java} (88%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageCommonsTransitImportServiceIT.java => VoyageCommonsOnlyTransitImportServiceIT.java} (88%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageCommonsVoyageImportServiceIT.java => VoyageCommonsOnlyVoyageImportServiceIT.java} (87%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageResultsVoyageImportServiceOnlyEchotypeIT.java => VoyageResultsVoyageOnlyEchotypeImportServiceIT.java} (95%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageResultsVoyageImportServiceOnlyLengthAgeKeyIT.java => VoyageResultsVoyageOnlyLengthAgeKeyImportServiceIT.java} (95%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageResultsVoyageImportServiceOnlyLengthWeightKeyIT.java => VoyageResultsVoyageOnlyLengthWeightKeyImportServiceIT.java} (95%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch feature/8170 updated (5edc41d -> c29f78d)
by codelutin.com scm April 2, 2016

April 2, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 5edc41d Sub sample import ok \o/ (See #8170) new 6256a3a Improve import data tests new 09d93ed Biometry sample import ok \o/ (See #8170) new 3748750 rename catches csv java classes new 7ed45de rename commons csv java classes new c29f78d Operations import ok \o/ (See #8170) The 5 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 c29f78db2beaee2125351046e727be0ffaf359d5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 2 13:57:46 2016 +0200 Operations import ok \o/ (See #8170) commit 7ed45de9e0f51efa064646ce69405bb0949ed65d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 2 13:00:09 2016 +0200 rename commons csv java classes commit 3748750a5d46c9fa2c2023749f540aacd0b464a6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 2 12:58:57 2016 +0200 rename catches csv java classes commit 09d93ed44f054728df4f1d47caffbe198489a7e8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 2 12:57:41 2016 +0200 Biometry sample import ok \o/ (See #8170) commit 6256a3a8425a3018c89e9797e304adbda6fd1b16 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 2 12:33:28 2016 +0200 Improve import data tests Summary of changes: .../VoyageCatchesBiometrySampleImportAction.java | 65 +++++++++++++--- .../VoyageCatchesSubSampleImportAction.java | 26 +++---- .../VoyageCatchesTotalSampleImportAction.java | 20 ++--- .../actions/VoyageCommonsTransectImportAction.java | 20 ++--- .../actions/VoyageCommonsTransitImportAction.java | 20 ++--- .../actions/VoyageCommonsVoyageImportAction.java | 10 +-- .../VoyageOperationsGearMetadataImportAction.java | 60 ++++++++++++--- .../VoyageOperationsOperationImportAction.java | 48 +++++++++--- ...ageOperationsOperationMetadataImportAction.java | 61 ++++++++++++--- .../csv/GearMetadataValueImportExportModel.java | 72 ------------------ .../OperationMetadataValueImportExportModel.java | 68 ----------------- .../importdata/csv/SubSampleImportExportModel.java | 87 ---------------------- .../csv/TotalSampleImportExportModel.java | 78 ------------------- ...ageCatchesBiometrySampleImportExportModel.java} | 28 +++---- ...a => VoyageCatchesBiometrySampleImportRow.java} | 44 +++++++++-- .../VoyageCatchesSubSampleImportExportModel.java | 87 ++++++++++++++++++++++ ...w.java => VoyageCatchesSubSampleImportRow.java} | 12 +-- .../VoyageCatchesTotalSampleImportExportModel.java | 78 +++++++++++++++++++ ...java => VoyageCatchesTotalSampleImportRow.java} | 12 +-- ...=> VoyageCommonsTransectImportExportModel.java} | 20 ++--- ...ow.java => VoyageCommonsTransectImportRow.java} | 12 +-- ... => VoyageCommonsTransitImportExportModel.java} | 20 ++--- ...Row.java => VoyageCommonsTransitImportRow.java} | 12 +-- ...a => VoyageCommonsVoyageImportExportModel.java} | 12 +-- ...erationsGearMetadataValueImportExportModel.java | 72 ++++++++++++++++++ ...oyageOperationsGearMetadataValueImportRow.java} | 35 +++++++-- ...oyageOperationsOperationImportExportModel.java} | 20 ++--- ...ava => VoyageOperationsOperationImportRow.java} | 67 +++++++++++++++-- ...onsOperationMetadataValueImportExportModel.java | 68 +++++++++++++++++ ...OperationsOperationMetadataValueImportRow.java} | 39 +++++++--- .../importdata/AbstractImportDataServiceIT.java | 14 ++-- .../importdata/VoyageAcousticImportServiceIT.java | 11 +-- .../VoyageCatchesAllImportServiceIT.java | 9 ++- .../VoyageCatchesImportServiceITSupport.java | 19 ++--- ...geCatchesImportServiceOnlyBiometrySampleIT.java | 32 +++++--- .../VoyageCatchesImportServiceOnlySubSampleIT.java | 9 +-- ...oyageCatchesImportServiceOnlyTotalSampleIT.java | 15 ++-- .../VoyageCommonsAllImportServiceIT.java | 11 +-- .../VoyageCommonsImportServiceITSupport.java | 20 ++++- .../VoyageCommonsTransectImportServiceIT.java | 11 +-- .../VoyageCommonsTransitImportServiceIT.java | 11 +-- .../VoyageCommonsVoyageImportServiceIT.java | 12 +-- .../importdata/VoyageOperationImportServiceIT.java | 57 +++++++------- .../VoyageResultsEsduCellImportServiceIT.java | 9 +-- .../VoyageResultsImportServiceITSupport.java | 15 ++-- .../VoyageResultsMapFishCellImportServiceIT.java | 9 +-- .../VoyageResultsMapOtherCellImportServiceIT.java | 9 +-- .../VoyageResultsRegionCellImportServiceIT.java | 9 +-- .../VoyageResultsVoyageImportServiceIT.java | 9 +-- ...geResultsVoyageImportServiceOnlyEchotypeIT.java | 9 +-- ...sultsVoyageImportServiceOnlyLengthAgeKeyIT.java | 9 +-- ...tsVoyageImportServiceOnlyLengthWeightKeyIT.java | 9 +-- 52 files changed, 940 insertions(+), 651 deletions(-) delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/GearMetadataValueImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationMetadataValueImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/SubSampleImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TotalSampleImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{BiometrySampleImportExportModel.java => VoyageCatchesBiometrySampleImportExportModel.java} (58%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{BiometrySampleImportRow.java => VoyageCatchesBiometrySampleImportRow.java} (69%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesSubSampleImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{SubSampleImportRow.java => VoyageCatchesSubSampleImportRow.java} (91%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesTotalSampleImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{TotalSampleImportRow.java => VoyageCatchesTotalSampleImportRow.java} (89%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{TransectImportExportModel.java => VoyageCommonsTransectImportExportModel.java} (79%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{TransectImportRow.java => VoyageCommonsTransectImportRow.java} (92%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{TransitImportExportModel.java => VoyageCommonsTransitImportExportModel.java} (66%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{TransitImportRow.java => VoyageCommonsTransitImportRow.java} (85%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{VoyageImportExportModel.java => VoyageCommonsVoyageImportExportModel.java} (76%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageOperationsGearMetadataValueImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{GearMetadataValueImportRow.java => VoyageOperationsGearMetadataValueImportRow.java} (65%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{OperationImportExportModel.java => VoyageOperationsOperationImportExportModel.java} (77%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{OperationImportRow.java => VoyageOperationsOperationImportRow.java} (64%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageOperationsOperationMetadataValueImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{OperationMetadataValueImportRow.java => VoyageOperationsOperationMetadataValueImportRow.java} (64%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5

branch feature/8170 updated (ffccaad -> 5edc41d)
by codelutin.com scm April 2, 2016

April 2, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from ffccaad Les imports commons voyage passent \o/ new 4e57363 Amélioration des tests d'import new d4e6f56 Utilisation des bons contrats new 30740d9 Import Catches total sample works new 5455012 Add toString on some entities new d65efd0 Can collect imported sample data new 73511a8 Remove units column from subsample import in import data new 8055fa7 Add test import database with total sample inside it new 5edc41d Sub sample import ok \o/ (See #8170) The 8 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 5edc41de112f0c1fb6401dcc5e71bd2303cceddf Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 2 12:26:10 2016 +0200 Sub sample import ok \o/ (See #8170) commit 8055fa73eae957c3458f5bf5de92b4c04c63dc6a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 2 12:25:40 2016 +0200 Add test import database with total sample inside it commit 73511a8e4ed647a4f207bd8c7ab1c2c4eebf3acd Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 2 12:25:16 2016 +0200 Remove units column from subsample import in import data commit d65efd09d12a99a6323020fa3bf66ab2b59c6c57 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 2 12:24:46 2016 +0200 Can collect imported sample data commit 5455012ac5bd04afaa49cdcc68efc8023aa175b3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 2 12:24:05 2016 +0200 Add toString on some entities commit 30740d94ecf9e2080e433c36d28c767b359aeef6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 1 23:24:36 2016 +0200 Import Catches total sample works commit d4e6f56107931c0f99c8a4b1ea8c8c63c2e28067 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 1 23:23:45 2016 +0200 Utilisation des bons contrats commit 4e57363be66dab4849ba1974970e3e0e94c7181f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 1 23:22:59 2016 +0200 Amélioration des tests d'import Summary of changes: .../echobase/entities/data/OperationImpl.java | 22 +- .../echobase/entities/data/SampleDataImpl.java | 18 ++ .../echobase/entities/data/SampleDatas.java | 19 ++ .../ifremer/echobase/entities/data/SampleImpl.java | 18 ++ .../echobase/entities/references/GearImpl.java | 17 ++ .../entities/references/SampleDataTypeImpl.java | 17 +- .../entities/references/SampleTypeImpl.java | 10 + .../service/importdata/ImportDataResult.java | 4 +- .../service/importdata/ImportDataService.java | 3 +- .../VoyageCatchesImportDataActionSupport.java | 8 +- .../VoyageCatchesSubSampleImportAction.java | 221 ++++++++++++++++++++- .../VoyageCatchesTotalSampleImportAction.java | 98 ++++++++- .../importdata/csv/SubSampleImportExportModel.java | 13 +- .../service/importdata/csv/SubSampleImportRow.java | 34 +++- .../csv/TotalSampleImportExportModel.java | 4 +- .../importdata/csv/TotalSampleImportRow.java | 25 ++- .../echobase/services/EchoBaseServiceFixtures.java | 10 + .../services/EchoBaseTestServiceSupport.java | 38 ++++ .../importdata/AbstractImportDataServiceIT.java | 39 +++- .../service/importdata/CatchesImportServiceIT.java | 81 -------- ...eIT.java => VoyageAcousticImportServiceIT.java} | 53 +++-- .../VoyageCatchesAllImportServiceIT.java | 84 ++++++++ ...va => VoyageCatchesImportServiceITSupport.java} | 39 ++-- ...eCatchesImportServiceOnlyBiometrySampleIT.java} | 38 ++-- .../VoyageCatchesImportServiceOnlySubSampleIT.java | 76 +++++++ ...yageCatchesImportServiceOnlyTotalSampleIT.java} | 42 ++-- .../VoyageCommonsAllImportServiceIT.java | 24 +-- .../VoyageCommonsImportServiceITSupport.java | 31 +-- .../VoyageCommonsTransectImportServiceIT.java | 12 +- .../VoyageCommonsTransitImportServiceIT.java | 8 +- .../VoyageCommonsVoyageImportServiceIT.java | 8 +- ...IT.java => VoyageOperationImportServiceIT.java} | 60 +++--- ...a => VoyageResultsEsduCellImportServiceIT.java} | 52 ++--- .../VoyageResultsImportServiceITSupport.java} | 34 ++-- ...> VoyageResultsMapFishCellImportServiceIT.java} | 45 +++-- ... VoyageResultsMapOtherCellImportServiceIT.java} | 44 ++-- ...=> VoyageResultsRegionCellImportServiceIT.java} | 61 +++--- ...ava => VoyageResultsVoyageImportServiceIT.java} | 51 ++--- ...eResultsVoyageImportServiceOnlyEchotypeIT.java} | 37 ++-- ...ultsVoyageImportServiceOnlyLengthAgeKeyIT.java} | 39 ++-- ...sVoyageImportServiceOnlyLengthWeightKeyIT.java} | 38 ++-- .../resources/import-data/catches/subsample.csv.gz | Bin 931 -> 920 bytes .../import-data/catches/subsample_all.csv.gz | Bin 23572 -> 22400 bytes .../echobase-operation-total-samples.h2.db.gz | Bin 0 -> 663495 bytes 44 files changed, 1094 insertions(+), 481 deletions(-) create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/SampleDataImpl.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/SampleDatas.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/SampleImpl.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/GearImpl.java delete mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CatchesImportServiceIT.java rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{AcousticImportServiceIT.java => VoyageAcousticImportServiceIT.java} (68%) create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesAllImportServiceIT.java rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{CatchesImportServiceOnlyTotalSampleIT.java => VoyageCatchesImportServiceITSupport.java} (54%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{CatchesImportServiceOnlySubSampleIT.java => VoyageCatchesImportServiceOnlyBiometrySampleIT.java} (53%) create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesImportServiceOnlySubSampleIT.java rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{CatchesImportServiceOnlyBiometrySampleIT.java => VoyageCatchesImportServiceOnlyTotalSampleIT.java} (50%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{OperationImportServiceIT.java => VoyageOperationImportServiceIT.java} (50%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{ResultsEsduCellImportServiceIT.java => VoyageResultsEsduCellImportServiceIT.java} (81%) copy echobase-services/src/{main/java/fr/ifremer/echobase/services/service/importdata/ImportException.java => test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsImportServiceITSupport.java} (50%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{ResultsMapFishCellImportServiceIT.java => VoyageResultsMapFishCellImportServiceIT.java} (60%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{ResultsMapOtherCellImportServiceIT.java => VoyageResultsMapOtherCellImportServiceIT.java} (58%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{ResultsRegionCellImportServiceIT.java => VoyageResultsRegionCellImportServiceIT.java} (52%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportServiceIT.java => VoyageResultsVoyageImportServiceIT.java} (53%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportServiceOnlyEchotypeIT.java => VoyageResultsVoyageImportServiceOnlyEchotypeIT.java} (61%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportServiceOnlyLengthAgeKeyIT.java => VoyageResultsVoyageImportServiceOnlyLengthAgeKeyIT.java} (60%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportServiceOnlyLengthWeightKeyIT.java => VoyageResultsVoyageImportServiceOnlyLengthWeightKeyIT.java} (60%) create mode 100644 echobase-services/src/test/resources/import-data/echobase-operation-total-samples.h2.db.gz -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 8

branch feature/8170 updated (48ac1c9 -> ffccaad)
by codelutin.com scm April 1, 2016

April 1, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 48ac1c9 Début de revue des tests pour intégrer les exports new ffccaad Les imports commons voyage passent \o/ 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 ffccaadc23d12262de46585ebf404a78864a14d0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 1 17:57:35 2016 +0200 Les imports commons voyage passent \o/ Summary of changes: .../importdata/csv/TransectImportExportModel.java | 2 +- .../service/importdata/csv/TransectImportRow.java | 110 ++++++++++++++++-- .../service/importdata/csv/TransitImportRow.java | 23 +++- .../services/EchoBaseTestServiceSupport.java | 35 ++++++ .../importdata/CommonAllImportServiceIT.java | 88 --------------- .../importdata/CommonTransectImportServiceIT.java | 78 ------------- .../importdata/CommonVoyageImportServiceIT.java | 109 ------------------ .../VoyageCommonsAllImportServiceIT.java | 123 +++++++++++++++++++++ .../VoyageCommonsImportServiceITSupport.java | 68 ++++++++++++ .../VoyageCommonsTransectImportServiceIT.java | 109 ++++++++++++++++++ ...va => VoyageCommonsTransitImportServiceIT.java} | 60 ++++++---- .../VoyageCommonsVoyageImportServiceIT.java | 101 +++++++++++++++++ 12 files changed, 600 insertions(+), 306 deletions(-) delete mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonAllImportServiceIT.java delete mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonTransectImportServiceIT.java delete mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonVoyageImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsAllImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsImportServiceITSupport.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsTransectImportServiceIT.java rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{CommonTransitImportServiceIT.java => VoyageCommonsTransitImportServiceIT.java} (51%) create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsVoyageImportServiceIT.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8170 updated (520575f -> 48ac1c9)
by codelutin.com scm April 1, 2016

April 1, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 520575f Renommages, mise en place context d'import (impacts dans les actions d'ui) new 832ab3f Ajout du répertoire temporaire dans la configuration new 3480f7e Début d'implantation de l'export new 48ac1c9 Début de revue des tests pour intégrer les exports The 3 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 48ac1c94a02825c67fd6f93fa6c8e22a02f1e1f1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 1 16:45:11 2016 +0200 Début de revue des tests pour intégrer les exports commit 3480f7e66f04a9fe8d30326b3e12a038c34700a7 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 1 16:44:44 2016 +0200 Début d'implantation de l'export commit 832ab3fcb4ca122e294cf1a214e2fb8f475351d1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 1 16:42:50 2016 +0200 Ajout du répertoire temporaire dans la configuration Summary of changes: .../echobase/config/EchoBaseConfiguration.java | 8 + .../config/EchoBaseConfigurationOption.java | 4 + .../echobase/services/csv/BatchCsvExport.java | 100 ++++++++ .../service/importdata/ImportDataFileResult.java | 27 ++- .../service/importdata/ImportDataService.java | 2 +- .../actions/ImportDataActionSupport.java | 261 +++++++++++++++++---- .../actions/VoyageAcousticsImportAction.java | 7 + .../VoyageCatchesBiometrySampleImportAction.java | 7 + .../VoyageCatchesSubSampleImportAction.java | 7 + .../VoyageCatchesTotalSampleImportAction.java | 7 + .../actions/VoyageCommonsTransectImportAction.java | 38 ++- .../actions/VoyageCommonsTransitImportAction.java | 42 +++- .../actions/VoyageCommonsVoyageImportAction.java | 21 ++ .../VoyageOperationsGearMetadataImportAction.java | 7 + .../VoyageOperationsOperationImportAction.java | 7 + ...ageOperationsOperationMetadataImportAction.java | 7 + ...EchotypeAndSpeciesCategoryCellImportAction.java | 7 + ...oyageResultsEsduByEchotypeCellImportAction.java | 7 + ...sEsduSpeciesAndAgeCategoryCellImportAction.java | 7 + ...EsduSpeciesAndSizeCategoryCellImportAction.java | 7 + .../VoyageResultsMapFishCellImportAction.java | 7 + .../VoyageResultsMapOtherCellImportAction.java | 7 + ...VoyageResultsRegionAssociationImportAction.java | 7 + .../actions/VoyageResultsRegionImportAction.java | 7 + .../VoyageResultsRegionResultsImportAction.java | 7 + .../VoyageResultsVoyageEchotypeImportAction.java | 7 + ...oyageResultsVoyageLengthAgeKeyImportAction.java | 7 + ...geResultsVoyageLengthWeightKeyImportAction.java | 7 + .../contexts/VoyageAcousticsImportDataContext.java | 2 +- .../contexts/VoyageCatchesImportDataContext.java | 4 +- .../contexts/VoyageCommonsImportDataContext.java | 2 +- ...xt.java => VoyageImportDataContextSupport.java} | 4 +- .../VoyageOperationsImportDataContext.java | 2 +- .../contexts/VoyageResultsImportDataContext.java | 2 +- .../csv/BiometrySampleImportExportModel.java | 7 +- .../importdata/csv/EchotypeImportExportModel.java | 7 +- .../csv/LengthAgeKeyImportExportModel.java | 7 +- .../csv/LengthWeightKeyImportExportModel.java | 7 +- .../importdata/csv/MapCellImportExportModel.java | 7 +- .../importdata/csv/SubSampleImportExportModel.java | 7 +- .../csv/TotalSampleImportExportModel.java | 7 +- .../importdata/csv/TransectImportExportModel.java | 7 +- .../service/importdata/csv/TransectImportRow.java | 12 +- .../importdata/csv/TransitImportExportModel.java | 7 +- .../service/importdata/csv/TransitImportRow.java | 24 +- .../importdata/csv/VoyageImportExportModel.java | 7 +- .../i18n/echobase-services_en_GB.properties | 1 + .../i18n/echobase-services_fr_FR.properties | 1 + .../services/EchoBaseTestServiceSupport.java | 39 +-- .../importdata/AbstractImportDataServiceIT.java | 8 +- .../importdata/AcousticImportServiceIT.java | 2 +- .../service/importdata/CatchesImportServiceIT.java | 6 +- .../CatchesImportServiceOnlyBiometrySampleIT.java | 2 +- .../CatchesImportServiceOnlySubSampleIT.java | 2 +- .../CatchesImportServiceOnlyTotalSampleIT.java | 2 +- .../importdata/CommonAllImportServiceIT.java | 6 +- .../importdata/CommonTransectImportServiceIT.java | 2 +- .../importdata/CommonTransitImportServiceIT.java | 2 +- .../importdata/CommonVoyageImportServiceIT.java | 42 +++- .../importdata/OperationImportServiceIT.java | 6 +- .../importdata/ResultsEsduCellImportServiceIT.java | 8 +- .../ResultsMapFishCellImportServiceIT.java | 2 +- .../ResultsMapOtherCellImportServiceIT.java | 2 +- .../ResultsRegionCellImportServiceIT.java | 2 +- .../importdata/ResultsVoyageImportServiceIT.java | 6 +- .../ResultsVoyageImportServiceOnlyEchotypeIT.java | 2 +- ...sultsVoyageImportServiceOnlyLengthAgeKeyIT.java | 2 +- ...tsVoyageImportServiceOnlyLengthWeightKeyIT.java | 2 +- 68 files changed, 733 insertions(+), 172 deletions(-) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/csv/BatchCsvExport.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/{VoyageImportDataContext.java => VoyageImportDataContextSupport.java} (94%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3