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

branch feature/6112 updated (990eb96 -> 9ba8340)
by codelutin.com scm Dec. 24, 2015

Dec. 24, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/6112 in repository tutti. See http://git.codelutin.com/tutti.git discards 990eb96 suppression multiple dans les listes de lots (fixes #6112) 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 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 (990eb96) \ N -- N -- N refs/heads/feature/6112 (9ba8340) 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: .../src/main/filtered-resources/log4j.properties | 6 ++-- .../filtered-resources/tutti-help-fr.properties | 10 ++++-- .../operation/catches/EditCatchesUIHandler.java | 35 ++++++++++++++++++--- .../catches/benthos/BenthosBatchUIHandler.java | 14 +++++++-- .../benthos/actions/RemoveBenthosBatchAction.java | 30 ++++++++++++++++-- .../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 ++++++++--------- .../catches/species/SpeciesBatchUIHandler.java | 11 +++++-- .../species/actions/RemoveSpeciesBatchAction.java | 31 +++++++++++++++++-- .../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 | 23 ++++++++++++++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 25 ++++++++++++--- 23 files changed, 425 insertions(+), 76 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 0

branch feature/7157 deleted (was 5d5af52)
by codelutin.com scm Dec. 23, 2015

Dec. 23, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7157 in repository tutti. See http://git.codelutin.com/tutti.git was 5d5af52 Fix help mapping 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/7157 updated (5c8fb7d -> 5d5af52)
by codelutin.com scm Dec. 23, 2015

Dec. 23, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7157 in repository tutti. See http://git.codelutin.com/tutti.git discards 5c8fb7d 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) discards 6571bcd Mise à jour du mapping de l'aide en ligne discards b9f09e4 permettre de mesurer le lot benthos tout juste créé (fixes #7157) discards 325f62e permettre d'accéder aux mensuration directement après avroi créé le lot (refs #7157) adds 277a2ee sélection du premier éléménent de la combo quand on arrive sur l'ecran à partir du menu en haut de l'ecran (fixes #7856) adds 8057682 Fixes #7856 Merge branch 'feature/7856' into develop adds b6ef4f9 on garde dans le modèle la dernirèe categorie V/HV qui a été utilisée à la création d'un batch pour la resélectionner dans la combo lors de la création du batch suivant (quand on choisit une espèce)(refs #7277) adds 2effe20 on garde dans le modèle la dernirèe categorie V/HV qui a été utilisée à la création d'un batch de benthos our la resélectionner dans la combo lors de la création du batch suivant (quand on choisit une espèce)(fixes #7277) adds 9ff0de0 Correction du test de calcul de la meilleure catégorie de tri à utiliser (See #7277) adds 4b2b1be Fixes #7277 Merge branch 'feature/7277' into develop 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 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 (5c8fb7d) \ N -- N -- N refs/heads/feature/7157 (5d5af52) 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: .../filtered-resources/tutti-help-fr.properties | 20 ++++---- .../EditCatchesForSelectedCruiseAction.java | 34 ++++++++++++++ .../content/home/actions/EditCatchesAction.java | 8 ++-- .../catches/benthos/BenthosBatchUIHandler.java | 5 +- .../benthos/create/CreateBenthosBatchUI.css | 17 ++++++- .../benthos/create/CreateBenthosBatchUI.jaxx | 31 +++++++++---- .../create/CreateBenthosBatchUIHandler.java | 11 ++++- .../benthos/create/CreateBenthosBatchUIModel.java | 53 +++++++++++++++++++++- .../catches/species/SpeciesBatchUIHandler.java | 4 +- .../species/create/CreateSpeciesBatchUI.css | 17 ++++++- .../species/create/CreateSpeciesBatchUI.jaxx | 31 +++++++++---- .../create/CreateSpeciesBatchUIHandler.java | 10 +++- .../species/create/CreateSpeciesBatchUIModel.java | 50 ++++++++++++++++++++ .../CreateBenthosBatchUIModel-error-validation.xml | 34 +++++++++++--- .../CreateSpeciesBatchUIModel-error-validation.xml | 31 +++++++++++-- .../resources/i18n/tutti-ui-swing_en_GB.properties | 17 +++++++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 19 ++++++-- 17 files changed, 333 insertions(+), 59 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7161 created (now 773ab0f)
by codelutin.com scm Dec. 23, 2015

Dec. 23, 2015

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 at 773ab0f passage à jaxx 2.27 snapshot pour tester l'editeur de date (refs #7161) This branch includes the following new commits: new 773ab0f passage à jaxx 2.27 snapshot pour tester l'editeur de date (refs #7161) 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 773ab0f5c2dd2a0985eb2d404d23e104a5925ca4 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) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (4b2b1be -> 17a6ec6)
by codelutin.com scm Dec. 23, 2015

Dec. 23, 2015

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 4b2b1be Fixes #7277 Merge branch 'feature/7277' into develop 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) new 17a6ec6 Fixes #7278 Merge branch 'feature/7278' 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 17a6ec61d7051d3d709759055260d04f152fa0c0 Merge: 4b2b1be 4de1cf6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Dec 23 18:54:38 2015 +0100 Fixes #7278 Merge branch 'feature/7278' into develop Summary of changes: .../filtered-resources/tutti-help-fr.properties | 10 +++--- .../catches/benthos/BenthosBatchUIHandler.java | 4 ++- .../benthos/create/CreateBenthosBatchUI.css | 17 +++++++++- .../benthos/create/CreateBenthosBatchUI.jaxx | 11 +++++++ .../create/CreateBenthosBatchUIHandler.java | 1 + .../benthos/create/CreateBenthosBatchUIModel.java | 36 ++++++++++++++++++++-- .../catches/species/SpeciesBatchUIHandler.java | 3 +- .../species/create/CreateSpeciesBatchUI.css | 17 +++++++++- .../species/create/CreateSpeciesBatchUI.jaxx | 11 +++++++ .../create/CreateSpeciesBatchUIHandler.java | 1 + .../species/create/CreateSpeciesBatchUIModel.java | 31 +++++++++++++++++++ .../CreateBenthosBatchUIModel-error-validation.xml | 34 +++++++++++++++----- .../CreateSpeciesBatchUIModel-error-validation.xml | 31 ++++++++++++++++--- .../resources/i18n/tutti-ui-swing_en_GB.properties | 17 ++++++++++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 19 +++++++++--- 15 files changed, 216 insertions(+), 27 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/7278 deleted (was 4de1cf6)
by codelutin.com scm Dec. 23, 2015

Dec. 23, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7278 in repository tutti. See http://git.codelutin.com/tutti.git was 4de1cf6 Renommage de batchSampleWeight en batchSampleCategoryWeight (See #7278) 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/7278 updated (0809799 -> 4de1cf6)
by codelutin.com scm Dec. 23, 2015

Dec. 23, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7278 in repository tutti. See http://git.codelutin.com/tutti.git discards 0809799 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) discards 4669364 - le poids de sous echantillon doit etre strictement inferieru au poids de catégorie - i18n (refs #7278) discards 41f9a91 Mise à jour du mapping de l'aide en ligne discards 4361fd8 Mise à jour du mapping de l'aide en ligne discards add4323 ajout du champs de poids de sous echantillon sur l'ecran de creation de lot d'especes (fixes #7278) discards 5db4316 ajout du champs de poids de sous echantillon sur l'ecran de creation de lot du benthos (refs #7278) adds b6ef4f9 on garde dans le modèle la dernirèe categorie V/HV qui a été utilisée à la création d'un batch pour la resélectionner dans la combo lors de la création du batch suivant (quand on choisit une espèce)(refs #7277) adds 2effe20 on garde dans le modèle la dernirèe categorie V/HV qui a été utilisée à la création d'un batch de benthos our la resélectionner dans la combo lors de la création du batch suivant (quand on choisit une espèce)(fixes #7277) adds 9ff0de0 Correction du test de calcul de la meilleure catégorie de tri à utiliser (See #7277) adds 4b2b1be Fixes #7277 Merge branch 'feature/7277' into develop 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) 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 (0809799) \ N -- N -- N refs/heads/feature/7278 (4de1cf6) 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: .../filtered-resources/tutti-help-fr.properties | 4 +-- .../catches/benthos/BenthosBatchUIHandler.java | 4 ++- .../benthos/create/CreateBenthosBatchUI.css | 18 +++++----- .../benthos/create/CreateBenthosBatchUI.jaxx | 28 +++++++-------- .../create/CreateBenthosBatchUIHandler.java | 12 +++++-- .../benthos/create/CreateBenthosBatchUIModel.java | 42 ++++++++++++++++------ .../catches/species/SpeciesBatchUIHandler.java | 4 ++- .../species/create/CreateSpeciesBatchUI.css | 18 +++++----- .../species/create/CreateSpeciesBatchUI.jaxx | 28 +++++++-------- .../create/CreateSpeciesBatchUIHandler.java | 11 ++++-- .../species/create/CreateSpeciesBatchUIModel.java | 37 ++++++++++++++----- .../CreateBenthosBatchUIModel-error-validation.xml | 16 ++++----- .../CreateSpeciesBatchUIModel-error-validation.xml | 16 ++++----- .../resources/i18n/tutti-ui-swing_en_GB.properties | 9 +++-- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 17 ++++----- 15 files changed, 162 insertions(+), 102 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 created (now be5a541)
by codelutin.com scm Dec. 23, 2015

Dec. 23, 2015

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 at be5a541 Utilisation du dictionnaire des referents taxons obsolète lors d'un import générique (See #7846) This branch includes the following new commits: new 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) new be5a541 Utilisation du dictionnaire des referents taxons obsolète lors d'un import générique (See #7846) 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 be5a5414b7705d5ebb56d5bd7c038893d55b6c38 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 3793e24d62acda2aab8a8e4e7cc9a26d8bb8ec52 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) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch feature/6112 created (now 990eb96)
by codelutin.com scm Dec. 23, 2015

Dec. 23, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/6112 in repository tutti. See http://git.codelutin.com/tutti.git at 990eb96 suppression multiple dans les listes de lots (fixes #6112) This branch includes the following new commits: new 990eb96 suppression multiple dans les listes de lots (fixes #6112) 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 990eb965d2d458370f13a1548a0f8f071eafe80d Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Dec 23 17:29:01 2015 +0100 suppression multiple dans les listes de lots (fixes #6112) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/7278 updated (41f9a91 -> 0809799)
by codelutin.com scm Dec. 23, 2015

Dec. 23, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7278 in repository tutti. See http://git.codelutin.com/tutti.git from 41f9a91 Mise à jour du mapping de l'aide en ligne adds 4669364 - le poids de sous echantillon doit etre strictement inferieru au poids de catégorie - i18n (refs #7278) adds 0809799 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) No new revisions were added by this update. Summary of changes: .../catches/benthos/create/CreateBenthosBatchUI.css | 2 +- .../catches/benthos/create/CreateBenthosBatchUIModel.java | 12 ++++++++++++ .../catches/species/create/CreateSpeciesBatchUI.css | 2 +- .../catches/species/create/CreateSpeciesBatchUIModel.java | 12 ++++++++++++ .../create/CreateBenthosBatchUIModel-error-validation.xml | 12 ++++++------ .../create/CreateSpeciesBatchUIModel-error-validation.xml | 12 ++++++------ .../src/main/resources/i18n/tutti-ui-swing_en_GB.properties | 2 ++ .../src/main/resources/i18n/tutti-ui-swing_fr_FR.properties | 4 +++- 8 files changed, 43 insertions(+), 15 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0