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

branch develop updated (6d1d0ff -> ac9c4fd)
by codelutin.com scm 12 Apr '16

12 Apr '16

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 6d1d0ff Moins utiliser les Optional + fix generic issue new 97ef38f Correction du test de validation (See #8237) new ac9c4fd Livrable #8237 Merge branch 'feature/8237' 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 ac9c4fdbc7f0b195e1e255844402f17aa0fd853c Merge: 6d1d0ff 97ef38f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 12 15:46:49 2016 +0200 Livrable #8237 Merge branch 'feature/8237' into develop commit 97ef38f674afe8db8eedf1b2c0fa594c6f402f6e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 12 15:46:46 2016 +0200 Correction du test de validation (See #8237) Summary of changes: .../species/frequency/SpeciesFrequencyUIModel-error-validation.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (76a7d22 -> 6d1d0ff)
by codelutin.com scm 12 Apr '16

12 Apr '16

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 76a7d22 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 6d1d0ff Moins utiliser les Optional + fix generic issue 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 6d1d0ff4fb430818c11d9fa24a7869317a7a8597 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 12 13:37:45 2016 +0200 Moins utiliser les Optional + fix generic issue Summary of changes: .../IndividualObservationBatchRowModel.java | 5 ----- .../frequency/IndividualObservationUICache.java | 19 +++++++++---------- .../species/frequency/SpeciesFrequencyUIHandler.java | 10 +++++----- 3 files changed, 14 insertions(+), 20 deletions(-) -- 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-rc-3 deleted (was de610b6)
by codelutin.com scm 12 Apr '16

12 Apr '16

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

branch develop updated (6de0bdc -> 76a7d22)
by codelutin.com scm 12 Apr '16

12 Apr '16

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 6de0bdc Livrable #8157 Merge branch 'feature/8157' into develop new 8477246 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 6de2446 [jgitflow-maven-plugin]updating poms for 4.5-rc-3 branch with snapshot versions new 61076f2 Add license header new de610b6 [jgitflow-maven-plugin]updating poms for branch'release/4.5-rc-3' with non-snapshot versions new 3f32dfd [jgitflow-maven-plugin]merging 'release/4.5-rc-3' into 'master' new 272d651 [jgitflow-maven-plugin]merging 'master' into 'develop' new 76a7d22 [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 76a7d22fc10177984782397027585b99f08dd013 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 12 13:17:49 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 272d6515c03d9eb9f9c2b3b893e4343feb8f3c41 Merge: 8477246 3f32dfd Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 12 13:17:43 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 847724690aec89367bbc85ccc711596b6eea8926 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 12 13:17:43 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 3f32dfdacdeeeaa65b74e109f4dd59d182d9162e Merge: e8d61cd de610b6 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 12 13:17:41 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.5-rc-3' into 'master' commit de610b6af341ef278358e0a59cd9607d579f0e92 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 12 13:15:05 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.5-rc-3' with non-snapshot versions commit 61076f2894fba435f7aa3491ba47ef123a6d637c Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 12 13:14:56 2016 +0200 Add license header Summary of changes: .../entities/referential/CaracteristicBean.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

annotated tag tutti-4.5-rc-3 created (now 1d2c6e4)
by codelutin.com scm 12 Apr '16

12 Apr '16

This is an automated email from the git hooks/post-receive script. New change to annotated tag tutti-4.5-rc-3 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at 1d2c6e4 (tag) tagging 3f32dfdacdeeeaa65b74e109f4dd59d182d9162e (commit) replaces tutti-4.5-rc-2 tagged by Maven Release on Tue Apr 12 13:17:42 2016 +0200 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 4.5-rc-3 ----------------------------------------------------------------------- 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 release/4.5-rc-3 updated (6de2446 -> de610b6)
by codelutin.com scm 12 Apr '16

12 Apr '16

This is an automated email from the git hooks/post-receive script. New change to branch release/4.5-rc-3 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 6de2446 [jgitflow-maven-plugin]updating poms for 4.5-rc-3 branch with snapshot versions adds 61076f2 Add license header adds de610b6 [jgitflow-maven-plugin]updating poms for branch'release/4.5-rc-3' with non-snapshot versions No new revisions were added by this update. Summary of changes: pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../entities/referential/CaracteristicBean.java | 24 ++++++++++++++++++++++ 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, 31 insertions(+), 7 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 (e8d61cd -> 3f32dfd)
by codelutin.com scm 12 Apr '16

12 Apr '16

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 e8d61cd [jgitflow-maven-plugin]merging 'release/4.5-rc-2' into 'master' adds ed4b64a [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds a87a0f3 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 24c70e7 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 5e82412 le poids rtp etait calculé meme quand le poids etait recopié depuis les observations individuelles (fixes #8225) adds 074584b Merge branch 'feature/8225' into 'develop' adds fd87d89 on supprime la colonne de maturité en fermant l'ui, pour avoir les même colonnes qu'à la création de l'écran (important pour la swing session) (fixes #8202) adds d8e19d2 Livrable #8202 Merge branch 'feature/8202' into develop adds bdb3c79 ajout d'une precondition pour eviter de decrementer une valeur à 0 (refs #8231) adds 1b40311 on ne stocke pas la caracteristique de maturité sur la ligne, on la passe à la méthode get (comme pour le sex) (refs #8231) adds 9dc3492 stockage de la caractéristique de maturité et de sexe sur le modèle (fixes #8231) adds c9dcaca Amélioration du code adds 1c4a770 livrable #8231 Merge branch 'feature/8231' into develop adds 34abc60 grand nettoyage de printemps + fixes #8232 adds 203236b Livrable #8232 Merge branch 'feature/8232' into develop adds e4156a9 Ajout étape lors du chargement de la saisie des captures adds aad91f9 Ne pas changer de ligne en appuyant sur Entrée dans le tableau des observations individuelles (See #8230) adds 0a3db77 Livrable #8230 Merge branch 'feature/8230' into develop adds dd3e083 bien remplir le benthos avec le... benthos (See #8234) + nettoyage code adds 3227fb7 Livrable #8234 Merge branch 'feature/8234' into develop adds 0c1b909 Ajout toString to Caracteristic adds 26cc892 Bien conserver l'ordre sur les caractéristiques (see #8233) adds a700d11 Mettre à jour l'ordre des caractéristiques sur les actions ↑ et ↓ (See #8233) adds c21a13e Livrable #8233 Merge branch 'feature/8233' into develop adds 2ced35f Vérifier qu'on peut quitter l'écran des mensurations si on tente de quitter l'opération en cours (uniquement sur les actions de changement d'opération) (see #8221) adds 9a32cf3 Livrable #8221 Merge branch 'feature/8221' into develop adds e2b48fc Suppression du veto sur le changement de screen (cela n'intervient pas au bon moment et il y a déjà une API pour gérer ça) (See #8190) adds a22c103 Livrable #8190 Merge branch 'feature/8190' into develop adds 74e40d3 Utilisation du bon identifiant pour supprimer un lot (See #8136) adds 4705d3f Ajout toString sur SampleData adds c09526f On ne peut supprimer que des observations qui ont une taille adds d7ebcc4 Livrable #8136 Merge branch 'feature/8136' into develop adds e47e9ad Ne pas tenir compte de l'algorithme si 1/n vaut 0 ou à sexer mais observation sans sexe (See #8228) adds 20e2e77 Ne pas utiliser d'optional à tout bout de champ (IndividualObservationUICache#samplingCache) adds efb7f63 Ne pas utiliser d'optional à tout bout de champ maturityQualitativeValue adds 988efaf Ne pas utiliser d'optional à tout bout de champ zone adds 8bccbbc Ne pas utiliser d'optional à tout bout de champ adds b2025da Ne pas utiliser d'optional à tout bout de champ (maturityColumnId) + meilleure gestion generics adds dd2d7b6 Fix npe quand recopie poids + suppression méthode inutile adds 0a7c166 Revue du code du cache et de l'export des pièces calcifiées adds 665a7a5 Ne plus utiliser des optional à tout bout de champs :( adds 7415cb5 Livrable #8228 Merge branch 'feature/8228' into develop adds 684e7ba Le sexe peut être null adds 0750156 on export les hits seulement si il y a eu des prélèvements (See #8157) adds 6de0bdc Livrable #8157 Merge branch 'feature/8157' into develop adds 6de2446 [jgitflow-maven-plugin]updating poms for 4.5-rc-3 branch with snapshot versions adds 61076f2 Add license header adds de610b6 [jgitflow-maven-plugin]updating poms for branch'release/4.5-rc-3' with non-snapshot versions adds 3f32dfd [jgitflow-maven-plugin]merging 'release/4.5-rc-3' 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 +- .../CaracteristicBean.java} | 12 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/PersistenceService.java | 6 +- .../service/export/cps/SamplingNumberRowModel.java | 13 +- .../tutti/service/sampling/CacheExtractedKey.java | 18 +- .../service/sampling/CruiseSamplingCache.java | 778 ++++++++++++--------- .../sampling/CruiseSamplingCacheLoader.java | 21 +- .../sampling/CruiseSamplingInternalCache.java | 32 +- .../tutti/service/sampling/SamplingEvent.java | 7 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 23 +- .../tutti/ui/swing/content/MainUIHandler.java | 56 +- .../content/actions/EditCatchesSupportAction.java | 8 +- .../catches/actions/ComputeBatchWeightsAction.java | 35 +- .../IndividualObservationBatchRowModel.java | 53 +- .../IndividualObservationBatchTableModel.java | 69 +- .../species/EditSpeciesBatchPanelUIHandler.java | 2 +- .../frequency/IndividualObservationUICache.java | 152 ++-- .../frequency/SpeciesFrequencyTableModel.java | 167 +++++ .../frequency/SpeciesFrequencyUIHandler.java | 305 +++----- .../species/frequency/SpeciesFrequencyUIModel.java | 84 ++- .../frequency/actions/RemoveObservationAction.java | 27 +- .../actions/EditFishingOperationAction.java | 31 + .../content/protocol/EditProtocolUIHandler.java | 11 + .../content/protocol/EditProtocolUIModel.java | 6 +- .../MoveDownCaracteristicMappingAction.java | 8 +- .../actions/MoveUpCaracteristicMappingAction.java | 8 +- .../util/table/AbstractTuttiTableUIHandler.java | 109 +-- .../util/table/CaracteristicColumnIdentifier.java | 4 +- 34 files changed, 1181 insertions(+), 878 deletions(-) copy tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/{protocol/ZoneBean.java => referential/CaracteristicBean.java} (64%) -- 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-rc-3 released
by codelutin.com Release Notification 12 Apr '16

12 Apr '16

The Tutti team is pleased to announce the tutti-4.5-rc-3 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 [OBSERVATIONS INDIVIDUELLES] toujours afficher une notification pour les taxons avec prélèvements Issue: 8152. Thanks to Vincent BADTS. Resolved by kmorin. o [REPORTING] export csv de l'état des prélèvements de pièces calcifiées Issue: 8157. Thanks to Vincent BADTS. Resolved by tchemit. o [OBSERVATIONS INDIVIDUELLES] garder en mémoire les prélèvements réels Issue: 8179. Thanks to Kevin Morin. Resolved by kmorin. Fixed Bugs: o [Protocole] Pas de Psfm maturité disponible Issue: 8226. Thanks to Anne-Sophie Cornou. Resolved by kmorin. o [OBSERVATIONS INDIVIDUELLES] Mauvais affichage de l'algo de prélèvement (-8) Issue: 8231. Thanks to Anne-Sophie Cornou. Resolved by tchemit. o [Observations individuelles] En mode recopie "Tout", tableau mensuration, le poids observé est additionnée au poids RTP Issue: 8225. Thanks to Anne-Sophie Cornou. Resolved by kmorin. o [PROTOCOLE] l'ordre des lignes dans Protocole/Caractéristique/Caractéristiques du trait n'est pas conservé après enregistrement Issue: 8233. Thanks to Vincent BADTS. Resolved by tchemit. o [OBSERVATIONS INDIVIDUELLES] Problème lorsque l'on veut quitter l'écran avec des modifications Issue: 8190. Thanks to Vincent BADTS. Resolved by tchemit. o [CAPTURES] Si l'élévation des poids n'est pas ok sur l'onglet benthos, on retrouve les données des espèces dans l'onglet benthos Issue: 8234. Thanks to Tony Chemit. Resolved by tchemit. o [OBSERVATIONS INDIVIDUELLES] En mode recopie tout la suppression d'une observation (sans poids) ne doit pas décrémenter les mensurations Issue: 8232. Thanks to Tony Chemit. Resolved by tchemit. o [OBSERVATIONS INDIVIDUELLES] La touche entrée ne doit pas changer la ligne sélectionnée Issue: 8230. Thanks to Tony Chemit. Resolved by tchemit. o [OBSERVATIONS INDIVIDUELLES] pas de message de confirmation quand on change de trait Issue: 8221. Thanks to Kevin Morin. Resolved by tchemit. o [OBSERVATIONS INDIVIDUELLES] pb saisie dans les observations Issue: 8228. Thanks to Anne-Sophie Cornou. Resolved by vbadts. o Erreur à analyser en supprimant plusieurs lignes du tableau espèces Issue: 8136. 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-rc-3-tools.zip - https://forge.codelutin.com/attachments/download/3854 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-rc-3 created (now 6de2446)
by codelutin.com scm 12 Apr '16

12 Apr '16

This is an automated email from the git hooks/post-receive script. New change to branch release/4.5-rc-3 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at 6de2446 [jgitflow-maven-plugin]updating poms for 4.5-rc-3 branch with snapshot versions This branch includes the following new commits: new 6de2446 [jgitflow-maven-plugin]updating poms for 4.5-rc-3 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 6de24467136e89f8f7335f495db3ac1cda153dee Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 12 13:11:07 2016 +0200 [jgitflow-maven-plugin]updating poms for 4.5-rc-3 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

branch develop updated (7415cb5 -> 6de0bdc)
by codelutin.com scm 12 Apr '16

12 Apr '16

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 7415cb5 Livrable #8228 Merge branch 'feature/8228' into develop new 684e7ba Le sexe peut être null new 0750156 on export les hits seulement si il y a eu des prélèvements (See #8157) new 6de0bdc Livrable #8157 Merge branch 'feature/8157' into develop The 3 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 6de0bdc325c8b65a5ecabbeacc06ae783988fa64 Merge: 7415cb5 0750156 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 12 13:06:21 2016 +0200 Livrable #8157 Merge branch 'feature/8157' into develop commit 075015654e732d480a2991c3a4c01824464d30c3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 12 13:06:17 2016 +0200 on export les hits seulement si il y a eu des prélèvements (See #8157) commit 684e7ba206cdfb3d67c2d0d4d6e52bb59232f9de Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 12 12:46:08 2016 +0200 Le sexe peut être null Summary of changes: .../service/export/cps/SamplingNumberRowModel.java | 2 +- .../service/sampling/CruiseSamplingInternalCache.java | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3