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

branch develop updated (771780e -> 1f0fa7d)
by codelutin.com scm 24 Dec '15

24 Dec '15

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 771780e Fixes #7161 Merge branch 'feature/7161' into develop adds 2d9fc5b ajout des champs dans le svg + binding des poids inertes et vivants non detaillés (refs #7206) adds 23073c7 Ajout au modèle de capture de nombre distincts de taxons en hors vrac (See #7206) adds 3760529 Correction du nom des champs dans le fichier svg pour le nombre distinct de taxons en hors vrac (See #7260) adds b4f315e Calcul du nombre distinct de taxons en hors-vrac (See #7206) adds 5f49ff5 Binding du nombre distinct de taxons en hors-vrac sur l'écran résumé (See #7206) adds 3e2cb95 Les propriétés du nombre distinct de taxons en hors vrac ne sont pas éditables (see #7206) new 1f0fa7d Fixes #7206 Merge branch 'feature/7206' 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 1f0fa7d2ad77adb09b17ed88fdf13840e759de7a Merge: 771780e 3e2cb95 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Dec 24 13:38:39 2015 +0100 Fixes #7206 Merge branch 'feature/7206' into develop Summary of changes: .../src/main/xmi/tutti-persistence.zargo | Bin 58384 -> 58480 bytes .../operation/catches/EditCatchesSvgHandler.java | 68 +++++-- .../operation/catches/EditCatchesUIHandler.java | 6 + .../operation/catches/EditCatchesUIModel.java | 26 +++ .../catches/benthos/BenthosBatchUIHandler.java | 5 + .../catches/benthos/BenthosBatchUIModel.java | 23 +++ .../catches/species/SpeciesBatchUIHandler.java | 5 + .../catches/species/SpeciesBatchUIModel.java | 23 +++ tutti-ui-swing/src/main/resources/EcranResume.svg | 202 ++++++++++++++++++--- .../resources/i18n/tutti-ui-swing_en_GB.properties | 7 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 6 + 11 files changed, 331 insertions(+), 40 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/7206 deleted (was 3e2cb95)
by codelutin.com scm 24 Dec '15

24 Dec '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7206 in repository tutti. See http://git.codelutin.com/tutti.git was 3e2cb95 Les propriétés du nombre distinct de taxons en hors vrac ne sont pas éditables (see #7206) 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 feature/7206 updated (d4752f9 -> 3e2cb95)
by codelutin.com scm 24 Dec '15

24 Dec '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7206 in repository tutti. See http://git.codelutin.com/tutti.git discards d4752f9 ajout des champs dans le svg + binding des poids inertes et vivants non detaillés (refs #7206) adds 77d247d passage à jaxx 2.27 snapshot pour tester l'editeur de date (refs #7161) adds 8505c27 Utilisation de jaxx 2.27 (See #7161) adds 771780e Fixes #7161 Merge branch 'feature/7161' into develop adds 2d9fc5b ajout des champs dans le svg + binding des poids inertes et vivants non detaillés (refs #7206) adds 23073c7 Ajout au modèle de capture de nombre distincts de taxons en hors vrac (See #7206) adds 3760529 Correction du nom des champs dans le fichier svg pour le nombre distinct de taxons en hors vrac (See #7260) adds b4f315e Calcul du nombre distinct de taxons en hors-vrac (See #7206) adds 5f49ff5 Binding du nombre distinct de taxons en hors-vrac sur l'écran résumé (See #7206) adds 3e2cb95 Les propriétés du nombre distinct de taxons en hors vrac ne sont pas éditables (see #7206) 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 (d4752f9) \ N -- N -- N refs/heads/feature/7206 (3e2cb95) 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 | 2 +- .../src/main/xmi/tutti-persistence.zargo | Bin 58384 -> 58480 bytes .../operation/catches/EditCatchesSvgHandler.java | 5 ++++ .../operation/catches/EditCatchesUIHandler.java | 2 ++ .../operation/catches/EditCatchesUIModel.java | 26 +++++++++++++++++++++ .../catches/benthos/BenthosBatchUIHandler.java | 5 ++++ .../catches/benthos/BenthosBatchUIModel.java | 23 ++++++++++++++++++ .../catches/species/SpeciesBatchUIHandler.java | 5 ++++ .../catches/species/SpeciesBatchUIModel.java | 23 ++++++++++++++++++ tutti-ui-swing/src/main/resources/EcranResume.svg | 20 ++++++++-------- .../resources/i18n/tutti-ui-swing_en_GB.properties | 2 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 ++ 12 files changed, 104 insertions(+), 11 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7206 created (now d4752f9)
by codelutin.com scm 24 Dec '15

24 Dec '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7206 in repository tutti. See http://git.codelutin.com/tutti.git at d4752f9 ajout des champs dans le svg + binding des poids inertes et vivants non detaillés (refs #7206) This branch includes the following new commits: new d4752f9 ajout des champs dans le svg + binding des poids inertes et vivants non detaillés (refs #7206) 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 d4752f9e810d858a13b792562d962f8d31dd4163 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Dec 24 12:30:41 2015 +0100 ajout des champs dans le svg + binding des poids inertes et vivants non detaillés (refs #7206) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (1751ce3 -> 771780e)
by codelutin.com scm 24 Dec '15

24 Dec '15

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 1751ce3 Merge branch 'feature/7846_import_generique_avec_taxons_referents_obsoletes' into 'develop' new 77d247d passage à jaxx 2.27 snapshot pour tester l'editeur de date (refs #7161) new 8505c27 Utilisation de jaxx 2.27 (See #7161) new 771780e Fixes #7161 Merge branch 'feature/7161' 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 771780e80c53769362b83b4b375a80de766a7a17 Merge: 1751ce3 8505c27 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Dec 24 12:29:09 2015 +0100 Fixes #7161 Merge branch 'feature/7161' into develop commit 8505c27ab8f70606a5c71c3156b37019c4c3c7c4 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Dec 24 12:24:58 2015 +0100 Utilisation de jaxx 2.27 (See #7161) commit 77d247d2598305e774a59c221fa9adcb381f7afe Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Dec 23 19:23:42 2015 +0100 passage à jaxx 2.27 snapshot pour tester l'editeur de date (refs #7161) 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 3

branch feature/7161 deleted (was 773ab0f)
by codelutin.com scm 24 Dec '15

24 Dec '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7161 in repository tutti. See http://git.codelutin.com/tutti.git was 773ab0f passage à jaxx 2.27 snapshot pour tester l'editeur de date (refs #7161) 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 (be5249d -> 1751ce3)
by codelutin.com scm 24 Dec '15

24 Dec '15

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 be5249d Fixes #6112 Merge branch 'feature/6112' into develop adds 404778a Ajout d'une méthode sur le service de persistence pour récupérer le dictionnaire des referent taxon obsolètes (+ ajout d'un nouveau cache) adds 894f159 Utilisation du dictionnaire des referents taxons obsolète lors d'un import générique (See #7846) adds fc689df format adds 1751ce3 Merge branch 'feature/7846_import_generique_avec_taxons_referents_obsoletes' into 'develop' No new revisions were added by this update. Summary of changes: .../tutti/persistence/TuttiPersistenceImpl.java | 5 +++ .../persistence/TuttiPersistenceNoDbImpl.java | 6 +++ .../service/ProtocolPersistenceServiceImpl.java | 1 + .../service/ReferentialPersistenceService.java | 8 ++-- .../referential/SpeciesPersistenceService.java | 18 +++++--- .../referential/SpeciesPersistenceServiceImpl.java | 51 ++++++++++++++++++++-- .../resources/applicationContext-service-tutti.xml | 4 ++ .../ifremer/tutti/service/PersistenceService.java | 6 ++- ...enericFormatReferentialSpeciesImportResult.java | 19 +++++++- .../GenericformatImportPersistenceHelper.java | 5 +++ .../ImportReferentialSpeciesAction.java | 4 ++ 11 files changed, 112 insertions(+), 15 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7846_import_generique_avec_taxons_referents_obsoletes updated (894f159 -> fc689df)
by codelutin.com scm 24 Dec '15

24 Dec '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7846_import_generique_avec_taxons_referents_obsoletes in repository tutti. See http://git.codelutin.com/tutti.git from 894f159 Utilisation du dictionnaire des referents taxons obsolète lors d'un import générique (See #7846) adds fc689df format No new revisions were added by this update. Summary of changes: .../genericformat/GenericFormatReferentialSpeciesImportResult.java | 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 0

branch feature/7846_import_generique_avec_taxons_referents_obsoletes updated (be5a541 -> 894f159)
by codelutin.com scm 24 Dec '15

24 Dec '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7846_import_generique_avec_taxons_referents_obsoletes in repository tutti. See http://git.codelutin.com/tutti.git discards be5a541 Utilisation du dictionnaire des referents taxons obsolète lors d'un import générique (See #7846) discards 3793e24 Ajout d'une méthode sur le service de persistence pour récupérer le dictionnaire des referent taxon obsolètes (+ ajout d'un nouveau cache) adds 5a7656b ajout du champs de poids de sous echantillon sur l'ecran de creation de lot du benthos (refs #7278) adds f1b6e6f ajout du champs de poids de sous echantillon sur l'ecran de creation de lot d'especes (fixes #7278) adds 9e82f1e Mise à jour du mapping de l'aide en ligne adds 23d3230 Mise à jour du mapping de l'aide en ligne adds f504b6c - le poids de sous echantillon doit etre strictement inferieru au poids de catégorie - i18n (refs #7278) adds 686280c correction de la validation (les poids ventilés supérieurs au poids du lot, si on met un poids de sous echantillon, l'erreur ne disparait pas) (fixes #7278) adds 4de1cf6 Renommage de batchSampleWeight en batchSampleCategoryWeight (See #7278) adds 17a6ec6 Fixes #7278 Merge branch 'feature/7278' into develop adds 8dcabb7 permettre d'accéder aux mensuration directement après avroi créé le lot (refs #7157) adds 894bf43 permettre de mesurer le lot benthos tout juste créé (fixes #7157) adds d1b16dd Mise à jour du mapping de l'aide en ligne adds 3b15b01 sléection du premier lot mesurable (soit le lot créé s'il n'y a pas de catégorisation, soit le premier fils) (fixes #7157) adds 5d5af52 Fix help mapping adds e876710 Fixes #7157 Merge branch 'feature/7157' into develop adds dd5036d suppression multiple dans les listes de lots (fixes #6112) adds 67e7340 Correction de l'algorithme de suppression des lots en masse (ne pas supprimer un lot si son parent a déjà été supprimé) (See #6112) adds 9ba8340 Changement des niveaux de logs adds be5249d Fixes #6112 Merge branch 'feature/6112' into develop new 404778a Ajout d'une méthode sur le service de persistence pour récupérer le dictionnaire des referent taxon obsolètes (+ ajout d'un nouveau cache) new 894f159 Utilisation du dictionnaire des referents taxons obsolète lors d'un import générique (See #7846) 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 (be5a541) \ N -- N -- N refs/heads/feature/7846_import_generique_avec_taxons_referents_obsoletes (894f159) 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 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 894f1590170070a6653cf6216b72df6b94033ce4 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Dec 23 17:46:16 2015 +0100 Utilisation du dictionnaire des referents taxons obsolète lors d'un import générique (See #7846) commit 404778af449a0ac41f4ada26732beae15a35f203 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Dec 23 17:45:47 2015 +0100 Ajout d'une méthode sur le service de persistence pour récupérer le dictionnaire des referent taxon obsolètes (+ ajout d'un nouveau cache) Summary of changes: .../src/main/filtered-resources/log4j.properties | 6 +- .../filtered-resources/tutti-help-fr.properties | 10 +- .../operation/catches/EditCatchesUIHandler.java | 35 ++++++- .../operation/catches/benthos/BenthosBatchUI.css | 2 - .../catches/benthos/BenthosBatchUIHandler.java | 32 +++++- .../benthos/actions/RemoveBenthosBatchAction.java | 109 ++++++++++++++------- .../benthos/create/CreateBenthosBatchUI.css | 27 ++++- .../benthos/create/CreateBenthosBatchUI.jaxx | 12 +++ .../create/CreateBenthosBatchUIHandler.java | 1 + .../benthos/create/CreateBenthosBatchUIModel.java | 36 ++++++- ...=> CreateBenthosBatchAndFrequenciesAction.java} | 29 ++++-- .../frequency/BenthosFrequencyCellComponent.java | 28 +++--- .../operation/catches/species/SpeciesBatchUI.css | 2 - .../catches/species/SpeciesBatchUIHandler.java | 29 +++++- .../species/actions/RemoveSpeciesBatchAction.java | 102 +++++++++++++------ .../species/create/CreateSpeciesBatchUI.css | 27 ++++- .../species/create/CreateSpeciesBatchUI.jaxx | 12 +++ .../create/CreateSpeciesBatchUIHandler.java | 1 + .../species/create/CreateSpeciesBatchUIModel.java | 31 ++++++ ...=> CreateSpeciesBatchAndFrequenciesAction.java} | 27 +++-- .../frequency/SpeciesFrequencyCellComponent.java | 20 ++-- .../CreateBenthosBatchUIModel-error-validation.xml | 34 +++++-- .../CreateSpeciesBatchUIModel-error-validation.xml | 31 +++++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 29 ++++++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 35 +++++-- 25 files changed, 561 insertions(+), 146 deletions(-) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/actions/{CreateBenthosBatchAndContinueAction.java => CreateBenthosBatchAndFrequenciesAction.java} (64%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/actions/{CreateSpeciesBatchAndCloseAction.java => CreateSpeciesBatchAndFrequenciesAction.java} (62%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (17a6ec6 -> be5249d)
by codelutin.com scm 24 Dec '15

24 Dec '15

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 17a6ec6 Fixes #7278 Merge branch 'feature/7278' into develop adds 8dcabb7 permettre d'accéder aux mensuration directement après avroi créé le lot (refs #7157) adds 894bf43 permettre de mesurer le lot benthos tout juste créé (fixes #7157) adds d1b16dd Mise à jour du mapping de l'aide en ligne adds 3b15b01 sléection du premier lot mesurable (soit le lot créé s'il n'y a pas de catégorisation, soit le premier fils) (fixes #7157) adds 5d5af52 Fix help mapping adds e876710 Fixes #7157 Merge branch 'feature/7157' into develop adds dd5036d suppression multiple dans les listes de lots (fixes #6112) adds 67e7340 Correction de l'algorithme de suppression des lots en masse (ne pas supprimer un lot si son parent a déjà été supprimé) (See #6112) adds 9ba8340 Changement des niveaux de logs new be5249d Fixes #6112 Merge branch 'feature/6112' 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 be5249df569d3532f8f6470dcd1a0d357ab0c632 Merge: e876710 9ba8340 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Dec 24 09:15:32 2015 +0100 Fixes #6112 Merge branch 'feature/6112' into develop Summary of changes: .../src/main/filtered-resources/log4j.properties | 6 +- .../filtered-resources/tutti-help-fr.properties | 10 +- .../operation/catches/EditCatchesUIHandler.java | 35 ++++++- .../operation/catches/benthos/BenthosBatchUI.css | 2 - .../catches/benthos/BenthosBatchUIHandler.java | 28 +++++- .../benthos/actions/RemoveBenthosBatchAction.java | 109 ++++++++++++++------- .../benthos/create/CreateBenthosBatchUI.css | 10 ++ .../benthos/create/CreateBenthosBatchUI.jaxx | 1 + ...=> CreateBenthosBatchAndFrequenciesAction.java} | 29 ++++-- .../frequency/BenthosFrequencyCellComponent.java | 28 +++--- .../operation/catches/species/SpeciesBatchUI.css | 2 - .../catches/species/SpeciesBatchUIHandler.java | 26 ++++- .../species/actions/RemoveSpeciesBatchAction.java | 102 +++++++++++++------ .../species/create/CreateSpeciesBatchUI.css | 10 ++ .../species/create/CreateSpeciesBatchUI.jaxx | 1 + ...=> CreateSpeciesBatchAndFrequenciesAction.java} | 27 +++-- .../frequency/SpeciesFrequencyCellComponent.java | 20 ++-- .../resources/i18n/tutti-ui-swing_en_GB.properties | 12 +++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 16 ++- 19 files changed, 350 insertions(+), 124 deletions(-) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/actions/{CreateBenthosBatchAndContinueAction.java => CreateBenthosBatchAndFrequenciesAction.java} (64%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/actions/{CreateSpeciesBatchAndCloseAction.java => CreateSpeciesBatchAndFrequenciesAction.java} (62%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1