This is an automated email from the git hooks/post-receive script. New change to branch feature/8061 in repository tutti. See http://git.codelutin.com/tutti.git discards 5200dbe Fix api discards 5d26817 Ajout des actions pour l'import-export multi-poste sur l'écran des espèces (See #8061) discards e3a10a0 Début de revue de l'import multi-poste discards fe5868c Revue de l'export multi-poste adds 4f633f8 tri des double listes à l'ouverture du protocole adds 10d996b ne pas ajouter de ligne de mensuration en rafale quand on est en mode de recopie adds 5d0b271 on vérifie que la strate est dans les strates disponibles avant d'essayer de la retirer et de retirer ses fils. Si elle n'y est pas (ce qui arrive au lancement de l'ecran) alors on la retire pas (fixes #8055) adds 0465652 Use method reference adds 7feb110 Remove unused code adds 8dadcbf Fixes #8055 Merge branch 'feature/8055' into develop adds 182a195 espèces du protocole : remplacement du du pmfm de type de pieces calcifiées par une caracteristicvalue. On propose donc les valeurs qualitative du psfm de type de piece calcifiée. Comme il n'existe pas, j'ai pris au hasard le psfm d'id 6, il faudra le modifier quand on aura la psfm (fixes #8087) adds 155ec4e Fixes #8087 Merge branch 'feature/8087' into develop adds 5d99913 on enlève de l'univers des maturités les psfm sélectionnés dans les autres onglets, et on vice versa (fixes #8085) adds f57e81c Fixes #8085 Merge branch 'feature/8085_univers-disjoint' into develop adds 8192678 ajout des caracteristiques de maturité dans le datacontext (refs #8086) adds b72b337 ajout de la colonne de maturité dynamiquement si elle est présente pour l'espèce (fixes #8086) adds 3dbf7f0 Fixes #8086 Merge branch 'feature/8086' into develop adds 0df96ab [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds a7a9351 [jgitflow-maven-plugin]updating poms for 4.5-alpha-4 branch with snapshot versions adds b1ed75e [jgitflow-maven-plugin]updating poms for branch'release/4.5-alpha-4' with non-snapshot versions adds 5dfa54b Update help file adds 0686017 [jgitflow-maven-plugin]merging 'release/4.5-alpha-4' into 'master' 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 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (5200dbe) \ N -- N -- N refs/heads/feature/8061 (8d211de) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. No new revisions were added by this update. Summary of changes: .../tutti/persistence/TuttiPersistenceImpl.java | 14 +- .../persistence/TuttiPersistenceNoDbImpl.java | 12 +- .../entities/data/SampleCategoryModel.java | 21 + .../entities/protocol/SpeciesProtocolBean.java | 4 +- .../service/AccidentalBatchPersistenceService.java | 2 +- .../AccidentalBatchPersistenceServiceImpl.java | 2 +- ...dividualObservationBatchPersistenceService.java | 4 + ...dualObservationBatchPersistenceServiceImpl.java | 192 ++-- .../CaracteristicPersistenceService.java | 2 + .../CaracteristicPersistenceServiceImpl.java | 9 + .../src/main/resources/queries-failsafe.hbm.xml | 2 + .../src/main/xmi/tutti-persistence.zargo | Bin 62423 -> 64820 bytes .../ifremer/tutti/service/PersistenceService.java | 43 +- .../fr/ifremer/tutti/service/TuttiDataContext.java | 28 + .../multipost/IndividualObservationRow.java | 11 + .../multipost/IndividualObservationRowModel.java | 1 + .../catches/multipost/MultiPostExportContext.java | 12 + .../catches/multipost/MultiPostExportService.java | 27 +- .../catches/multipost/MultiPostImportContext.java | 139 +++ .../catches/multipost/MultiPostImportService.java | 1174 +++++++------------- .../filtered-resources/tutti-help-fr.properties | 23 + .../IndividualObservationBatchRowModel.java | 12 + .../IndividualObservationBatchTableModel.java | 32 + .../actions/ImportMultiPostSpeciesFullAction.java | 4 +- .../frequency/SpeciesFrequencyUIHandler.java | 178 ++- .../actions/ApplySpeciesFrequencyRafaleAction.java | 65 +- .../protocol/EditProtocolSpeciesRowModel.java | 28 +- .../protocol/EditProtocolSpeciesTableModel.java | 2 +- .../content/protocol/EditProtocolUIHandler.java | 68 +- .../content/protocol/EditProtocolUIModel.java | 16 +- .../protocol/zones/ZoneEditorUIHandler.java | 30 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 2 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 17 +- 33 files changed, 1136 insertions(+), 1040 deletions(-) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportContext.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.