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

[tutti] branch develop updated (7a4bd15 -> d1cdb0f)
by codelutin.com scm Sept. 10, 2014

Sept. 10, 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 7a4bd15 fixes #5754: [EXPORT GENERIQUE] le benthos ne commence plus à 1001 mais à 1 dans la table catch/Num_Ordre_V_HV_H2 new 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é 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 d1cdb0f8a67100360825818bcff56cfa93a9e06d Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Sep 10 19:30:42 2014 +0200 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é Summary of changes: .../fr/ifremer/tutti/service/catches/WeightComputingService.java | 7 +++---- .../src/main/resources/i18n/tutti-service_en_GB.properties | 1 + .../src/main/resources/i18n/tutti-service_fr_FR.properties | 1 + .../ifremer/tutti/ui/swing/action/NewFishingOperationAction.java | 1 + .../catches/species/frequency/SpeciesFrequencyUIHandler.java | 5 +++-- 5 files changed, 9 insertions(+), 6 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 updated (bd5c94c -> 610d2a7)
by codelutin.com scm Sept. 10, 2014

Sept. 10, 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 from bd5c94c refs #5139 [CAPTURE] répéter le champ "poids sous échantillon" dans la fenêtre de saisie des mensurations new 610d2a7 refs #5139 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 610d2a76f4a120edd576506fb1d121b5a3f29bdf Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Sep 10 14:51:33 2014 +0200 refs #5139 Summary of changes: .../catches/benthos/frequency/BenthosFrequencyCellComponent.java | 2 +- .../catches/species/frequency/SpeciesFrequencyCellComponent.java | 2 +- 2 files changed, 2 insertions(+), 2 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 created (now bd5c94c)
by codelutin.com scm Sept. 10, 2014

Sept. 10, 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 at bd5c94c refs #5139 [CAPTURE] répéter le champ "poids sous échantillon" dans la fenêtre de saisie des mensurations This branch includes the following new commits: new bd5c94c refs #5139 [CAPTURE] répéter le champ "poids sous échantillon" dans la fenêtre de saisie des mensurations 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 bd5c94c54d0450492cc1394c717bebfb3961462c Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Sep 10 14:01:19 2014 +0200 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 1

[tutti] branch feature/importBigfin updated (44e4500 -> 483e0de)
by codelutin.com scm Sept. 9, 2014

Sept. 9, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/importBigfin in repository tutti. See http://git.codelutin.com/tutti.git from 44e4500 refs #5411 [CAPTURE] Import BIGFIN new 483e0de refs #5411 [CAPTURE] Import BIGFIN 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 483e0dedd4bc38bd18cbdd2af8de24cdd4db2bd6 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Sep 9 07:57:22 2014 +0200 refs #5411 [CAPTURE] Import BIGFIN Summary of changes: .../persistence/entities/data/SpeciesBatchs.java | 21 ++ .../i18n/tutti-persistence_en_GB.properties | 1 + .../i18n/tutti-persistence_fr_FR.properties | 1 + .../tutti/service/bigfin/BigfinImportResult.java | 32 +- .../tutti/service/bigfin/BigfinImportService.java | 405 ++++++++++++--------- .../fr/ifremer/tutti/service/bigfin/Signs.java | 44 +++ .../resources/i18n/tutti-service_en_GB.properties | 5 + .../resources/i18n/tutti-service_fr_FR.properties | 4 + .../service/bigfin/BigfinImportServiceTest.java | 91 +++-- .../tutti/ui/swing/action/ImportBigfinAction.java | 25 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 5 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 10 +- 12 files changed, 405 insertions(+), 239 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SpeciesBatchs.java -- 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 (156cb7c -> 7a4bd15)
by codelutin.com scm Sept. 8, 2014

Sept. 8, 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 156cb7c fixes #5748: [IMPORT] le message d'erreur sur import psion est a corriger new 7a4bd15 fixes #5754: [EXPORT GENERIQUE] le benthos ne commence plus à 1001 mais à 1 dans la table catch/Num_Ordre_V_HV_H2 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 7a4bd15b280fe5b92111c501f35c418d97b407d5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Sep 8 15:30:44 2014 +0200 fixes #5754: [EXPORT GENERIQUE] le benthos ne commence plus à 1001 mais à 1 dans la table catch/Num_Ordre_V_HV_H2 Summary of changes: .../service/export/generic/CatchExportModel.java | 41 ++++++++-------------- 1 file changed, 15 insertions(+), 26 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/importBigfin created (now 44e4500)
by codelutin.com scm Sept. 5, 2014

Sept. 5, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/importBigfin in repository tutti. See http://git.codelutin.com/tutti.git at 44e4500 refs #5411 [CAPTURE] Import BIGFIN This branch includes the following new commits: new 6907a51 refs #5411 [CAPTURE] Import BIGFIN new 0d40dce refs #5411 [CAPTURE] Import BIGFIN new 7ea21c9 refs #5411 [CAPTURE] Import BIGFIN new 44e4500 refs #5411 [CAPTURE] Import BIGFIN The 4 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 44e4500599da24c67f7d8314b0104fb95883dfd0 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Sep 5 18:44:29 2014 +0200 refs #5411 [CAPTURE] Import BIGFIN commit 7ea21c96d06c6fd52dd139d9a901e7004dd8feaf Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Sep 3 17:49:38 2014 +0200 refs #5411 [CAPTURE] Import BIGFIN commit 0d40dce23ea7f07cc5b23b56d6aaf0838c53991b Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Sep 3 16:55:06 2014 +0200 refs #5411 [CAPTURE] Import BIGFIN commit 6907a51ec299fcfbd8207d209e22705479566674 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Sep 3 13:27:07 2014 +0200 refs #5411 [CAPTURE] Import BIGFIN -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

[tutti] branch develop updated (941e73e -> 156cb7c)
by codelutin.com scm Sept. 5, 2014

Sept. 5, 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 941e73e fixes #5749: [IMPORT] import psion ne passe pas si on renseigne le champ heure en face de date de début new 156cb7c fixes #5748: [IMPORT] le message d'erreur sur import psion est a corriger 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 156cb7c03bea6642d5cfae586ee2c85ea2ee536a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Sep 5 14:53:13 2014 +0200 fixes #5748: [IMPORT] le message d'erreur sur import psion est a corriger Summary of changes: tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties | 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 1

[tutti] branch develop updated (2f7ebe2 -> 941e73e)
by codelutin.com scm Sept. 5, 2014

Sept. 5, 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 2f7ebe2 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 941e73e fixes #5749: [IMPORT] import psion ne passe pas si on renseigne le champ heure en face de date de début 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 941e73e255094035076259e9ed494d8cd997d304 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Sep 5 14:51:16 2014 +0200 fixes #5749: [IMPORT] import psion ne passe pas si on renseigne le champ heure en face de date de début Summary of changes: .../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 | 46 ++ .../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 +- .../ifremer/tutti/service/PersistenceService.java | 8 +- .../catches/multipost/MultiPostExportService.java | 14 +- .../catches/multipost/MultiPostImportService.java | 16 +- .../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 +- .../psionimport/PsionImportServiceTest.java | 4 +- .../tutti/ui/swing/action/ImportPupitriAction.java | 4 +- .../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 +- .../IndividualObservationBatchRowModel.java | 6 +- .../CreateIndividualObservationBatchUIHandler.java | 3 +- .../marinelitter/MarineLitterBatchRowModel.java | 6 +- .../catches/species/SpeciesBatchRowModel.java | 16 +- .../util/attachment/AttachmentModelAware.java | 4 +- 49 files changed, 507 insertions(+), 1468 deletions(-) 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 -- 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 (19d2a4c -> 2f7ebe2)
by codelutin.com scm Sept. 2, 2014

Sept. 2, 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 19d2a4c fixes #5729: [PROTOCOLE] erreur creation protocole new 837e161 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 76af615 [jgitflow-maven-plugin]updating poms for branch '3.7.2' with snapshot versions new 034ca45 [jgitflow-maven-plugin]updating poms for branch'release/3.7.2' with non-snapshot versions new 121d594 Merge branch 'release/3.7.2' new edc4144 Merge branch 'master' into develop new 2f7ebe2 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 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 2f7ebe26949b570130e00cdff331ea40ccb90328 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Sep 2 13:02:11 2014 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit edc4144dbd4fc834970dfd1a37a35b6e458df33b Merge: 837e161 121d594 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Sep 2 13:02:10 2014 +0200 Merge branch 'master' into develop commit 837e161a552289c24fc1390b298ff7c728b84442 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Sep 2 13:02:10 2014 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 121d594ec81b1bb71aa88cc81f9a606165e26cf2 Merge: f1f6671 034ca45 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Sep 2 13:02:07 2014 +0200 Merge branch 'release/3.7.2' commit 034ca45d19ebd76bb83e4e375297c297867a79c3 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Sep 2 12:56:07 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.7.2' with non-snapshot versions Summary of changes: -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5

[tutti] branch release/3.7.2 deleted (was 034ca45)
by codelutin.com scm Sept. 2, 2014

Sept. 2, 2014

This is an automated email from the git hooks/post-receive script. New change to branch release/3.7.2 in repository tutti. See http://git.codelutin.com/tutti.git was 034ca45 [jgitflow-maven-plugin]updating poms for branch'release/3.7.2' 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