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

branch develop updated (8057682 -> 4b2b1be)
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 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) new 4b2b1be Fixes #7277 Merge branch 'feature/7277' 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 4b2b1becda8a6ddd35e6762d3476a0cdc5c4f955 Merge: 8057682 9ff0de0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Dec 23 16:10:45 2015 +0100 Fixes #7277 Merge branch 'feature/7277' into develop Summary of changes: .../catches/benthos/BenthosBatchUIHandler.java | 2 ++ .../benthos/create/CreateBenthosBatchUI.jaxx | 22 +++++++++++----------- .../create/CreateBenthosBatchUIHandler.java | 10 ++++++++-- .../benthos/create/CreateBenthosBatchUIModel.java | 19 +++++++++++++++++++ .../catches/species/SpeciesBatchUIHandler.java | 2 ++ .../species/create/CreateSpeciesBatchUI.jaxx | 22 +++++++++++----------- .../create/CreateSpeciesBatchUIHandler.java | 9 +++++++-- .../species/create/CreateSpeciesBatchUIModel.java | 19 +++++++++++++++++++ 8 files changed, 79 insertions(+), 26 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/7277 deleted (was 9ff0de0)
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/7277 in repository tutti. See http://git.codelutin.com/tutti.git was 9ff0de0 Correction du test de calcul de la meilleure catégorie de tri à utiliser (See #7277) 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/7277 updated (2effe20 -> 9ff0de0)
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/7277 in repository tutti. See http://git.codelutin.com/tutti.git from 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) No new revisions were added by this update. Summary of changes: .../benthos/create/CreateBenthosBatchUIHandler.java | 15 +++++++-------- .../species/create/CreateSpeciesBatchUIHandler.java | 14 ++++++-------- 2 files changed, 13 insertions(+), 16 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7277 updated (b6ef4f9 -> 2effe20)
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/7277 in repository tutti. See http://git.codelutin.com/tutti.git from 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) new 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) 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 2effe203155a18228e4b0be0cf2df5f521da48e9 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Dec 23 15:38:47 2015 +0100 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) Summary of changes: .../catches/benthos/BenthosBatchUIHandler.java | 2 ++ .../benthos/create/CreateBenthosBatchUI.jaxx | 22 +++++++++++----------- .../create/CreateBenthosBatchUIHandler.java | 19 +++++++++++++------ .../benthos/create/CreateBenthosBatchUIModel.java | 19 +++++++++++++++++++ 4 files changed, 45 insertions(+), 17 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/7277 created (now b6ef4f9)
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/7277 in repository tutti. See http://git.codelutin.com/tutti.git at 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) This branch includes the following new commits: new 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) 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 b6ef4f99ec7359019c74ae89b0ca74f2a45e2f35 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Dec 23 15:24:41 2015 +0100 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) -- 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 (93f5ca1 -> 41f9a91)
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 93f5ca1 ajout du champs de poids de sous echantillon sur l'ecran de creation de lot d'especes (fixes #7278) discards eb6d09a ajout du champs de poids de sous echantillon sur l'ecran de creation de lot du benthos (refs #7278) adds d53f38b recuperation de la colonne des especes par son identifier plutot que par l'index, qui varie en fonction des colonnes cachées (fixes #7854) adds 76255ee Fixes #7854 Merge branch 'feature/7854' into develop adds c22d2df pouvoir ordonner les caractéristiques du trait dans le protocole (fixes #7025) adds fcdeafb Mise à jour de mapping de l'aide adds 1e88649 Reformatag, ajout serialVersionUID + bonne javadoc de création adds 256ba74 Fixes #7025 Merge branch 'feature/7025' into develop 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 5db4316 ajout du champs de poids de sous echantillon sur l'ecran de creation de lot du benthos (refs #7278) adds add4323 ajout du champs de poids de sous echantillon sur l'ecran de creation de lot d'especes (fixes #7278) adds 4361fd8 Mise à jour du mapping de l'aide en ligne adds 41f9a91 Mise à jour du mapping de l'aide en ligne 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 (93f5ca1) \ N -- N -- N refs/heads/feature/7278 (41f9a91) 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 | 30 ++++++++-------- .../EditCatchesForSelectedCruiseAction.java | 34 ++++++++++++++++++ .../EditSampleCategoryModelTableModel.java | 14 ++------ .../content/home/actions/EditCatchesAction.java | 8 ++--- .../catches/SpeciesAbleBatchRowHelper.java | 4 --- .../catches/benthos/BenthosBatchUIHandler.java | 40 +++++++++++++++++----- .../catches/species/SpeciesBatchUIHandler.java | 40 +++++++++++++++++----- .../EditProtocolCaracteristicsRowModel.java | 7 ++++ .../EditProtocolCaracteristicsTableModel.java | 8 +++-- .../EditProtocolOperationFieldsRowModel.java | 4 +++ .../EditProtocolOperationFieldsTableModel.java | 2 ++ .../protocol/EditProtocolSpeciesTableModel.java | 4 +-- .../ui/swing/content/protocol/EditProtocolUI.css | 21 ++++++++++++ .../ui/swing/content/protocol/EditProtocolUI.jaxx | 2 ++ .../content/protocol/EditProtocolUIHandler.java | 35 +++++++++++++++++-- .../content/protocol/EditProtocolUIModel.java | 27 +++++++++++++++ .../MoveDownCaracteristicMappingAction.java} | 22 ++++++------ .../actions/MoveUpCaracteristicMappingAction.java} | 22 ++++++------ .../swing/util/table/AbstractTuttiTableModel.java | 30 ++++++++++++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 6 ++++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 6 ++++ 21 files changed, 288 insertions(+), 78 deletions(-) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{category/actions/MoveDownSampleCategoryRowAction.java => protocol/actions/MoveDownCaracteristicMappingAction.java} (61%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{category/actions/MoveUpSampleCategoryRowAction.java => protocol/actions/MoveUpCaracteristicMappingAction.java} (61%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableModel.java -- 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 (6571bcd -> 5c8fb7d)
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 from 6571bcd Mise à jour du mapping de l'aide en ligne adds 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) No new revisions were added by this update. Summary of changes: .../operation/catches/EditCatchesUIHandler.java | 14 ++++++-------- .../catches/benthos/BenthosBatchUIHandler.java | 9 ++++++++- .../CreateBenthosBatchAndFrequenciesAction.java | 20 +++++++++++++++++--- .../catches/species/SpeciesBatchUIHandler.java | 9 ++++++++- .../CreateSpeciesBatchAndFrequenciesAction.java | 17 +++++++++++++++-- 5 files changed, 54 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 develop updated (256ba74 -> 8057682)
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 256ba74 Fixes #7025 Merge branch 'feature/7025' into develop 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) new 8057682 Fixes #7856 Merge branch 'feature/7856' 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 80576822f61c3b4d7f1ed9ce19766e0760b36630 Merge: 256ba74 277a2ee Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Dec 23 12:25:39 2015 +0100 Fixes #7856 Merge branch 'feature/7856' into develop Summary of changes: .../EditCatchesForSelectedCruiseAction.java | 34 ++++++++++++++++++++++ .../content/home/actions/EditCatchesAction.java | 8 ++--- 2 files changed, 38 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/7856 deleted (was 277a2ee)
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/7856 in repository tutti. See http://git.codelutin.com/tutti.git was 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) 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 (2c551fe -> 6571bcd)
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 2c551fe permettre de mesurer le lot benthos tout juste créé (fixes #7157) discards 90e2034 permettre d'accéder aux mensuration directement après avroi créé le lot (refs #7157) adds 563b581 amélioration de la configuration du site adds 8cdb554 utilisation codelutinpom 5 adds 4877a20 améliorer la lisibilité du n° de lot dans le tableau espèces, benthos etc, en ajoutant un espace : 123 456 (et pas 123456) (fixes #7275) adds dd990d0 Fixes #7275 Merge branch 'feature/7275' into develop adds adde683 suppression de l'ouverture du client mail après la génération du rapport pdf (fixes #7202) adds 67caa3d Suppression des traductions obsolètes adds ff8234f Fixes #7202 Merge branch 'feature/7202' into develop adds b278dae le séparateur espace était celui par défaut, donc ca passait sur nos machines, mais en fait il n'était pas pris en compte. fixes #7275 adds 6181762 (idem) adds 5bc6822 Fixes #7275 Merge branch 'feature/7275_fix' into develop adds 0570dfc à la crétion d'un lot ou à la catégorisation sur les especes, quand l'utilisateur saisit un poids sur une catégorie, automatiquement cocher la catégorie (refs #7211) adds 6ad469a à la crétion d'un lot ou à la catégorisation sur le benthos, quand l'utilisateur saisit un poids sur une catégorie, automatiquement cocher la catégorie (fixes #7211) adds 78f361a Utilisation de listener unique autant que possible adds 485eb00 Fixes #7211 Merge branch 'feature/7211' into develop adds 964c2c3 ajouter saisie poids sous échantiollon si saisie d'un nombre sur les espèces (refs #7156) adds a25885a ajouter saisie poids sous échantiollon si saisie d'un nombre sur le benthos (fixes #7156) adds fb25ebb Fixes #7156 Merge branch 'feature/7156' into develop adds d53f38b recuperation de la colonne des especes par son identifier plutot que par l'index, qui varie en fonction des colonnes cachées (fixes #7854) adds 76255ee Fixes #7854 Merge branch 'feature/7854' into develop adds c22d2df pouvoir ordonner les caractéristiques du trait dans le protocole (fixes #7025) adds fcdeafb Mise à jour de mapping de l'aide adds 1e88649 Reformatag, ajout serialVersionUID + bonne javadoc de création adds 256ba74 Fixes #7025 Merge branch 'feature/7025' into develop adds 325f62e permettre d'accéder aux mensuration directement après avroi créé le lot (refs #7157) adds b9f09e4 permettre de mesurer le lot benthos tout juste créé (fixes #7157) adds 6571bcd Mise à jour du mapping de l'aide en ligne 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 (2c551fe) \ N -- N -- N refs/heads/feature/7157 (6571bcd) 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/site/site_fr.xml | 3 - .../fr/ifremer/tutti/service/DecoratorService.java | 42 ++++-- .../tutti/service/DecoratorServiceTest.java | 9 ++ .../filtered-resources/tutti-help-fr.properties | 24 +-- .../EditSampleCategoryModelTableModel.java | 14 +- .../home/actions/SendCruiseReportAction.java | 17 +-- .../catches/AbstractTuttiBatchTableUIHandler.java | 42 +++++- .../catches/SpeciesAbleBatchRowHelper.java | 4 - .../accidental/AccidentalBatchUIHandler.java | 2 +- .../catches/benthos/BenthosBatchUIHandler.java | 18 ++- .../create/CreateBenthosBatchUIHandler.java | 168 ++++++++++++--------- .../frequency/BenthosFrequencyCellComponent.java | 4 +- .../benthos/frequency/BenthosFrequencyUI.css | 30 +++- .../benthos/frequency/BenthosFrequencyUI.jaxx | 12 +- .../frequency/BenthosFrequencyUIHandler.java | 5 +- .../benthos/split/SplitBenthosBatchUIHandler.java | 92 ++++++----- .../IndividualObservationBatchUIHandler.java | 2 +- .../marinelitter/MarineLitterBatchUIHandler.java | 2 +- .../catches/species/SpeciesBatchUIHandler.java | 18 ++- .../create/CreateSpeciesBatchUIHandler.java | 167 +++++++++++--------- .../frequency/SpeciesFrequencyCellComponent.java | 4 +- .../species/frequency/SpeciesFrequencyUI.css | 29 +++- .../species/frequency/SpeciesFrequencyUI.jaxx | 12 +- .../frequency/SpeciesFrequencyUIHandler.java | 6 +- .../species/split/SplitSpeciesBatchUIHandler.java | 92 ++++++----- .../EditProtocolCaracteristicsRowModel.java | 7 + .../EditProtocolCaracteristicsTableModel.java | 8 +- .../EditProtocolOperationFieldsRowModel.java | 4 + .../EditProtocolOperationFieldsTableModel.java | 2 + .../protocol/EditProtocolSpeciesTableModel.java | 4 +- .../ui/swing/content/protocol/EditProtocolUI.css | 21 +++ .../ui/swing/content/protocol/EditProtocolUI.jaxx | 2 + .../content/protocol/EditProtocolUIHandler.java | 35 ++++- .../content/protocol/EditProtocolUIModel.java | 27 ++++ .../MoveDownCaracteristicMappingAction.java} | 22 +-- .../actions/MoveUpCaracteristicMappingAction.java} | 22 +-- .../swing/util/table/AbstractTuttiTableModel.java | 30 ++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 18 ++- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 22 ++- 40 files changed, 684 insertions(+), 360 deletions(-) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{category/actions/MoveDownSampleCategoryRowAction.java => protocol/actions/MoveDownCaracteristicMappingAction.java} (61%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{category/actions/MoveUpSampleCategoryRowAction.java => protocol/actions/MoveUpCaracteristicMappingAction.java} (61%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableModel.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0