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

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

branch feature/7856 created (now 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 at 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) This branch includes the following new commits: new 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 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 277a2ee527743d4a55f0f406c930c2460d06bab5 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Dec 23 12:09:19 2015 +0100 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) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (76255ee -> 256ba74)
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 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 new 256ba74 Fixes #7025 Merge branch 'feature/7025' 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 256ba74cb4bffe00af30a4efb0eb32125b4330d6 Merge: 76255ee 1e88649 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Dec 23 11:41:49 2015 +0100 Fixes #7025 Merge branch 'feature/7025' into develop Summary of changes: .../filtered-resources/tutti-help-fr.properties | 22 +++++++------- .../EditSampleCategoryModelTableModel.java | 14 ++------- .../catches/benthos/BenthosBatchUIHandler.java | 34 +++++++++++++++++---- .../catches/species/SpeciesBatchUIHandler.java | 34 +++++++++++++++++---- .../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 ++++ 18 files changed, 240 insertions(+), 60 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 1

branch feature/7025 deleted (was 1e88649)
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/7025 in repository tutti. See http://git.codelutin.com/tutti.git was 1e88649 Reformatag, ajout serialVersionUID + bonne javadoc de création 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/7025 updated (98ebee4 -> 1e88649)
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/7025 in repository tutti. See http://git.codelutin.com/tutti.git discards 98ebee4 pouvoir ordonner les caractéristiques du trait dans le protocole (fixes #7025) 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 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 (98ebee4) \ N -- N -- N refs/heads/feature/7025 (1e88649) 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 | 22 ++++++------ .../catches/SpeciesAbleBatchRowHelper.java | 4 --- .../catches/benthos/BenthosBatchUIHandler.java | 40 +++++++++++++++++----- .../catches/species/SpeciesBatchUIHandler.java | 40 +++++++++++++++++----- .../EditProtocolCaracteristicsRowModel.java | 7 ++++ .../EditProtocolCaracteristicsTableModel.java | 4 ++- .../EditProtocolOperationFieldsRowModel.java | 4 +++ .../EditProtocolOperationFieldsTableModel.java | 2 ++ .../protocol/EditProtocolSpeciesTableModel.java | 4 +-- .../content/protocol/EditProtocolUIHandler.java | 39 ++++++++++++++++++--- .../content/protocol/EditProtocolUIModel.java | 1 + .../MoveDownCaracteristicMappingAction.java | 6 ++-- .../actions/MoveUpCaracteristicMappingAction.java | 6 ++-- .../swing/util/table/AbstractTuttiTableModel.java | 4 ++- 14 files changed, 137 insertions(+), 46 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 (fb25ebb -> 76255ee)
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 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) new 76255ee Fixes #7854 Merge branch 'feature/7854' 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 76255eef9d99e9f514d474ec391d9cc268edbd5c Merge: fb25ebb d53f38b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Dec 23 11:03:27 2015 +0100 Fixes #7854 Merge branch 'feature/7854' into develop Summary of changes: .../swing/content/operation/catches/SpeciesAbleBatchRowHelper.java | 4 ---- .../content/operation/catches/benthos/BenthosBatchUIHandler.java | 6 +++--- .../content/operation/catches/species/SpeciesBatchUIHandler.java | 6 +++--- 3 files changed, 6 insertions(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/7854 deleted (was d53f38b)
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/7854 in repository tutti. See http://git.codelutin.com/tutti.git was 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) 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/7025 created (now 98ebee4)
by codelutin.com scm Dec. 22, 2015

Dec. 22, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7025 in repository tutti. See http://git.codelutin.com/tutti.git at 98ebee4 pouvoir ordonner les caractéristiques du trait dans le protocole (fixes #7025) This branch includes the following new commits: new 98ebee4 pouvoir ordonner les caractéristiques du trait dans le protocole (fixes #7025) 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 98ebee456344d0983914d9f931d9bc7876446667 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Dec 22 15:17:01 2015 +0100 pouvoir ordonner les caractéristiques du trait dans le protocole (fixes #7025) -- 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 (eb6d09a -> 93f5ca1)
by codelutin.com scm Dec. 22, 2015

Dec. 22, 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 eb6d09a ajout du champs de poids de sous echantillon sur l'ecran de creation de lot du benthos (refs #7278) new 93f5ca1 ajout du champs de poids de sous echantillon sur l'ecran de creation de lot d'especes (fixes #7278) 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 93f5ca10be30ff6f90bf9b0a5a10eb8c6dd4087c Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Dec 22 12:04:25 2015 +0100 ajout du champs de poids de sous echantillon sur l'ecran de creation de lot d'especes (fixes #7278) Summary of changes: .../filtered-resources/tutti-help-fr.properties | 3 ++- .../catches/benthos/BenthosBatchUIHandler.java | 1 - .../catches/species/SpeciesBatchUIHandler.java | 3 ++- .../species/create/CreateSpeciesBatchUI.css | 17 ++++++++++++++- .../species/create/CreateSpeciesBatchUI.jaxx | 11 ++++++++++ .../create/CreateSpeciesBatchUIHandler.java | 1 + .../species/create/CreateSpeciesBatchUIModel.java | 19 ++++++++++++++++ .../CreateSpeciesBatchUIModel-error-validation.xml | 25 ++++++++++++++++++++-- .../resources/i18n/tutti-ui-swing_en_GB.properties | 2 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 8 ++++--- 10 files changed, 81 insertions(+), 9 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 created (now eb6d09a)
by codelutin.com scm Dec. 22, 2015

Dec. 22, 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 at eb6d09a ajout du champs de poids de sous echantillon sur l'ecran de creation de lot du benthos (refs #7278) This branch includes the following new commits: new eb6d09a ajout du champs de poids de sous echantillon sur l'ecran de creation de lot du benthos (refs #7278) 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 eb6d09a6f68be73fdf544c45acc4eb2bb09e2beb Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Dec 22 11:40:51 2015 +0100 ajout du champs de poids de sous echantillon sur l'ecran de creation de lot du benthos (refs #7278) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1