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

branch develop-4.4.x updated (a0a623a -> b02a811)
by codelutin.com scm 25 Feb '16

25 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch develop-4.4.x in repository tutti. See http://git.codelutin.com/tutti.git from a0a623a Do not use https for project url new 996f721 Correction du poids total espèce vivant non détaillé trié non exporté (see #8022) new 23fc0c1 Correction du poids total espèce vrac non exporté (see #8022) new b02a811 Fixes #8022 Merge branch 'feature/8022' into develop-4.4.x 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 b02a811d2f58b4578f4984493fec3f35d3aad735 Merge: a0a623a 23fc0c1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Feb 25 17:50:05 2016 +0100 Fixes #8022 Merge branch 'feature/8022' into develop-4.4.x commit 23fc0c1dd67075797d0d7f242cf53e74a2ebf486 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Feb 25 17:48:43 2016 +0100 Correction du poids total espèce vrac non exporté (see #8022) commit 996f721628bc5ba7d4b26ef32741dca40ecab8e6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Feb 25 17:21:18 2016 +0100 Correction du poids total espèce vivant non détaillé trié non exporté (see #8022) Summary of changes: .../tutti/service/genericformat/csv/OperationRow.java | 6 +++--- .../genericformat/GenericFormatExportServiceAno7992Test.java | 12 +++++++++++- 2 files changed, 14 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch develop updated (f5ccf41 -> 441e785)
by codelutin.com scm 25 Feb '16

25 Feb '16

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 f5ccf41 Fixes #8013 Merge branch 'feature/8013' into develop new 7ef3920 Correction du poids total espèce vivant non détaillé trié non exporté (see #8022) new dbdd317 Correction du poids total espèce vrac non exporté (see #8022) new 441e785 fixes #8022 Merge branch 'feature/8022' 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 441e78539ac85d20547d3aabe0ce7819242bd357 Merge: f5ccf41 dbdd317 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Feb 25 17:48:51 2016 +0100 fixes #8022 Merge branch 'feature/8022' into develop commit dbdd31790d02b4b9db3672eac4c01f5bd1baf13f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Feb 25 17:48:43 2016 +0100 Correction du poids total espèce vrac non exporté (see #8022) commit 7ef392016c2df1cda1bfacfb47bbfa16f311b701 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Feb 25 17:21:18 2016 +0100 Correction du poids total espèce vivant non détaillé trié non exporté (see #8022) Summary of changes: .../tutti/service/genericformat/csv/OperationRow.java | 6 +++--- .../genericformat/GenericFormatExportServiceAno7992Test.java | 12 +++++++++++- 2 files changed, 14 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch feature/8022 deleted (was 7ef3920)
by codelutin.com scm 25 Feb '16

25 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8022 in repository tutti. See http://git.codelutin.com/tutti.git was 7ef3920 Correction du poids total espèce vivant non détaillé trié non exporté (see #8022) This change permanently discards the following revisions: discards 7ef3920 Correction du poids total espèce vivant non détaillé trié non exporté (see #8022) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/8022 created (now 7ef3920)
by codelutin.com scm 25 Feb '16

25 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8022 in repository tutti. See http://git.codelutin.com/tutti.git at 7ef3920 Correction du poids total espèce vivant non détaillé trié non exporté (see #8022) This branch includes the following new commits: new 7ef3920 Correction du poids total espèce vivant non détaillé trié non exporté (see #8022) 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 7ef392016c2df1cda1bfacfb47bbfa16f311b701 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Feb 25 17:21:18 2016 +0100 Correction du poids total espèce vivant non détaillé trié non exporté (see #8022) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (ca7d26b -> f5ccf41)
by codelutin.com scm 25 Feb '16

25 Feb '16

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 ca7d26b Mise à jour du guide utilisateur adds 27ed7e0 3. ajouter colonne « observations individuelles ». Cette case ne peut être cochée que si « méthode de mensuration » est renseignée refs #8013 adds 1e2aa09 4. ajouter colonne « maturité » et pour chaque taxon proposer liste psfm pour pointer sur l'échelle de maturité adaptée au taxon refs #8013 adds ddf9722 - suppression des colonnes dénombrement et pièces caclifiées - ajout de la colonne type de piece calcifiée refs #8013 adds 2381cf1 wording (refs #8013) adds 523e218 migration du protocole (refs #8013) adds c6bba11 cocher maturité dans l'éditeur de pieces calcifiées si l'espèce sélectionnée a un pmfm de maturité (refs #8013) adds 87cb8c1 Il faut n'autoriser que les taxons dont on a une méthode de mensuration renseigner et du coup il faut aussi demander une confirmation à l'utilisateur si il veut supprimer la méthode de mensuration dans l'onglet espèces (ou benthos) car cela va supprimer des lignes dans l'onglet algo (refs #8013) adds 1a9cd1e ajout du highlighter sur la table des cps (refs #8013) adds 9e44081 coorection de la validité des lignes (refs #8013) adds 370751c test que l'espèce a une méthode de mensuration à l'import de l'algo de pieces calcifiees (refs #8013) adds 883d2f9 modif du nom par défaut des fichiers d'export (refs #8013) adds ad65665 - correction de l'import / export - correction des tests (fixes #8013) adds f3d31f7 wording adds 7d8e1ee correction de la version courante du protocole (fixes #8013) adds ede141d Changement de l'ordre des colonnes dans l'onglet espèces et benthos adds 295d098 Ajout de méthode withXXX sur SpeciesProtocol + bien modifier le modèle global lors d'une modification du tableau des espèces des pièces calcifiées adds 041d0ec Wording toi même! adds a0118c9 Suppression des annotation de génération sur du code non généré new f5ccf41 Fixes #8013 Merge branch 'feature/8013' into develop 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 f5ccf41ab68aeeacb89ba4d03e9f9e269014af6f Merge: ca7d26b a0118c9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Feb 25 16:49:43 2016 +0100 Fixes #8013 Merge branch 'feature/8013' into develop Summary of changes: .gitignore | 12 +- .../entities/protocol/SpeciesProtocolBean.java | 14 + .../entities/protocol/TuttiProtocols.java | 110 +++- .../entities/protocol/v1/SpeciesProtocol1.java | 5 +- .../entities/protocol/v1/SpeciesProtocolBean1.java | 5 +- .../entities/protocol/v1/TuttiProtocol1.java | 4 +- .../entities/protocol/v1/TuttiProtocolBean1.java | 4 +- .../entities/protocol/v2/TuttiProtocol2.java | 4 +- .../entities/protocol/v2/TuttiProtocolBean2.java | 2 - .../entities/protocol/v3/SpeciesProtocol3.java | 148 +++++ .../entities/protocol/v3/SpeciesProtocolBean3.java | 194 +++---- .../entities/protocol/v3/TuttiProtocol3.java | 236 ++++++++ .../entities/protocol/v3/TuttiProtocolBean3.java | 596 +++++++++++++++++++++ .../src/main/xmi/tutti-persistence.zargo | Bin 62059 -> 62284 bytes .../entities/protocol/TuttiProtocolsTest.java | 20 - .../ProtocolPersistenceServiceReadTest.java | 6 - .../ProtocolPersistenceServiceWriteTest.java | 9 +- .../catches/ValidateCruiseOperationsService.java | 4 +- .../protocol/ProtocolImportExportService.java | 2 +- .../ifremer/tutti/service/protocol/SpeciesRow.java | 16 - .../tutti/service/protocol/SpeciesRowModel.java | 6 +- .../protocol/ProtocolImportExportServiceTest.java | 52 +- .../create/CreateBenthosBatchUIHandler.java | 2 +- .../create/CreateSpeciesBatchUIHandler.java | 2 +- .../protocol/EditProtocolSpeciesRowModel.java | 99 +++- .../protocol/EditProtocolSpeciesTableModel.java | 27 +- .../content/protocol/EditProtocolUIHandler.java | 157 +++++- .../content/protocol/EditProtocolUIModel.java | 12 + .../protocol/actions/AddBenthosProtocolAction.java | 3 +- .../protocol/actions/AddSpeciesProtocolAction.java | 3 +- .../actions/ExportAllCaracteristicAction.java | 2 +- .../actions/ExportProtocolBenthosAction.java | 2 +- .../actions/ExportProtocolCaracteristicAction.java | 2 +- .../actions/ExportProtocolSpeciesAction.java | 2 +- .../protocol/actions/ExportPupitriAction.java | 2 +- .../actions/RemoveBenthosProtocolAction.java | 25 +- .../actions/RemoveSpeciesProtocolAction.java | 26 +- .../protocol/actions/SaveProtocolAction.java | 19 - .../CalcifiedPiecesSamplingEditorTableModel.java | 1 + .../CalcifiedPiecesSamplingEditorUIHandler.java | 15 + .../actions/ExportProtocolCpsAction.java | 2 +- .../actions/ImportProtocolCpsAction.java | 1 + .../content/protocol/rtp/RtpEditorUIModel.java | 2 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 9 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 15 +- 45 files changed, 1474 insertions(+), 405 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/SpeciesProtocol3.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java => tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/SpeciesProtocolBean3.java (57%) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/TuttiProtocol3.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/TuttiProtocolBean3.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop-4.4.x updated (b02f421 -> a0a623a)
by codelutin.com scm 25 Feb '16

25 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch develop-4.4.x in repository tutti. See http://git.codelutin.com/tutti.git from b02f421 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new a0a623a Do not use https for project url 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 a0a623ab97fa5594dd48fe061e0f6549a79eeddd Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Feb 25 14:39:26 2016 +0100 Do not use https for project url Summary of changes: pom.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 1

branch feature/8013 updated (696a25b -> a0118c9)
by codelutin.com scm 25 Feb '16

25 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8013 in repository tutti. See http://git.codelutin.com/tutti.git discards 696a25b correction de la version courante du protocole (fixes #8013) discards ea887c3 wording discards 413cb53 - correction de l'import / export - correction des tests (fixes #8013) discards 9381a60 modif du nom par défaut des fichiers d'export (refs #8013) discards ab3b962 test que l'espèce a une méthode de mensuration à l'import de l'algo de pieces calcifiees (refs #8013) discards 4aa7fa0 coorection de la validité des lignes (refs #8013) discards 42842fe ajout du highlighter sur la table des cps (refs #8013) discards d02928b Il faut n'autoriser que les taxons dont on a une méthode de mensuration renseigner et du coup il faut aussi demander une confirmation à l'utilisateur si il veut supprimer la méthode de mensuration dans l'onglet espèces (ou benthos) car cela va supprimer des lignes dans l'onglet algo (refs #8013) discards b2eb58c cocher maturité dans l'éditeur de pieces calcifiées si l'espèce sélectionnée a un pmfm de maturité (refs #8013) discards 98eaf87 migration du protocole (refs #8013) discards 025e17f wording (refs #8013) discards 0017f15 - suppression des colonnes dénombrement et pièces caclifiées - ajout de la colonne type de piece calcifiée refs #8013 discards a19b1d0 4. ajouter colonne « maturité » et pour chaque taxon proposer liste psfm pour pointer sur l'échelle de maturité adaptée au taxon refs #8013 discards 33c8b3e 3. ajouter colonne « observations individuelles ». Cette case ne peut être cochée que si « méthode de mensuration » est renseignée refs #8013 adds 463a07a Début de correction mais il me faut une confirmation de Vincent sur le sujet adds c796f8c Fix test values adds dee8e16 Ajout de nouveaux tests sur le calcul du RF final adds 3f598ad Bien tenir compte de la sous fraction dans le cas de mensurations s'il y a un sous-échantillonage (See #8014) adds f5449e2 Merge branch 'feature/8014' into 'develop' adds 85b0363 Use codelutinpom 7 adds caa6781 Do not use https for project url adds ca7d26b Mise à jour du guide utilisateur adds 27ed7e0 3. ajouter colonne « observations individuelles ». Cette case ne peut être cochée que si « méthode de mensuration » est renseignée refs #8013 adds 1e2aa09 4. ajouter colonne « maturité » et pour chaque taxon proposer liste psfm pour pointer sur l'échelle de maturité adaptée au taxon refs #8013 adds ddf9722 - suppression des colonnes dénombrement et pièces caclifiées - ajout de la colonne type de piece calcifiée refs #8013 adds 2381cf1 wording (refs #8013) adds 523e218 migration du protocole (refs #8013) adds c6bba11 cocher maturité dans l'éditeur de pieces calcifiées si l'espèce sélectionnée a un pmfm de maturité (refs #8013) adds 87cb8c1 Il faut n'autoriser que les taxons dont on a une méthode de mensuration renseigner et du coup il faut aussi demander une confirmation à l'utilisateur si il veut supprimer la méthode de mensuration dans l'onglet espèces (ou benthos) car cela va supprimer des lignes dans l'onglet algo (refs #8013) adds 1a9cd1e ajout du highlighter sur la table des cps (refs #8013) adds 9e44081 coorection de la validité des lignes (refs #8013) adds 370751c test que l'espèce a une méthode de mensuration à l'import de l'algo de pieces calcifiees (refs #8013) adds 883d2f9 modif du nom par défaut des fichiers d'export (refs #8013) adds ad65665 - correction de l'import / export - correction des tests (fixes #8013) adds f3d31f7 wording adds 7d8e1ee correction de la version courante du protocole (fixes #8013) adds ede141d Changement de l'ordre des colonnes dans l'onglet espèces et benthos adds 295d098 Ajout de méthode withXXX sur SpeciesProtocol + bien modifier le modèle global lors d'une modification du tableau des espèces des pièces calcifiées adds 041d0ec Wording toi même! adds a0118c9 Suppression des annotation de génération sur du code non généré 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 (696a25b) \ N -- N -- N refs/heads/feature/8013 (a0118c9) 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: pom.xml | 4 +- src/site/site_fr.xml | 2 + .../entities/protocol/SpeciesProtocolBean.java | 14 ++ .../entities/protocol/v1/SpeciesProtocol1.java | 5 +- .../entities/protocol/v1/SpeciesProtocolBean1.java | 5 +- .../entities/protocol/v1/TuttiProtocol1.java | 4 +- .../entities/protocol/v1/TuttiProtocolBean1.java | 4 +- .../entities/protocol/v2/TuttiProtocol2.java | 4 +- .../entities/protocol/v2/TuttiProtocolBean2.java | 2 - .../entities/protocol/v3/SpeciesProtocol3.java | 4 +- .../entities/protocol/v3/SpeciesProtocolBean3.java | 4 +- .../entities/protocol/v3/TuttiProtocol3.java | 4 +- .../entities/protocol/v3/TuttiProtocolBean3.java | 4 +- .../src/main/xmi/tutti-persistence.zargo | Bin 62126 -> 62284 bytes .../tutti/service/genericformat/csv/CatchRow.java | 14 ++ .../producer/CsvProducerForCatch.java | 39 ++++ .../GenericFormatExportServiceAno7992Test.java | 84 +++++++- .../resources/genericFormat/ano7992.tuttiProtocol | 227 +++++++++++++++++++++ .../help/Guide_utilisation_Allegro_Campagne.pdf | Bin 1996569 -> 1988880 bytes .../protocol/EditProtocolSpeciesRowModel.java | 15 ++ .../protocol/EditProtocolSpeciesTableModel.java | 2 +- .../content/protocol/EditProtocolUIHandler.java | 16 +- .../CalcifiedPiecesSamplingEditorUIHandler.java | 3 + .../content/protocol/rtp/RtpEditorUIModel.java | 2 +- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 +- 25 files changed, 414 insertions(+), 50 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (caa6781 -> ca7d26b)
by codelutin.com scm 25 Feb '16

25 Feb '16

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 caa6781 Do not use https for project url new ca7d26b Mise à jour du guide utilisateur 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 ca7d26b08d07e2c507ddc0e1a9bd291702626527 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Feb 25 15:11:47 2016 +0100 Mise à jour du guide utilisateur Summary of changes: src/site/site_fr.xml | 2 ++ .../help/Guide_utilisation_Allegro_Campagne.pdf | Bin 1996569 -> 1988880 bytes 2 files changed, 2 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (85b0363 -> caa6781)
by codelutin.com scm 25 Feb '16

25 Feb '16

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 85b0363 Use codelutinpom 7 new caa6781 Do not use https for project url 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 caa6781143be09f1c4775935b7ffcf2bbd49ed59 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Feb 25 14:52:51 2016 +0100 Do not use https for project url Summary of changes: pom.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 1

branch release/4.4.4 deleted (was 77a0a86)
by codelutin.com scm 25 Feb '16

25 Feb '16

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