March 2016 - Tutti-commits - mailman.cloud.codelutin.com

branch feature/8061 deleted (was 8d211de)
by codelutin.com scm March 11, 2016

March 11, 2016

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 was 8d211de I18n The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/8061 updated (5200dbe -> 8d211de)
by codelutin.com scm March 11, 2016

March 11, 2016

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(a)codelutin.com>.

1 0

branch feature/8043 created (now b21ab75)
by codelutin.com scm March 11, 2016

March 11, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8043 in repository tutti. See http://git.codelutin.com/tutti.git at b21ab75 création du cache des prélèvements (refs #8043) This branch includes the following new commits: new b21ab75 création du cache des prélèvements (refs #8043) 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 b21ab75ed8881053288e32b49a069dae3986a0bb Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Mar 11 16:17:10 2016 +0100 création du cache des prélèvements (refs #8043) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch release/4.5-alpha-4 deleted (was 5dfa54b)
by codelutin.com scm March 10, 2016

March 10, 2016

This is an automated email from the git hooks/post-receive script. New change to branch release/4.5-alpha-4 in repository tutti. See http://git.codelutin.com/tutti.git was 5dfa54b Update help file The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (3dbf7f0 -> eb07adf)
by codelutin.com scm March 10, 2016

March 10, 2016

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 3dbf7f0 Fixes #8086 Merge branch 'feature/8086' into develop new 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 new b1ed75e [jgitflow-maven-plugin]updating poms for branch'release/4.5-alpha-4' with non-snapshot versions new 5dfa54b Update help file new 0686017 [jgitflow-maven-plugin]merging 'release/4.5-alpha-4' into 'master' new dec18ac [jgitflow-maven-plugin]merging 'master' into 'develop' new eb07adf [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 eb07adfdb28cb85f32d17d79ce376896366157d6 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Mar 10 16:57:20 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit dec18acb9c96c0d8846807c6dad1587fe4537fb6 Merge: 0df96ab 0686017 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Mar 10 16:57:19 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 0df96abdc0cb16e943e410bc727fe2e39c41a9cc Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Mar 10 16:57:19 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 068601705b01980abe3a59ad9b7ef2980a8748b3 Merge: 307bb66 5dfa54b Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Mar 10 16:57:17 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.5-alpha-4' into 'master' commit 5dfa54ba0521e293949549a778f094580bf0d128 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Mar 10 16:57:07 2016 +0100 Update help file commit b1ed75ee04f52f31fe9a5ed30663c3771e7fd7c6 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Mar 10 16:48:33 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.5-alpha-4' with non-snapshot versions Summary of changes: .../filtered-resources/tutti-help-fr.properties | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

branch release/4.5-alpha-4 updated (a7a9351 -> 5dfa54b)
by codelutin.com scm March 10, 2016

March 10, 2016

This is an automated email from the git hooks/post-receive script. New change to branch release/4.5-alpha-4 in repository tutti. See http://git.codelutin.com/tutti.git from 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 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-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../filtered-resources/tutti-help-fr.properties | 23 ++++++++++++++++++++++ 8 files changed, 30 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

annotated tag tutti-4.5-alpha-4 created (now fe69e13)
by codelutin.com scm March 10, 2016

March 10, 2016

This is an automated email from the git hooks/post-receive script. New change to annotated tag tutti-4.5-alpha-4 in repository tutti. See http://git.codelutin.com/tutti.git at fe69e13 (tag) tagging 068601705b01980abe3a59ad9b7ef2980a8748b3 (commit) replaces tutti-4.5-alpha-3 tagged by Maven Release on Thu Mar 10 16:57:17 2016 +0100 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 4.5-alpha-4 ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch master updated (307bb66 -> 0686017)
by codelutin.com scm March 10, 2016

March 10, 2016

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 307bb66 [jgitflow-maven-plugin]merging 'release/4.5-alpha-3' into 'master' adds 20fcb78 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 2e32317 [jgitflow-maven-plugin]merging 'master' into 'develop' adds d9b926e [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 2a34b8a vérification que le validator est valid avant de valider l'écran (fixes #8075) adds 67051d4 Merge branch 'feature/8075' into 'develop' adds a2e40c4 transformation du graph en line chart (refs #8038) adds 3ba861e ajout des points sur la ligne (refs #8038) adds c373dc9 Fixes #8038 Merge branch 'feature/8038' into develop adds 37be954 mauvais merge (refs #8081) adds ab8884d le poids n'etait pas supprimé des mensurations (refs #8081) adds acb42a2 suppression des lignes de mensuration quand le nombre est à zéro (fixes #8081) adds 0bc2e84 Fixes #8081 Merge branch 'feature/8081' into develop adds eb62181 ajout des valeurs par défaut des caractéristiques dans le modèle de table (refs #8063) adds c61affd on pousse les valeurs des catégorisations dans le modèle de table (fixes #8063) adds 9ffb12d fixes #8063 Merge branch 'feature/8063' into develop adds cd5e6d1 cinversion de condition adds c866d7b ajoute de la liste des psfm de maturite dans le protocol (refs #8085) adds 38c4627 multiplicité non prise en compte (refs #8063) adds 60722cc ajout des nouvelles methodes au modele (refs #8085) adds 2c117e6 ajout de l'onglet de psfm de maturité + branchement dans la table espèce (fixes #8085) adds 69c75c7 Merge branch 'feature/8085' into 'develop' 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 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' 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 | 5 + .../persistence/TuttiPersistenceNoDbImpl.java | 5 + .../persistence/entities/CaracteristicMap.java | 10 + .../entities/protocol/SpeciesProtocolBean.java | 4 +- .../CaracteristicPersistenceService.java | 2 + .../CaracteristicPersistenceServiceImpl.java | 9 + .../src/main/xmi/tutti-persistence.properties | 1 + .../src/main/xmi/tutti-persistence.zargo | Bin 62341 -> 62463 bytes tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/PersistenceService.java | 34 ++++ .../fr/ifremer/tutti/service/TuttiDataContext.java | 28 +++ tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../filtered-resources/tutti-help-fr.properties | 3 +- .../IndividualObservationBatchRowModel.java | 21 +- .../IndividualObservationBatchTableModel.java | 68 ++++++- .../frequency/SpeciesFrequencyRowModel.java | 9 + .../frequency/SpeciesFrequencyTableModel.java | 11 +- .../frequency/SpeciesFrequencyUIHandler.java | 223 +++++++++++++++------ .../species/frequency/SpeciesFrequencyUIModel.java | 5 +- .../actions/ApplySpeciesFrequencyRafaleAction.java | 65 +++--- .../frequency/actions/RemoveObservationAction.java | 3 + .../protocol/EditProtocolSpeciesRowModel.java | 28 +-- .../protocol/EditProtocolSpeciesTableModel.java | 2 +- .../ui/swing/content/protocol/EditProtocolUI.jaxx | 4 + .../ui/swing/content/protocol/EditProtocolUI.jcss | 15 +- .../content/protocol/EditProtocolUIHandler.java | 92 ++++++--- .../content/protocol/EditProtocolUIModel.java | 85 +++++++- .../MinSizePopupUIHandler.java | 6 +- .../protocol/zones/ZoneEditorUIHandler.java | 30 +-- .../util/table/CaracteristicColumnIdentifier.java | 4 + .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 37 files changed, 596 insertions(+), 192 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

[ANN] - Tutti 4.5-alpha-4 released
by codelutin.com Release Notification March 10, 2016

March 10, 2016

The Tutti team is pleased to announce the tutti-4.5-alpha-4 release! Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques. Documentation of the project can be found here: http://tutti.codelutin.com Changes ------- Changes in this version include: New features: o [MENSURATIONS] Graphique des poids moyens Issue: 8038. Thanks to Vincent BADTS. Resolved by kmorin. o [OBS INDIV] recopier les données obs indiv meme si il y a une dernière ligne de vide Issue: 8065. Thanks to Vincent BADTS. Resolved by kmorin. o [OBS INDIV] ajouter une colonne du psfm défini dans la colonne maturité de l'espèce dans le protocole Issue: 8086. Thanks to Kevin Morin. Resolved by kmorin. o [PROTOCOLE] Espece : la colonne type pièce calcifiée pointera vers le psfm dédié Issue: 8087. Thanks to Kevin Morin. Resolved by kmorin. o [PROTOCOLE] PSFM pour la maturité Issue: 8085. Thanks to Kevin Morin. Resolved by kmorin. Fixed Bugs: o [PROTOCOLE] erreur en ouvrant un protocole sans avoir pourtant cliquer sur l'option deprélèvmeent de pièces calcifiées Issue: 8064. Thanks to Vincent BADTS. Resolved by tchemit. o [ALGORITHME PRELEVEMENTS] ajouter un intervalle...ajouter une contrainte Issue: 8029. Thanks to Vincent BADTS. Resolved by tchemit. o Erreur à analyser Issue: 8055. Thanks to Vincent BADTS. Resolved by kmorin. o [OBS INDIV] non rafraichissement si modification d'une taille Issue: 8060. Thanks to Vincent BADTS. Resolved by kmorin. o [OBS INDIV] erreur recopie poids taille Issue: 8056. Thanks to Vincent BADTS. Resolved by kmorin. o [OBS INDIV] ouverture écran sur lot déjà sexé Issue: 8063. Thanks to Vincent BADTS. Resolved by kmorin. o [PROTOCOLE] Ajout possible de mauvais intervalle dans l'algo de prélèvement Issue: 8075. Thanks to Kevin Morin. Resolved by kmorin. o [OBS IND] lien ticket #8013 Issue: 8079. Thanks to Vincent BADTS. Resolved by kmorin. o [OBS INDIV] Problèmes de recopie Issue: 8081. Thanks to Kevin Morin. Resolved by kmorin. o [OBS IND] non recopie des tailles vers le tableau de gauche si saisie à droite avec option "seulement les tailles" Issue: 8084. Thanks to Vincent BADTS. Resolved by kmorin. Changes: o copie écran dans nouvelle forge sont illisibles ! Issue: 8080. Thanks to Vincent BADTS. Resolved by vbadts. Downloads --------- For a manual installation, you can download files here: https://forge.codelutin.com/projects/tutti/files * tutti-ichtyometer-4.5-alpha-4-tools.zip - https://forge.codelutin.com/attachments/download/3776 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti team

1 0

branch release/4.5-alpha-4 created (now a7a9351)
by codelutin.com scm March 10, 2016

March 10, 2016

This is an automated email from the git hooks/post-receive script. New change to branch release/4.5-alpha-4 in repository tutti. See http://git.codelutin.com/tutti.git at a7a9351 [jgitflow-maven-plugin]updating poms for 4.5-alpha-4 branch with snapshot versions This branch includes the following new commits: new a7a9351 [jgitflow-maven-plugin]updating poms for 4.5-alpha-4 branch with snapshot versions 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 a7a9351a84f63716bbad61b24dac6d85169f3c46 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Mar 10 16:40:47 2016 +0100 [jgitflow-maven-plugin]updating poms for 4.5-alpha-4 branch with snapshot versions -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1