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

[tutti] annotated tag tutti-3.7.3 created (now 2c8a38c)
by codelutin.com scm Sept. 12, 2014

Sept. 12, 2014

This is an automated email from the git hooks/post-receive script. New change to annotated tag tutti-3.7.3 in repository tutti. See http://git.codelutin.com/tutti.git at 2c8a38c (tag) tagging e6e7c4e9bc54cdcd0275e57fc0444cbcb725ef17 (commit) replaces tutti-3.7.2 tagged by Maven Release on Fri Sep 12 08:45:55 2014 +0200 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 3.7.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

[tutti] branch release/3.7.3 updated (e66b6c8 -> b69873e)
by codelutin.com scm Sept. 12, 2014

Sept. 12, 2014

This is an automated email from the git hooks/post-receive script. New change to branch release/3.7.3 in repository tutti. See http://git.codelutin.com/tutti.git from e66b6c8 [jgitflow-maven-plugin]updating poms for branch '3.7.3' with snapshot versions adds ac55e81 fix release headers adds b69873e [jgitflow-maven-plugin]updating poms for branch'release/3.7.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 +- .../main/java/fr/ifremer/tutti/util/DateTimes.java | 24 ++++++++++++++++++++++ tutti-service/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 6 files changed, 29 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

[tutti] branch master updated (121d594 -> e6e7c4e)
by codelutin.com scm Sept. 12, 2014

Sept. 12, 2014

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 121d594 Merge branch 'release/3.7.2' adds 837e161 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds edc4144 Merge branch 'master' into develop adds 2f7ebe2 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 941e73e fixes #5749: [IMPORT] import psion ne passe pas si on renseigne le champ heure en face de date de début adds 156cb7c fixes #5748: [IMPORT] le message d'erreur sur import psion est a corriger adds 7a4bd15 fixes #5754: [EXPORT GENERIQUE] le benthos ne commence plus à 1001 mais à 1 dans la table catch/Num_Ordre_V_HV_H2 adds d1cdb0f fixes #5733 [TRAIT] à la création d'un trait, activer le champ "trait valide" fixes #5740 [CAPTURE] mieux gérer poids total et poids non trié adds 1837edc this should not have been commited adds 1712338 refs #5139 [CAPTURE] répéter le champ "poids sous échantillon" dans la fenêtre de saisie des mensurations adds 489d26b refs #5139 adds 8211d0d fixes #5139 [CAPTURE] répéter le champ "poids sous échantillon" dans la fenêtre de saisie des mensurations adds 300ee13 fixes #5728 [CONFIG] Erreur lors de l'enregistrement d'un changement de navire dans la configuration adds a09a9e3 updates jaxx, nuiton-utils and nuiton-config adds 6627017 fixes #5785: [TECHNIQUE] Revoir la documentation des mises à jour + Mise à jour des fichiers par version adds 2c0d6d8 fixes #5785: [TECHNIQUE] Revoir la documentation des mises à jour + Mise à jour des fichiers par version adds e66b6c8 [jgitflow-maven-plugin]updating poms for branch '3.7.3' with snapshot versions adds ac55e81 fix release headers adds b69873e [jgitflow-maven-plugin]updating poms for branch'release/3.7.3' with non-snapshot versions adds e6e7c4e Merge branch 'release/3.7.3' No new revisions were added by this update. Summary of changes: README.txt | 10 - pom.xml | 36 +- src/site/rst/update.rst.vm | 47 +- src/update/tutti-application-dev.properties | 66 --- src/update/tutti-application.properties | 4 - tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../core/dao/referential/pmfm/MatrixId2.java | 195 ------- .../core/dao/referential/pmfm/ObjectTypeCode2.java | 274 --------- .../adagio/core/dao/referential/pmfm/PmfmId2.java | 621 +++++---------------- .../dao/referential/pmfm/QualitativeValueId2.java | 246 -------- .../tutti/persistence/TuttiPersistenceImpl.java | 6 +- .../persistence/TuttiPersistenceNoDbImpl.java | 6 +- .../tutti/persistence/entities/TuttiEntities.java | 3 +- .../entities/protocol/TuttiProtocols.java | 19 +- .../AccidentalBatchPersistenceServiceImpl.java | 7 +- .../service/AttachmentPersistenceService.java | 8 +- .../service/AttachmentPersistenceServiceImpl.java | 8 +- .../service/CruisePersistenceServiceImpl.java | 17 +- .../FishingOperationPersistenceServiceImpl.java | 77 ++- ...dualObservationBatchPersistenceServiceImpl.java | 4 +- .../service/ReferentialPersistenceServiceImpl.java | 43 +- .../service/util/BatchPersistenceHelper.java | 26 +- .../persistence/service/util/BatchTreeHelper.java | 36 +- .../service/util/MeasurementPersistenceHelper.java | 8 +- .../service/util/SamplePersistenceHelper.java | 4 +- .../main/java/fr/ifremer/tutti/util/DateTimes.java | 70 +++ .../resources/tutti-db-enumerations.properties | 13 +- .../src/main/xmi/tutti-persistence.zargo | Bin 56716 -> 56700 bytes .../AttachmentPersistenceServiceWriteTest.java | 12 +- .../BenthosBatchPersistenceServiceReadTest.java | 4 +- .../BenthosBatchPersistenceServiceWriteTest.java | 20 +- .../SpeciesBatchPersistenceServiceReadTest.java | 4 +- .../SpeciesBatchPersistenceServiceWriteTest.java | 20 +- tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/PersistenceService.java | 8 +- .../service/catches/WeightComputingService.java | 5 +- ...rvice.java => WeightComputingService.java.orig} | 11 +- .../catches/multipost/MultiPostExportService.java | 14 +- .../catches/multipost/MultiPostImportService.java | 16 +- .../service/export/generic/CatchExportModel.java | 41 +- .../service/export/generic/OperationExportRow.java | 4 +- .../service/psionimport/PsionImportService.java | 42 +- .../pupitri/PupitriImportExportService.java | 10 +- .../fr/ifremer/tutti/service/pupitri/Signs.java | 17 +- .../ifremer/tutti/service/pupitri/SpeciesRow.java | 42 +- .../resources/i18n/tutti-service_en_GB.properties | 1 + .../resources/i18n/tutti-service_fr_FR.properties | 3 +- .../psionimport/PsionImportServiceTest.java | 4 +- tutti-ui-swing/pom.xml | 2 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 12 + .../tutti/ui/swing/action/ImportPupitriAction.java | 4 +- .../ui/swing/action/NewFishingOperationAction.java | 1 + .../category/EditSampleCategoryModelUIModel.java | 4 +- .../ui/swing/content/cruise/EditCruiseUIModel.java | 6 +- .../operation/EditFishingOperationUIHandler.java | 8 +- .../operation/EditFishingOperationUIModel.java | 6 +- .../operation/catches/EditCatchesUIModel.java | 6 +- .../accidental/AccidentalBatchRowModel.java | 6 +- .../catches/benthos/BenthosBatchRowModel.java | 16 +- .../frequency/BenthosFrequencyCellComponent.java | 1 + .../benthos/frequency/BenthosFrequencyUI.css | 14 +- .../benthos/frequency/BenthosFrequencyUI.jaxx | 5 +- .../frequency/BenthosFrequencyUIHandler.java | 3 +- .../benthos/frequency/BenthosFrequencyUIModel.java | 46 +- .../IndividualObservationBatchRowModel.java | 6 +- .../CreateIndividualObservationBatchUIHandler.java | 3 +- .../marinelitter/MarineLitterBatchRowModel.java | 6 +- .../catches/species/SpeciesBatchRowModel.java | 16 +- .../frequency/SpeciesFrequencyCellComponent.java | 1 + .../species/frequency/SpeciesFrequencyUI.css | 14 +- .../species/frequency/SpeciesFrequencyUI.jaxx | 5 +- .../frequency/SpeciesFrequencyUIHandler.java | 26 +- .../species/frequency/SpeciesFrequencyUIModel.java | 46 +- .../util/attachment/AttachmentModelAware.java | 4 +- .../swing/util/editor/TuttiLocationTableCell.java | 4 +- .../ui/swing/util/editor/VesselTableCell.java | 4 +- .../BenthosFrequencyUIModel-error-validation.xml | 11 + ...BenthosFrequencyUIModel-warning-validation.xml} | 9 +- .../SpeciesFrequencyUIModel-error-validation.xml | 11 + ...SpeciesFrequencyUIModel-warning-validation.xml} | 9 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 4 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 4 + 83 files changed, 772 insertions(+), 1689 deletions(-) delete mode 100644 src/update/tutti-application-dev.properties delete mode 100644 tutti-persistence/src/main/java/fr/ifremer/adagio/core/dao/referential/pmfm/MatrixId2.java delete mode 100644 tutti-persistence/src/main/java/fr/ifremer/adagio/core/dao/referential/pmfm/ObjectTypeCode2.java delete mode 100644 tutti-persistence/src/main/java/fr/ifremer/adagio/core/dao/referential/pmfm/QualitativeValueId2.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/util/DateTimes.java copy tutti-service/src/main/java/fr/ifremer/tutti/service/catches/{WeightComputingService.java => WeightComputingService.java.orig} (98%) copy tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/{cruise/EditCruiseUIModel-edit-warning-validation.xml => operation/catches/benthos/frequency/BenthosFrequencyUIModel-warning-validation.xml} (84%) copy tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/{cruise/EditCruiseUIModel-edit-warning-validation.xml => operation/catches/species/frequency/SpeciesFrequencyUIModel-warning-validation.xml} (84%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

[ANN] - Tutti 3.7.3 released
by codelutin.com Release Notification Sept. 12, 2014

Sept. 12, 2014

The Tutti team is pleased to announce the tutti-3.7.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: https://doc.codelutin.com/tutti Changes ------- Changes in this version include: New features: o [CAPTURE] répéter le champ "poids sous échantillon" dans la fenêtre de saisie des mensurations Issue: 5139. Thanks to Vincent BADTS. Resolved by kmorin. o [TRAIT] à la création d'un trait, activer le champ "trait valide" Issue: 5733. Thanks to Vincent BADTS. Resolved by kmorin. Fixed Bugs: o [CONFIG] Erreur lors de l'enregistrement d'un changement de navire dans la configuration Issue: 5728. Thanks to Vincent BADTS. Resolved by kmorin. o [EXPORT GENERIQUE] le benthos ne commence plus à 1001 mais à 1 dans la table catch/Num_Ordre_V_HV_H2 Issue: 5754. Thanks to Vincent BADTS. Resolved by tchemit. o [IMPORT] import psion ne passe pas si on renseigne le champ heure en face de date de début Issue: 5749. Thanks to Vincent BADTS. Resolved by tchemit. o [IMPORT] le message d'erreur sur import psion est a corriger Issue: 5748. Thanks to Vincent BADTS. Resolved by tchemit. o [CAPTURE] mieux gérer poids total et poids non trié Issue: 5740. Thanks to Vincent BADTS. Resolved by kmorin. o [EXPORT] export pupitri depuis protocole , mauvaise gestion des - (tirets) Issue: 5735. Thanks to Vincent BADTS. Resolved by tchemit. Changes: o [TECHNIQUE] Revoir la documentation des mises à jour + Mise à jour des fichiers par version Issue: 5785. Thanks to Tony Chemit. Resolved by tchemit. o Budgeter la possibilité pour Tony d'embarquer sur Thalassa pour aider à la prise en main de Tutti Issue: 5736. Thanks to Vincent BADTS. Resolved by jcouteau. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/tutti/files * tutti-ichtyometer-3.7.3-tools.zip - http://forge.codelutin.com/attachments/download/2261 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti team

1 0

[tutti] branch release/3.7.3 created (now e66b6c8)
by codelutin.com scm Sept. 12, 2014

Sept. 12, 2014

This is an automated email from the git hooks/post-receive script. New change to branch release/3.7.3 in repository tutti. See http://git.codelutin.com/tutti.git at e66b6c8 [jgitflow-maven-plugin]updating poms for branch '3.7.3' with snapshot versions This branch includes the following new commits: new e66b6c8 [jgitflow-maven-plugin]updating poms for branch '3.7.3' 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 e66b6c8fa6b49e37c1a3b57685193dca96faf34e Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Sep 12 08:36:58 2014 +0200 [jgitflow-maven-plugin]updating poms for branch '3.7.3' with snapshot versions -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

[tutti] branch develop updated (6627017 -> 2c0d6d8)
by codelutin.com scm Sept. 12, 2014

Sept. 12, 2014

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 6627017 fixes #5785: [TECHNIQUE] Revoir la documentation des mises à jour + Mise à jour des fichiers par version new 2c0d6d8 fixes #5785: [TECHNIQUE] Revoir la documentation des mises à jour + Mise à jour des fichiers par version 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 2c0d6d880ed7e7319293b862eb2b4d2f1a9b3247 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Sep 12 08:34:08 2014 +0200 fixes #5785: [TECHNIQUE] Revoir la documentation des mises à jour + Mise à jour des fichiers par version Summary of changes: src/update/tutti-application-dev.properties | 66 ----------------------------- src/update/tutti-application.properties | 4 -- 2 files changed, 70 deletions(-) delete mode 100644 src/update/tutti-application-dev.properties -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

[tutti] branch develop updated (a09a9e3 -> 6627017)
by codelutin.com scm Sept. 12, 2014

Sept. 12, 2014

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 a09a9e3 updates jaxx, nuiton-utils and nuiton-config new 6627017 fixes #5785: [TECHNIQUE] Revoir la documentation des mises à jour + Mise à jour des fichiers par version 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 66270176a39eafdd81231860e4b58871e4c9037e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Sep 12 08:33:39 2014 +0200 fixes #5785: [TECHNIQUE] Revoir la documentation des mises à jour + Mise à jour des fichiers par version Summary of changes: README.txt | 10 ---------- pom.xml | 28 ++++++++++++++++++++------- src/site/rst/update.rst.vm | 47 ++++++++++++---------------------------------- 3 files changed, 33 insertions(+), 52 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

[tutti] branch develop updated (300ee13 -> a09a9e3)
by codelutin.com scm Sept. 11, 2014

Sept. 11, 2014

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 300ee13 fixes #5728 [CONFIG] Erreur lors de l'enregistrement d'un changement de navire dans la configuration new a09a9e3 updates jaxx, nuiton-utils and nuiton-config 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 a09a9e384e232c569522542aa872c9bde1ae2fe6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Sep 11 21:37:59 2014 +0200 updates jaxx, nuiton-utils and nuiton-config Summary of changes: pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

[tutti] branch develop updated (8211d0d -> 300ee13)
by codelutin.com scm Sept. 11, 2014

Sept. 11, 2014

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 8211d0d fixes #5139 [CAPTURE] répéter le champ "poids sous échantillon" dans la fenêtre de saisie des mensurations new 300ee13 fixes #5728 [CONFIG] Erreur lors de l'enregistrement d'un changement de navire dans la configuration 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 300ee13f811fffa08ce789d7d02aecd8e589dcae Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Sep 11 17:43:18 2014 +0200 fixes #5728 [CONFIG] Erreur lors de l'enregistrement d'un changement de navire dans la configuration Summary of changes: pom.xml | 6 +++--- .../main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 12 ++++++++++++ .../tutti/ui/swing/util/editor/TuttiLocationTableCell.java | 4 ++-- .../ifremer/tutti/ui/swing/util/editor/VesselTableCell.java | 4 ++-- 4 files changed, 19 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

[tutti] branch feature/sampleWeightInFrequencies deleted (was eaa52b2)
by codelutin.com scm Sept. 11, 2014

Sept. 11, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/sampleWeightInFrequencies in repository tutti. See http://git.codelutin.com/tutti.git was eaa52b2 fixes #5139 [CAPTURE] répéter le champ "poids sous échantillon" dans la fenêtre de saisie des mensurations This change permanently discards the following revisions: discards eaa52b2 fixes #5139 [CAPTURE] répéter le champ "poids sous échantillon" dans la fenêtre de saisie des mensurations discards 610d2a7 refs #5139 discards bd5c94c refs #5139 [CAPTURE] répéter le champ "poids sous échantillon" dans la fenêtre de saisie des mensurations -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0