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

branch master updated (c2ece40 -> 8e50a84)
by codelutin.com scm May 12, 2016

May 12, 2016

This is an automated email from the git hooks/post-receive script. New change to branch master in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from c2ece40 [jgitflow-maven-plugin]merging 'release/4.5.1' into 'master' adds ac2b6ec [jgitflow-maven-plugin]updating poms for 4.5.2-SNAPSHOT development adds f2ce96f [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds cd0b653 [jgitflow-maven-plugin]merging 'master' into 'develop' adds a56df78 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds c77e760 On force la sauvegarde du lot espèce à la sortie de l'écran mensurations (See #8305) adds a5b428e Livrable #8305 Merge branch 'feature/8305' into develop adds 7360c5e [jgitflow-maven-plugin]updating poms for branch'release/4.5.2' with non-snapshot versions adds 8e50a84 [jgitflow-maven-plugin]merging 'release/4.5.2' into 'master' No new revisions were added by this update. Summary of changes: pom.xml | 2 +- tutti-caliper/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 +- .../catches/species/frequency/SpeciesFrequencyCellComponent.java | 2 ++ 9 files changed, 10 insertions(+), 8 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.2 released
by codelutin.com Release Notification May 12, 2016

May 12, 2016

The Tutti team is pleased to announce the tutti-4.5.2 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: Fixed Bugs: o [CAPTURE] problème dans l'élévation des poids, les poids de plus bas niveau ne sont pas remontés automatiquement à la première élévation Issue: 8305. Thanks to Vincent BADTS. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: https://forge.codelutin.com/projects/tutti/files * tutti-ichtyometer-4.5.2-tools.zip - https://forge.codelutin.com/attachments/download/3923 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.2 created (now a5b428e)
by codelutin.com scm May 12, 2016

May 12, 2016

This is an automated email from the git hooks/post-receive script. New change to branch release/4.5.2 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at a5b428e Livrable #8305 Merge branch 'feature/8305' into develop 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 develop updated (a5b428e -> 4f14afd)
by codelutin.com scm May 12, 2016

May 12, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from a5b428e Livrable #8305 Merge branch 'feature/8305' into develop new 4f14afd [jgitflow-maven-plugin]updating poms for 4.5.3-SNAPSHOT development 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 4f14afd7c408ed02736cc59d96888a494b14ecf6 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu May 12 12:52:07 2016 +0200 [jgitflow-maven-plugin]updating poms for 4.5.3-SNAPSHOT development Summary of changes: pom.xml | 2 +- tutti-caliper/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 +- 8 files changed, 8 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (a56df78 -> a5b428e)
by codelutin.com scm May 12, 2016

May 12, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from a56df78 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new c77e760 On force la sauvegarde du lot espèce à la sortie de l'écran mensurations (See #8305) new a5b428e Livrable #8305 Merge branch 'feature/8305' into develop The 2 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 a5b428e7dff66b9883e78ba3e61942144e297fa9 Merge: a56df78 c77e760 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu May 12 12:44:29 2016 +0200 Livrable #8305 Merge branch 'feature/8305' into develop commit c77e7603a3690f28d1723cfe8ffad54c8f6de8e8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu May 12 12:44:26 2016 +0200 On force la sauvegarde du lot espèce à la sortie de l'écran mensurations (See #8305) Summary of changes: .../catches/species/frequency/SpeciesFrequencyCellComponent.java | 2 ++ 1 file changed, 2 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch release/4.5.1 deleted (was 76d5dd7)
by codelutin.com scm May 11, 2016

May 11, 2016

This is an automated email from the git hooks/post-receive script. New change to branch release/4.5.1 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git was 76d5dd7 [jgitflow-maven-plugin]updating poms for branch'release/4.5.1' with non-snapshot versions 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

annotated tag tutti-4.5.1 created (now cb272b6)
by codelutin.com scm May 11, 2016

May 11, 2016

This is an automated email from the git hooks/post-receive script. New change to annotated tag tutti-4.5.1 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at cb272b6 (tag) tagging c2ece40cda7139382a2e9829a1c9100e2988a407 (commit) replaces tutti-4.5 tagged by Maven Release on Wed May 11 18:46:01 2016 +0200 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 4.5.1 ----------------------------------------------------------------------- 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 develop updated (ac2b6ec -> a56df78)
by codelutin.com scm May 11, 2016

May 11, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from ac2b6ec [jgitflow-maven-plugin]updating poms for 4.5.2-SNAPSHOT development new f2ce96f [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 42f8073 Add missing license headers new 76d5dd7 [jgitflow-maven-plugin]updating poms for branch'release/4.5.1' with non-snapshot versions new c2ece40 [jgitflow-maven-plugin]merging 'release/4.5.1' into 'master' new cd0b653 [jgitflow-maven-plugin]merging 'master' into 'develop' new a56df78 [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 a56df78ac9e5b2acc533b862fc127fa2322b80ec Author: Maven Release <maven-release(a)codelutin.com> Date: Wed May 11 18:46:04 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit cd0b6538c5ef3bdfa06c0570cc528d0020e7e128 Merge: f2ce96f c2ece40 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed May 11 18:46:03 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit f2ce96f1c0970127832777ea09e555bf0d27744e Author: Maven Release <maven-release(a)codelutin.com> Date: Wed May 11 18:46:03 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit c2ece40cda7139382a2e9829a1c9100e2988a407 Merge: 275156c 76d5dd7 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed May 11 18:46:01 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.5.1' into 'master' commit 76d5dd719cb34f62f8052041248c956761038cf9 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed May 11 18:43:16 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.5.1' with non-snapshot versions commit 42f8073b8142acb9c0c89a9e8e018d15cbdffd38 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed May 11 18:43:09 2016 +0200 Add missing license headers Summary of changes: .../ProtocolCaracteristicsImportExportService.java | 24 ++++++++++++++++++++++ ...tocolCaracteristicsImportExportServiceTest.java | 24 ++++++++++++++++++++++ 2 files changed, 48 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.1 updated (f92468b -> 76d5dd7)
by codelutin.com scm May 11, 2016

May 11, 2016

This is an automated email from the git hooks/post-receive script. New change to branch release/4.5.1 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from f92468b Autoriser de lier une personne temporaire même si on la trouve plusieurs fois (See #8310) adds 42f8073 Add missing license headers adds 76d5dd7 [jgitflow-maven-plugin]updating poms for branch'release/4.5.1' with non-snapshot versions No new revisions were added by this update. Summary of changes: pom.xml | 2 +- tutti-caliper/pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../ProtocolCaracteristicsImportExportService.java | 24 ++++++++++++++++++++++ ...tocolCaracteristicsImportExportServiceTest.java | 24 ++++++++++++++++++++++ tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 10 files changed, 56 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch master updated (275156c -> c2ece40)
by codelutin.com scm May 11, 2016

May 11, 2016

This is an automated email from the git hooks/post-receive script. New change to branch master in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 275156c [jgitflow-maven-plugin]merging 'release/4.5' into 'master' adds f9b8891 [jgitflow-maven-plugin]updating poms for 4.5.1-SNAPSHOT development adds 786ad19 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 2f6103e [jgitflow-maven-plugin]merging 'master' into 'develop' adds ce25d23 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 88fd133 Livrable #8291 Mauvais éditeur sur le code de prélèvement adds e6f692b fix i18n typos adds ecba160 Ajout nouvelle méthode pour créer des CPSD adds cdafea2 Pourquoi moi ? le code écrit n'est jamais consulté :() adds 9d494d9 On arrête d'utiliser guava en faveur de java 8 adds 01f13d8 On recharge les ui après avoir charge le modèle adds 4869f1a o Revue des imports du protocole (pas tout, pas le temps...) o Nettoyage code o Bien importer les maturités + autres caractéristiques lors d'un import de caractéristiques sur le procole (See #8302, #8301) adds 9ec9d2e Introduction d'un nouveau service qui fait les import-exports des caractéristiques du protocole + correction import/export maturités (See #8301) adds 00a5751 Livrable #8301 Livrable #8302 Merge branch 'feature/8302' into develop adds 6898472 [TECHN] préciser dans le texte "login Extranet" quand on charge un référentiel (Livrable #8303) adds 28ab226 [ERGO] libellés à améliorer (Livrable #8306) adds 83e8129 Correction de l'id des lots à utiliser lors de l'import générique (Livrable #8309) adds f92468b Autoriser de lier une personne temporaire même si on la trouve plusieurs fois (See #8310) adds 42f8073 Add missing license headers adds 76d5dd7 [jgitflow-maven-plugin]updating poms for branch'release/4.5.1' with non-snapshot versions adds c2ece40 [jgitflow-maven-plugin]merging 'release/4.5.1' into 'master' No new revisions were added by this update. Summary of changes: pom.xml | 2 +- tutti-caliper/pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../CalcifiedPiecesSamplingDefinitions.java | 7 + .../protocol/CaracteristicMappingRows.java | 7 +- .../entities/protocol/CaracteristicType.java | 1 + .../entities/protocol/SpeciesProtocols.java | 20 +- .../entities/protocol/TuttiProtocols.java | 58 +-- .../referential/PersonPersistenceServiceImpl.java | 25 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- ...ormatter.java => StringSetParserFormatter.java} | 24 +- .../fr/ifremer/tutti/service/csv/TuttiCsvUtil.java | 3 + .../consumer/CsvConsumerForCatch.java | 2 +- .../FishingOperationImportService.java | 4 +- .../tutti/service/protocol/CaracteristicRow.java | 12 + .../service/protocol/CaracteristicRowModel.java | 60 ++- .../ProtocolCaracteristicsImportExportService.java | 283 ++++++++++++ .../protocol/ProtocolImportExportService.java | 481 ++++++++------------- .../service/pupitri/PupitriImportService.java | 38 +- .../resources/i18n/tutti-service_en_GB.properties | 1 + .../resources/i18n/tutti-service_fr_FR.properties | 5 +- ...tocolCaracteristicsImportExportServiceTest.java | 173 ++++++++ .../protocol/ProtocolImportExportServiceTest.java | 167 ++++--- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 5 + .../swing/content/config/TuttiConfigUIHandler.java | 320 +++++++------- .../actions/ExportAllCaracteristicAction.java | 7 +- .../actions/ExportProtocolCaracteristicAction.java | 14 +- .../actions/ImportProtocolCaracteristicAction.java | 38 +- .../actions/LoadProtocolImportColumnsAction.java | 4 +- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 30 +- 34 files changed, 1113 insertions(+), 692 deletions(-) copy tutti-service/src/main/java/fr/ifremer/tutti/service/csv/{IntegerListParserFormatter.java => StringSetParserFormatter.java} (65%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolCaracteristicsImportExportService.java create mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/ProtocolCaracteristicsImportExportServiceTest.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0