This is an automated email from the git hooks/post-receive script. New change to branch master in repository tutti. See http://git.codelutin.com/tutti.git from 0686017 [jgitflow-maven-plugin]merging 'release/4.5-alpha-4' into 'master' adds 0df96ab [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds dec18ac [jgitflow-maven-plugin]merging 'master' into 'develop' adds 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 adds dc52936 Refs #8061 (l'import/export au niveau des lots espèces est ok) Merge branch 'feature/8061' into develop adds bf60870 Ajout de nouvelles requetes pour récupérer toutes les observation individuelles d'un trait (pour la suppression) adds a5abb23 Meilleur API de suppression des pièces jointes adds 57153a3 Suppression des observations individuelles sur un lot ou un trait (See #8114) adds c883030 Implements persistence API adds 65ac7cc Fixes #8114 Merge branch 'feature/8114' into develop adds ed5a12f Ajout de la colonne maturité même s'il n'y a pas d'observations individuelles encore présentes (See #8118) adds 9f19d6d Fixes #8118 Merge branch 'feature/8118' into develop adds bb7298d Ave Cesar... adds 6e7d6b8 On met tous les classes d'import/export csv dans un paquetage csv + import/export sur un lot (See #8119) adds 29caf78 réusinage actions d'import sur le trait adds 98fc416 Import/export au niveau d'un lot (See #8119) adds 6181678 Ajout avertissement avant import multi-poste si des données existent (See #8119) adds 18ce0bf Fixes #8119 Merge branch 'feature/8119' into develop adds efe7f4c option pour ne plus mettre de classe de taille par défaut sur les lignes de mensuration si c'est calculé (fixes #8056) adds 4fb61ce I18n adds 59d368b Fixes #8056 Merge branch 'feature/8056' into develop adds ea5bb50 on cherche la classe de taille dans les observations individuelles en plus des mensurations (au cas où il n'y ait pas de mensurations) adds 20120fd Bien calculer l'action corriger une espèce (See #8121) adds eebc867 renommage methode (refs #8121) adds 4a57b27 Merge branch 'feature/8121' into 'develop' adds 2960ff5 on ne prend pas en compte les caractéristiques par défaut pour chcker si une ligne est vide (fixes #8125) adds 4077f3c Fixes #8107 Merge branch 'feature/8107' into develop adds 6b28b54 mettre l'axe des y du graph poids moyens en gramme et préciser l'unité sur l'axe des x (fixes #8117) adds d270e83 Fixes #8117 Merge branch 'feature/8117' into develop adds 43c8586 le modele n'est valide que si les poids sont tous saisis en mode de recopie "tout" (fixes #8113) adds 5f648dc on ajoute un listener sur les lignes en erreur pour mettre a jour la validation du modele (fixes #8113) adds adcc047 Fix i18n adds a599aa2 Fix JavaBean API adds b96f7da Fixes #8113 Merge branch 'feature/8113-v2' into develop adds b5977b9 [jgitflow-maven-plugin]updating poms for 4.5-beta-1 branch with snapshot versions adds 6bff97f add missing license headers adds e3635be [jgitflow-maven-plugin]updating poms for branch'release/4.5-beta-1' with non-snapshot versions adds 873e52d [jgitflow-maven-plugin]merging 'release/4.5-beta-1' into 'master' adds 98d8b79 [jgitflow-maven-plugin]updating poms for 4.5-alpha-5 branch with snapshot versions adds cdc26ba [jgitflow-maven-plugin]updating poms for branch'release/4.5-alpha-5' with non-snapshot versions adds 89f8bc7 add missing license headers adds da778e8 Fix release merge No new revisions were added by this update. Summary of changes: pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../tutti/persistence/TuttiPersistenceImpl.java | 26 +- .../persistence/TuttiPersistenceNoDbImpl.java | 25 +- .../persistence/entities/CaracteristicMap.java | 8 +- .../entities/data/SampleCategoryModel.java | 21 + .../service/AccidentalBatchPersistenceService.java | 2 +- .../AccidentalBatchPersistenceServiceImpl.java | 2 +- .../service/AttachmentPersistenceService.java | 15 +- .../service/AttachmentPersistenceServiceImpl.java | 13 +- .../FishingOperationPersistenceServiceImpl.java | 4 +- ...dividualObservationBatchPersistenceService.java | 15 +- ...dualObservationBatchPersistenceServiceImpl.java | 262 ++-- .../service/util/BatchPersistenceHelper.java | 47 +- .../service/util/SamplePersistenceHelper.java | 37 +- .../java/fr/ifremer/tutti/type/WeightUnit.java | 6 + .../src/main/resources/queries-failsafe.hbm.xml | 22 +- .../src/main/xmi/tutti-persistence.zargo | Bin 62463 -> 64820 bytes tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/PersistenceService.java | 27 +- .../catches/multipost/MultiPostConstants.java | 2 + .../catches/multipost/MultiPostExportContext.java | 355 +++++ .../catches/multipost/MultiPostExportService.java | 694 +++------ .../catches/multipost/MultiPostImportContext.java | 165 +++ .../catches/multipost/MultiPostImportService.java | 1538 ++++++++++---------- .../{ => csv}/AbstractFishingOperationRow.java | 2 +- .../AbstractFishingOperationRowModel.java | 12 +- .../multipost/{ => csv}/AccidentalCatchRow.java | 13 +- .../{ => csv}/AccidentalCatchRowModel.java | 28 +- .../catches/multipost/{ => csv}/AttachmentRow.java | 9 +- .../multipost/{ => csv}/AttachmentRowModel.java | 19 +- .../multipost/{ => csv}/CaracteristicRow.java | 8 +- .../multipost/{ => csv}/CaracteristicRowModel.java | 19 +- .../catches/multipost/{ => csv}/CatchBatchRow.java | 2 +- .../multipost/{ => csv}/CatchBatchRowModel.java | 5 +- .../multipost/{ => csv}/CatchFrequencyRow.java | 22 +- .../{ => csv}/CatchFrequencyRowModel.java | 22 +- .../catches/multipost/{ => csv}/CatchRow.java | 15 +- .../catches/multipost/{ => csv}/CatchRowModel.java | 21 +- .../multipost/{ => csv}/CatchWeightsRow.java | 2 +- .../multipost/{ => csv}/CatchWeightsRowModel.java | 5 +- .../multipost/{ => csv}/FishingOperationRow.java | 2 +- .../{ => csv}/FishingOperationRowModel.java | 6 +- .../{ => csv}/IndividualObservationRow.java | 23 +- .../{ => csv}/IndividualObservationRowModel.java | 20 +- .../multipost/{ => csv}/MarineLitterRow.java | 11 +- .../multipost/{ => csv}/MarineLitterRowModel.java | 19 +- .../multipost/{ => csv}/MarineLitterWeightRow.java | 2 +- .../{ => csv}/MarineLitterWeightRowModel.java | 5 +- .../GenericformatImportPersistenceHelper.java | 2 +- .../resources/i18n/tutti-service_en_GB.properties | 1 + .../resources/i18n/tutti-service_fr_FR.properties | 1 + .../multipost/MultiPostExportServiceTest.java | 46 +- .../multipost/MultiPostImportServiceTest.java | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../filtered-resources/tutti-help-fr.properties | 14 +- .../content/operation/catches/EditCatchesUI.jcss | 4 + .../operation/catches/EditCatchesUIHandler.java | 3 +- .../actions/ImportMultiPostActionSupport.java | 2 +- .../actions/ExportMultiPostBenthosAction.java | 2 +- .../IndividualObservationBatchRowModel.java | 17 +- .../IndividualObservationBatchTableModel.java | 3 + .../catches/species/SpeciesBatchRowModel.java | 39 +- .../operation/catches/species/SpeciesBatchUI.jaxx | 13 +- .../operation/catches/species/SpeciesBatchUI.jcss | 76 +- .../catches/species/SpeciesBatchUIHandler.java | 8 +- ....java => ExportMultiPostSpeciesFullAction.java} | 20 +- ...portMultiPostSpeciesOnlyFrequenciesAction.java} | 20 +- ...stSpeciesOnlyIndividualObservationsAction.java} | 20 +- ....java => ImportMultiPostSpeciesFullAction.java} | 40 +- ...portMultiPostSpeciesOnlyFrequenciesAction.java} | 40 +- ...stSpeciesOnlyIndividualObservationsAction.java} | 40 +- ...va => ImportMultiPostSpeciesSupportAction.java} | 40 +- .../frequency/SpeciesFrequencyCellComponent.java | 2 +- .../frequency/SpeciesFrequencyTableModel.java | 19 +- .../species/frequency/SpeciesFrequencyUI.jaxx | 18 + .../species/frequency/SpeciesFrequencyUI.jcss | 88 ++ .../frequency/SpeciesFrequencyUIHandler.java | 97 +- .../species/frequency/SpeciesFrequencyUIModel.java | 49 +- .../actions/ExportMultiPostSpeciesFullAction.java} | 30 +- ...portMultiPostSpeciesOnlyFrequenciesAction.java} | 30 +- ...stSpeciesOnlyIndividualObservationsAction.java} | 30 +- .../actions/ImportMultiPostSpeciesFullAction.java} | 44 +- ...portMultiPostSpeciesOnlyFrequenciesAction.java} | 44 +- ...stSpeciesOnlyIndividualObservationsAction.java} | 44 +- .../ImportMultiPostSpeciesSupportAction.java | 157 ++ .../frequency/actions/RemoveObservationAction.java | 12 +- .../SpeciesFrequencyUIModel-error-validation.xml | 9 + .../resources/i18n/tutti-ui-swing_en_GB.properties | 89 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 113 +- 93 files changed, 2998 insertions(+), 1922 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 rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/AbstractFishingOperationRow.java (97%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/AbstractFishingOperationRowModel.java (81%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/AccidentalCatchRow.java (98%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/AccidentalCatchRowModel.java (73%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/AttachmentRow.java (97%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/AttachmentRowModel.java (81%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CaracteristicRow.java (96%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CaracteristicRowModel.java (77%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CatchBatchRow.java (98%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CatchBatchRowModel.java (93%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CatchFrequencyRow.java (87%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CatchFrequencyRowModel.java (70%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CatchRow.java (98%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CatchRowModel.java (83%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CatchWeightsRow.java (97%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CatchWeightsRowModel.java (91%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/FishingOperationRow.java (94%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/FishingOperationRowModel.java (88%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/IndividualObservationRow.java (90%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/IndividualObservationRowModel.java (75%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/MarineLitterRow.java (97%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/MarineLitterRowModel.java (76%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/MarineLitterWeightRow.java (95%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/MarineLitterWeightRowModel.java (90%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/{ExportMultiPostSpeciesAction.java => ExportMultiPostSpeciesFullAction.java} (74%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/{ExportMultiPostSpeciesAction.java => ExportMultiPostSpeciesOnlyFrequenciesAction.java} (72%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/{ExportMultiPostSpeciesAction.java => ExportMultiPostSpeciesOnlyIndividualObservationsAction.java} (70%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/{ExportMultiPostSpeciesAction.java => ImportMultiPostSpeciesFullAction.java} (52%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/{ExportMultiPostSpeciesAction.java => ImportMultiPostSpeciesOnlyFrequenciesAction.java} (52%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/{ExportMultiPostSpeciesAction.java => ImportMultiPostSpeciesOnlyIndividualObservationsAction.java} (52%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/{ImportMultiPostSpeciesAction.java => ImportMultiPostSpeciesSupportAction.java} (71%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{actions/ExportMultiPostSpeciesAction.java => frequency/actions/ExportMultiPostSpeciesFullAction.java} (63%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{actions/ExportMultiPostSpeciesAction.java => frequency/actions/ExportMultiPostSpeciesOnlyFrequenciesAction.java} (61%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{actions/ExportMultiPostSpeciesAction.java => frequency/actions/ExportMultiPostSpeciesOnlyIndividualObservationsAction.java} (60%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{actions/ExportMultiPostSpeciesAction.java => frequency/actions/ImportMultiPostSpeciesFullAction.java} (51%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{actions/ExportMultiPostSpeciesAction.java => frequency/actions/ImportMultiPostSpeciesOnlyFrequenciesAction.java} (51%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{actions/ExportMultiPostSpeciesAction.java => frequency/actions/ImportMultiPostSpeciesOnlyIndividualObservationsAction.java} (51%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ImportMultiPostSpeciesSupportAction.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.