This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit dc529363398cd12dee5533d723219ad2b3bf41e5 Merge: eb07adf 8d211de Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Mar 11 17:00:33 2016 +0100 Refs #8061 (l'import/export au niveau des lots espèces est ok) Merge branch 'feature/8061' into develop .../tutti/persistence/TuttiPersistenceImpl.java | 9 +- .../persistence/TuttiPersistenceNoDbImpl.java | 7 +- .../entities/data/SampleCategoryModel.java | 21 + .../service/AccidentalBatchPersistenceService.java | 2 +- .../AccidentalBatchPersistenceServiceImpl.java | 2 +- ...dividualObservationBatchPersistenceService.java | 4 + ...dualObservationBatchPersistenceServiceImpl.java | 192 ++-- .../src/main/resources/queries-failsafe.hbm.xml | 2 + .../src/main/xmi/tutti-persistence.zargo | Bin 62463 -> 64820 bytes .../ifremer/tutti/service/PersistenceService.java | 9 +- .../multipost/IndividualObservationRow.java | 11 + .../multipost/IndividualObservationRowModel.java | 1 + .../catches/multipost/MultiPostConstants.java | 2 + .../catches/multipost/MultiPostExportContext.java | 312 ++++++ .../catches/multipost/MultiPostExportService.java | 619 +++-------- .../catches/multipost/MultiPostImportContext.java | 139 +++ .../catches/multipost/MultiPostImportService.java | 1157 +++++++------------- .../multipost/MultiPostExportServiceTest.java | 46 +- .../multipost/MultiPostImportServiceTest.java | 2 +- .../filtered-resources/tutti-help-fr.properties | 8 +- .../actions/ExportMultiPostBenthosAction.java | 2 +- .../operation/catches/species/SpeciesBatchUI.jaxx | 13 +- .../operation/catches/species/SpeciesBatchUI.jcss | 76 +- ....java => ExportMultiPostSpeciesFullAction.java} | 16 +- ...portMultiPostSpeciesOnlyFrequenciesAction.java} | 16 +- ...stSpeciesOnlyIndividualObservationsAction.java} | 16 +- ....java => ImportMultiPostSpeciesFullAction.java} | 16 +- ...portMultiPostSpeciesOnlyFrequenciesAction.java} | 16 +- ...stSpeciesOnlyIndividualObservationsAction.java} | 16 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 45 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 69 +- 31 files changed, 1446 insertions(+), 1400 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.