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

branch develop-4.4.x updated (b164fdb -> c09b777)
by codelutin.com scm Feb. 25, 2016

Feb. 25, 2016

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 b164fdb [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 4b366c3 Début de correction mais il me faut une confirmation de Vincent sur le sujet new b21bec3 Fix test values new 48ec93b Ajout de nouveaux tests sur le calcul du RF final new 79ea340 Bien tenir compte de la sous fraction dans le cas de mensurations s'il y a un sous-échantillonage (See #8014) new 5729cfd fixes #8014 Merge branch 'feature/8014' into develop-4.4.x new c09b777 Use codelutinpom 7 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 c09b7777e6fd2f1eb6cb184626f6bf2206563318 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Feb 25 14:36:04 2016 +0100 Use codelutinpom 7 commit 5729cfde50679abb4ab415400313f459dc93fd2c Merge: b164fdb 79ea340 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Feb 25 14:33:13 2016 +0100 fixes #8014 Merge branch 'feature/8014' into develop-4.4.x commit 79ea340dd67f62558810ce93383b1dc5e3242f60 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Feb 25 14:15:47 2016 +0100 Bien tenir compte de la sous fraction dans le cas de mensurations s'il y a un sous-échantillonage (See #8014) commit 48ec93bb0731b47ad7ed2ee181fb43282a52a281 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Feb 24 15:24:46 2016 +0100 Ajout de nouveaux tests sur le calcul du RF final commit b21bec34720e398dbc4f6730ab69ff05eef3b4ca Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Feb 23 17:17:42 2016 +0100 Fix test values commit 4b366c3332a849c01ff26a82de65b38ae0bfffbc Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Feb 23 16:31:46 2016 +0100 Début de correction mais il me faut une confirmation de Vincent sur le sujet Summary of changes: README.txt => README.md | 0 pom.xml | 9 +- .../README.txt => tutti-ichtyometer/README.md | 0 tutti-persistence/{README.txt => README.md} | 0 .../README.txt => tutti-report-generator/README.md | 0 tutti-service/{README.txt => README.md} | 0 .../tutti/service/genericformat/csv/CatchRow.java | 14 ++ .../producer/CsvProducerForCatch.java | 39 ++++ .../GenericFormatExportServiceAno7992Test.java | 84 +++++++- .../resources/genericFormat/ano7992.tuttiProtocol | 227 +++++++++++++++++++++ .../README.txt => tutti-ui-swing-updater/README.md | 0 .../README.txt => tutti-ui-swing/README.md | 0 12 files changed, 364 insertions(+), 9 deletions(-) rename README.txt => README.md (100%) rename tutti-ui-swing/README.txt => tutti-ichtyometer/README.md (100%) rename tutti-persistence/{README.txt => README.md} (100%) rename tutti-ui-swing-updater/README.txt => tutti-report-generator/README.md (100%) rename tutti-service/{README.txt => README.md} (100%) rename tutti-report-generator/README.txt => tutti-ui-swing-updater/README.md (100%) rename tutti-ichtyometer/README.txt => tutti-ui-swing/README.md (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

branch develop updated (f5449e2 -> 85b0363)
by codelutin.com scm Feb. 25, 2016

Feb. 25, 2016

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 f5449e2 Merge branch 'feature/8014' into 'develop' new 85b0363 Use codelutinpom 7 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 85b03634814b924f8a06a71a2db72c282bf728be Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Feb 25 14:31:26 2016 +0100 Use codelutinpom 7 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 develop updated (39656ac -> f5449e2)
by codelutin.com scm Feb. 25, 2016

Feb. 25, 2016

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 39656ac Use pom 7-SNAPSHOT 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' No new revisions were added by this update. Summary of changes: .../tutti/service/genericformat/csv/CatchRow.java | 14 ++ .../producer/CsvProducerForCatch.java | 39 ++++ .../GenericFormatExportServiceAno7992Test.java | 84 +++++++- .../resources/genericFormat/ano7992.tuttiProtocol | 227 +++++++++++++++++++++ 4 files changed, 360 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/8014 updated (dee8e16 -> 3f598ad)
by codelutin.com scm Feb. 25, 2016

Feb. 25, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8014 in repository tutti. See http://git.codelutin.com/tutti.git from 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) No new revisions were added by this update. Summary of changes: .../service/genericformat/producer/CsvProducerForCatch.java | 10 ++++++++-- .../genericformat/GenericFormatExportServiceAno7992Test.java | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/ecran_obs_individuelles updated (aa1354f -> df1825b)
by codelutin.com scm Feb. 25, 2016

Feb. 25, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/ecran_obs_individuelles in repository tutti. See http://git.codelutin.com/tutti.git from aa1354f activtation ou desactivation de cellules de la tables des mensurations en fonction du mode de copie (refs #6926) new df1825b - suppression de l'onglet observations individuelles dans la capture - ajout des lignes dans la table d'obs individuelles dans les mensurations (refs #8019) 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 df1825ba98907a4a33527d697d5d0b3251ce9c66 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Feb 25 11:35:02 2016 +0100 - suppression de l'onglet observations individuelles dans la capture - ajout des lignes dans la table d'obs individuelles dans les mensurations (refs #8019) Summary of changes: .../operation/FishingOperationsUIHandler.java | 4 +- .../content/operation/catches/EditCatchesUI.jaxx | 28 - .../content/operation/catches/EditCatchesUI.jcss | 12 - .../operation/catches/EditCatchesUIHandler.java | 46 +- .../operation/catches/EditCatchesUIModel.java | 11 +- .../create/CreateBenthosBatchUIHandler.java | 2 +- .../benthos/split/SplitBenthosBatchUIHandler.java | 2 +- .../CopyIndividualObservationMode.java | 2 +- .../IndividualObservationBatchTableModel.java | 2 +- .../IndividualObservationBatchUI.jaxx | 97 --- .../IndividualObservationBatchUI.jcss | 106 --- .../IndividualObservationBatchUIHandler.java | 759 --------------------- .../IndividualObservationBatchUIModel.java | 141 ---- ...ExportMultiPostIndividualObservationAction.java | 79 --- ...ImportMultiPostIndividualObservationAction.java | 81 --- ...enCreateIndividualObservationBatchUIAction.java | 62 -- .../RemoveAllIndividualObservationBatchAction.java | 156 ----- .../RemoveIndividualObservationBatchAction.java | 118 ---- ...SpeciesForIndividualObservationBatchAction.java | 103 --- .../create/CreateIndividualObservationBatchUI.jaxx | 135 ---- .../create/CreateIndividualObservationBatchUI.jcss | 137 ---- .../CreateIndividualObservationBatchUIHandler.java | 438 ------------ .../CreateIndividualObservationBatchUIModel.java | 290 -------- ...teIndividualObservationBatchAndCloseAction.java | 64 -- ...ndividualObservationBatchAndContinueAction.java | 73 -- ...eateIndividualObservationBatchCancelAction.java | 59 -- .../create/CreateSpeciesBatchUIHandler.java | 2 +- .../frequency/SpeciesFrequencyTableModel.java | 1 + .../species/frequency/SpeciesFrequencyUI.jaxx | 1 + .../species/frequency/SpeciesFrequencyUI.jcss | 8 +- .../frequency/SpeciesFrequencyUIHandler.java | 7 +- .../species/frequency/SpeciesFrequencyUIModel.java | 1 + .../species/split/SplitSpeciesBatchUIHandler.java | 2 +- .../actions/EditFishingOperationAction.java | 3 - .../EditFishingOperationInValidationUIAction.java | 2 - .../util/table/AbstractTuttiTableUIHandler.java | 20 +- 36 files changed, 37 insertions(+), 3017 deletions(-) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{species/frequency => individualobservation}/CopyIndividualObservationMode.java (60%) delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jcss delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/actions/ExportMultiPostIndividualObservationAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/actions/ImportMultiPostIndividualObservationAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/actions/OpenCreateIndividualObservationBatchUIAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/actions/RemoveAllIndividualObservationBatchAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/actions/RemoveIndividualObservationBatchAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/actions/SelectSpeciesForIndividualObservationBatchAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.jaxx delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.jcss delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/actions/CreateIndividualObservationBatchAndCloseAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/actions/CreateIndividualObservationBatchAndContinueAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/actions/CreateIndividualObservationBatchCancelAction.java -- 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 (413cb53 -> ea887c3)
by codelutin.com scm Feb. 24, 2016

Feb. 24, 2016

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 from 413cb53 - correction de l'import / export - correction des tests (fixes #8013) new ea887c3 wording 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 ea887c3ae3ebf7174baac3d71cc4eca71e12a002 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Feb 24 17:49:28 2016 +0100 wording Summary of changes: tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_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

branch feature/8013 updated (9381a60 -> 413cb53)
by codelutin.com scm Feb. 24, 2016

Feb. 24, 2016

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 from 9381a60 modif du nom par défaut des fichiers d'export (refs #8013) new 413cb53 - correction de l'import / export - correction des tests (fixes #8013) 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 413cb534b158869b169a5d97368be8d582b818d8 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Feb 24 17:42:27 2016 +0100 - correction de l'import / export - correction des tests (fixes #8013) Summary of changes: .../entities/protocol/TuttiProtocolsTest.java | 6 ------ .../service/ProtocolPersistenceServiceWriteTest.java | 6 ------ .../tutti/service/protocol/SpeciesRowModel.java | 6 ++---- .../protocol/ProtocolImportExportServiceTest.java | 18 ++++++------------ 4 files changed, 8 insertions(+), 28 deletions(-) -- 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 (9bcc6d4 -> 9381a60)
by codelutin.com scm Feb. 24, 2016

Feb. 24, 2016

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 9bcc6d4 modif du nom par défaut des fichiers d'export (refs #8013) discards b694ba3 test que l'espèce a une méthode de mensuration à l'import de l'algo de pieces calcifiees (refs #8013) discards f44790f coorection de la validité des lignes (refs #8013) discards 64fb50e ajout du highlighter sur la table des cps (refs #8013) discards 1d1c47b 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 30ca5e3 cocher maturité dans l'éditeur de pieces calcifiées si l'espèce sélectionnée a un pmfm de maturité (refs #8013) discards d4faf6d migration du protocole (refs #8013) discards 37f2ac3 wording (refs #8013) discards 09d849d - suppression des colonnes dénombrement et pièces caclifiées - ajout de la colonne type de piece calcifiée refs #8013 discards a9461c5 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 26486d6 3. ajouter colonne « observations individuelles ». Cette case ne peut être cochée que si « méthode de mensuration » est renseignée refs #8013 adds 4ff1062 Simplification du code de calcul du raising factor final adds e5b5506 Ajout d'un test pour vérifier le calcul du raising factor final adds b68bfe7 Ajout méthode pour récupérer la dernière catégorie renseignée adds 8521235 Utilisation des bonnes catégories pour compléter le sampleWeight (utilisé pour le calcul du raising factor final) adds 1fe175a Fixes #7992 Merge branch 'feature/7992_erreur_calcul_coef_final' into develop adds fad5ce9 Utilisation des bonnes catégories pour compléter le sampleWeight (utilisé pour le calcul du raising factor final) adds c413e57 on ne pousse que les heures et les minutes quand on appelle set...Time (fixes #7996) adds 36d483b Fixes #7996 Merge branch 'feature/7996' into develop adds 39656ac Use pom 7-SNAPSHOT new 33c8b3e 3. ajouter colonne « observations individuelles ». Cette case ne peut être cochée que si « méthode de mensuration » est renseignée refs #8013 new 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 new 0017f15 - suppression des colonnes dénombrement et pièces caclifiées - ajout de la colonne type de piece calcifiée refs #8013 new 025e17f wording (refs #8013) new 98eaf87 migration du protocole (refs #8013) new b2eb58c cocher maturité dans l'éditeur de pieces calcifiées si l'espèce sélectionnée a un pmfm de maturité (refs #8013) new 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) new 42842fe ajout du highlighter sur la table des cps (refs #8013) new 4aa7fa0 coorection de la validité des lignes (refs #8013) new ab3b962 test que l'espèce a une méthode de mensuration à l'import de l'algo de pieces calcifiees (refs #8013) new 9381a60 modif du nom par défaut des fichiers d'export (refs #8013) 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 (9bcc6d4) \ N -- N -- N refs/heads/feature/8013 (9381a60) 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. The 11 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 9381a6015cf0bd5a48bb44cd6687f6584284785e Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Feb 24 17:28:04 2016 +0100 modif du nom par défaut des fichiers d'export (refs #8013) commit ab3b962758a13280c55e3956bbbe077259ad491f Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Feb 24 17:25:08 2016 +0100 test que l'espèce a une méthode de mensuration à l'import de l'algo de pieces calcifiees (refs #8013) commit 4aa7fa0f984ea7abc8787cb5b877f5bdcd13808f Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Feb 24 17:20:24 2016 +0100 coorection de la validité des lignes (refs #8013) commit 42842fe0268084981b646e3d66b97b00fceb613a Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Feb 24 16:53:05 2016 +0100 ajout du highlighter sur la table des cps (refs #8013) commit d02928b2be096635de74f9be907949bbb2c1a0e3 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Feb 24 16:42:53 2016 +0100 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) commit b2eb58c7a0fcdcf195a6ddc53397e30d5a3ec0e3 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Feb 24 15:59:43 2016 +0100 cocher maturité dans l'éditeur de pieces calcifiées si l'espèce sélectionnée a un pmfm de maturité (refs #8013) commit 98eaf874bb9cac8ff073220b836321aa34d0fa50 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Feb 24 15:59:36 2016 +0100 migration du protocole (refs #8013) commit 025e17f4258448dbdb3e1ac63cbdbed9c6fb2568 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Feb 23 15:12:08 2016 +0100 wording (refs #8013) commit 0017f15e6a97407f560bd226424b83dbdee85502 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Feb 23 15:09:14 2016 +0100 - suppression des colonnes dénombrement et pièces caclifiées - ajout de la colonne type de piece calcifiée refs #8013 commit a19b1d087e4327dfa0930f6c43f7b3b92a0c95e2 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Feb 22 19:27:01 2016 +0100 4. ajouter colonne « maturité » et pour chaque taxon proposer liste psfm pour pointer sur l'échelle de maturité adaptée au taxon refs #8013 commit 33c8b3ea3ea5ab0c0b926a905f5f5130aebd47e0 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Feb 22 18:07:53 2016 +0100 3. ajouter colonne « observations individuelles ». Cette case ne peut être cochée que si « méthode de mensuration » est renseignée refs #8013 Summary of changes: README.txt => README.md | 0 pom.xml | 5 +-- .../README.txt => tutti-ichtyometer/README.md | 0 tutti-persistence/{README.txt => README.md} | 0 .../README.txt => tutti-report-generator/README.md | 0 tutti-service/{README.txt => README.md} | 0 .../tutti/service/genericformat/csv/CatchRow.java | 7 ++++ .../producer/CsvProducerForCatch.java | 34 +++++++++++------ ... => GenericFormatExportServiceAno7992Test.java} | 44 ++++++++++++---------- .../resources/genericFormat/ano7992.tuttiProtocol | 22 +++++++++++ .../README.txt => tutti-ui-swing-updater/README.md | 0 .../README.txt => tutti-ui-swing/README.md | 0 .../operation/EditFishingOperationUIHandler.java | 2 +- .../operation/EditFishingOperationUIModel.java | 20 +++++++--- 14 files changed, 94 insertions(+), 40 deletions(-) rename README.txt => README.md (100%) rename tutti-ui-swing/README.txt => tutti-ichtyometer/README.md (100%) rename tutti-persistence/{README.txt => README.md} (100%) rename tutti-ui-swing-updater/README.txt => tutti-report-generator/README.md (100%) rename tutti-service/{README.txt => README.md} (100%) copy tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/{GenericFormatExportServiceAno5804Test.java => GenericFormatExportServiceAno7992Test.java} (53%) create mode 100644 tutti-service/src/test/resources/genericFormat/ano7992.tuttiProtocol rename tutti-report-generator/README.txt => tutti-ui-swing-updater/README.md (100%) rename tutti-ichtyometer/README.txt => tutti-ui-swing/README.md (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 11

branch feature/8013 updated (a9461c5 -> 9bcc6d4)
by codelutin.com scm Feb. 24, 2016

Feb. 24, 2016

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 from a9461c5 4. ajouter colonne « maturité » et pour chaque taxon proposer liste psfm pour pointer sur l'échelle de maturité adaptée au taxon refs #8013 new 09d849d - suppression des colonnes dénombrement et pièces caclifiées - ajout de la colonne type de piece calcifiée refs #8013 new 37f2ac3 wording (refs #8013) new d4faf6d migration du protocole (refs #8013) new 30ca5e3 cocher maturité dans l'éditeur de pieces calcifiées si l'espèce sélectionnée a un pmfm de maturité (refs #8013) new 1d1c47b 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) new 64fb50e ajout du highlighter sur la table des cps (refs #8013) new f44790f coorection de la validité des lignes (refs #8013) new b694ba3 test que l'espèce a une méthode de mensuration à l'import de l'algo de pieces calcifiees (refs #8013) new 9bcc6d4 modif du nom par défaut des fichiers d'export (refs #8013) The 9 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 9bcc6d4ff4907b37c735ca815d4f54c52af2fbef Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Feb 24 17:28:04 2016 +0100 modif du nom par défaut des fichiers d'export (refs #8013) commit b694ba364db951db7a562e1e6bc2350741dda3af Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Feb 24 17:25:08 2016 +0100 test que l'espèce a une méthode de mensuration à l'import de l'algo de pieces calcifiees (refs #8013) commit f44790fa43297bfa7412fead2db47f25d9af1223 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Feb 24 17:20:24 2016 +0100 coorection de la validité des lignes (refs #8013) commit 64fb50e3b12d1c236579457d30f22325cdc11e26 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Feb 24 16:53:05 2016 +0100 ajout du highlighter sur la table des cps (refs #8013) commit 1d1c47ba9e77f2bcfc0162dbed9d15217ec8def8 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Feb 24 16:42:53 2016 +0100 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) commit 30ca5e31549192e9c45be5f398e9e2982815226f Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Feb 24 15:59:43 2016 +0100 cocher maturité dans l'éditeur de pieces calcifiées si l'espèce sélectionnée a un pmfm de maturité (refs #8013) commit d4faf6d48d09439e4ced05c07e2ee6d5021389d8 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Feb 24 15:59:36 2016 +0100 migration du protocole (refs #8013) commit 37f2ac362408456356d753914959006820426141 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Feb 23 15:12:08 2016 +0100 wording (refs #8013) commit 09d849d26d8d7f810b99bb8b2baba4387bbd8d91 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Feb 23 15:09:14 2016 +0100 - suppression des colonnes dénombrement et pièces caclifiées - ajout de la colonne type de piece calcifiée refs #8013 Summary of changes: .gitignore | 12 +- .../entities/protocol/TuttiProtocols.java | 108 +++- .../entities/protocol/v3/SpeciesProtocol3.java | 150 ++++++ .../entities/protocol/v3/SpeciesProtocolBean3.java | 225 +++----- .../entities/protocol/v3/TuttiProtocol3.java | 238 ++++++++ .../entities/protocol/v3/TuttiProtocolBean3.java | 598 +++++++++++++++++++++ .../src/main/xmi/tutti-persistence.zargo | Bin 62183 -> 62126 bytes .../entities/protocol/TuttiProtocolsTest.java | 14 - .../ProtocolPersistenceServiceReadTest.java | 6 - .../catches/ValidateCruiseOperationsService.java | 4 +- .../protocol/ProtocolImportExportService.java | 2 +- .../ifremer/tutti/service/protocol/SpeciesRow.java | 16 - .../protocol/ProtocolImportExportServiceTest.java | 30 -- .../create/CreateBenthosBatchUIHandler.java | 2 +- .../create/CreateSpeciesBatchUIHandler.java | 2 +- .../protocol/EditProtocolSpeciesRowModel.java | 51 +- .../protocol/EditProtocolSpeciesTableModel.java | 17 +- .../content/protocol/EditProtocolUIHandler.java | 122 +++-- .../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 +- .../CalcifiedPiecesSamplingEditorTableModel.java | 1 + .../CalcifiedPiecesSamplingEditorUIHandler.java | 12 + .../actions/ExportProtocolCpsAction.java | 2 +- .../actions/ImportProtocolCpsAction.java | 1 + .../resources/i18n/tutti-ui-swing_en_GB.properties | 5 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 11 +- 34 files changed, 1315 insertions(+), 393 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 (56%) 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 9

branch feature/8014 updated (c796f8c -> dee8e16)
by codelutin.com scm Feb. 24, 2016

Feb. 24, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8014 in repository tutti. See http://git.codelutin.com/tutti.git from c796f8c Fix test values adds dee8e16 Ajout de nouveaux tests sur le calcul du RF final No new revisions were added by this update. Summary of changes: .../GenericFormatExportServiceAno7992Test.java | 87 ++++++++++++++++++++-- 1 file changed, 79 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0