This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from eb07adf [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds faf58c6 Revue de l'export multi-poste adds f978ee3 Début de revue de l'import multi-poste adds 1053984 Ajout des actions pour l'import-export multi-poste sur l'écran des espèces (See #8061) adds ffc4503 Fix api adds db4c1c0 Ajout d'un nouveau contrat CaracteristicsAware adds 168bd6f Optimize Accidental catches import adds 59b7124 Renommage clef i18n adds 5497db1 Revue de la récupération et sauvegarde des observations individuelles adds c591dfd Bien exporter aussi le species Batch id adds e5cfcdb Revue de l'import multi-poste + codage pour les observations individuelles adds 8d211de I18n new dc52936 Refs #8061 (l'import/export au niveau des lots espèces est ok) Merge branch 'feature/8061' into develop 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 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 Summary of changes: .../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(-) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportContext.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportContext.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/{ExportMultiPostSpeciesAction.java => ExportMultiPostSpeciesFullAction.java} (77%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/{ExportMultiPostSpeciesAction.java => ExportMultiPostSpeciesOnlyFrequenciesAction.java} (74%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/{ExportMultiPostSpeciesAction.java => ExportMultiPostSpeciesOnlyIndividualObservationsAction.java} (72%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/{ImportMultiPostSpeciesAction.java => ImportMultiPostSpeciesFullAction.java} (86%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/{ImportMultiPostSpeciesAction.java => ImportMultiPostSpeciesOnlyFrequenciesAction.java} (84%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/{ImportMultiPostSpeciesAction.java => ImportMultiPostSpeciesOnlyIndividualObservationsAction.java} (83%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.