This is an automated email from the git hooks/post-receive script. New commit to branch feature/7930 in repository tutti. See http://git.codelutin.com/tutti.git commit 4f565d369c3a7598266932e19a8113ab7e4a1e74 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Feb 9 00:06:22 2016 +0100 Ajout d'une propriété pour utiliser le prélèvement des pièces calcifiées, et utilisation dans l'éditeur de protocole --- .../src/main/xmi/tutti-persistence.zargo | Bin 60983 -> 61039 bytes .../filtered-resources/tutti-help-fr.properties | 24 ++------------------- .../ui/swing/content/protocol/EditProtocolUI.jaxx | 18 +++++++++++++--- .../ui/swing/content/protocol/EditProtocolUI.jcss | 11 ++++++++++ .../content/protocol/EditProtocolUIModel.java | 12 +++++++++++ .../EditProtocolUIModel-error-validation.xml | 2 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 3 +++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 5 ++++- 8 files changed, 48 insertions(+), 27 deletions(-) diff --git a/tutti-persistence/src/main/xmi/tutti-persistence.zargo b/tutti-persistence/src/main/xmi/tutti-persistence.zargo index 25ca92e..ec0a03b 100644 Binary files a/tutti-persistence/src/main/xmi/tutti-persistence.zargo and b/tutti-persistence/src/main/xmi/tutti-persistence.zargo differ diff --git a/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties b/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties index 8382f32..0a664c5 100644 --- a/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties +++ b/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties @@ -1,26 +1,5 @@ -### -# #%L -# Tutti :: UI -# %% -# Copyright (C) 2012 - 2015 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Fri Jan 15 19:43:38 CET 2016 +#Mon Feb 08 23:54:51 CET 2016 tutti.config.help=config.html tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions tutti.createAccidentalBatch.action.saveAndClose.help=editFishingOperation.html\#captureCapturesAccidentellesActions @@ -279,6 +258,7 @@ tutti.editProtocol.field.individualObservation.help=editProtocol.html\#fieldsCar tutti.editProtocol.field.lengthClasses.help=editProtocol.html\#fieldsCaracteristics tutti.editProtocol.field.name.help=editProtocol.html\#fields tutti.editProtocol.field.species.help=editProtocol.html\#fieldsSpecies +tutti.editProtocol.field.useCalcifiedPieceSampling.help= tutti.editProtocol.field.vesselUseFeature.help=editProtocol.html\#fieldsCaracteristics tutti.editProtocol.help=editProtocol.html tutti.editProtocol.pane.caracteristic.help=editProtocol.html\#fieldsCaracteristics diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx index 33d7ad5..b30c73f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx @@ -239,9 +239,21 @@ </Table> </JPanel> </tab> - <tab title='tutti.editProtocol.tab.zone'> - <ZoneEditorUI id="zoneEditor" - constructorParams='this'/> + + <tab title='tutti.editProtocol.tab.cps'> + <JPanel layout='{new BorderLayout(10, 10)}'> + <JCheckBox id='useCalcifiedPieceSampling' constraints='BorderLayout.NORTH' border="{new TitledBorder(null, null)}" + onItemStateChanged='handler.setBoolean(event, "useCalcifiedPieceSampling")'/> + <JTabbedPane id='cpsTabbedPane' constraints='BorderLayout.CENTER'> + + <tab title='tutti.editProtocol.tab.zone'> + <ZoneEditorUI id="zoneEditor" constructorParams='this'/> + </tab> + <tab title='tutti.editProtocol.tab.algorithm'> + <CalcifiedPiecesSamplingEditorUI id="calcifiedPiecesSamplingEditorUI" constructorParams='this'/> + </tab> + </JTabbedPane> + </JPanel> </tab> </JTabbedPane> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jcss b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jcss index 51e0b14..daad976 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jcss +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jcss @@ -159,6 +159,17 @@ JTextField { _help: {"tutti.editProtocol.field.lengthClasses.help"}; } +#cpsTabbedPane { + visible: {model.isUseCalcifiedPieceSampling()}; +} + +#useCalcifiedPieceSampling { + text: "tutti.editProtocol.field.useCalcifiedPieceSampling"; + selected: {model.isUseCalcifiedPieceSampling()}; + toolTipText: "tutti.editProtocol.field.useCalcifiedPieceSampling.tip"; + _help: {"tutti.editProtocol.field.useCalcifiedPieceSampling.help"}; +} + #saveButton { actionIcon: save; text: "tutti.editProtocol.action.saveProtocol"; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java index 5366fa8..ae52a8b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java @@ -975,6 +975,18 @@ public class EditProtocolUIModel extends AbstractTuttiBeanUIModel<TuttiProtocol, return editObject.getOperationFieldMapping(index); } + @Override + public boolean isUseCalcifiedPieceSampling() { + return editObject.isUseCalcifiedPieceSampling(); + } + + @Override + public void setUseCalcifiedPieceSampling(boolean useCalcifiedPieceSampling) { + boolean oldValue = isUseCalcifiedPieceSampling(); + editObject.setUseCalcifiedPieceSampling(useCalcifiedPieceSampling); + firePropertyChanged(TuttiProtocol.PROPERTY_USE_CALCIFIED_PIECE_SAMPLING, oldValue, useCalcifiedPieceSampling); + } + public int numberOfRows(String column) { int result = 0; MutableInt mutableInt = numberOfRowsByColumn.get(column); diff --git a/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel-error-validation.xml b/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel-error-validation.xml index 62a6e21..80b6b39 100644 --- a/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel-error-validation.xml +++ b/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel-error-validation.xml @@ -29,7 +29,7 @@ <field name="availableStratas"> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ availableStratas.isEmpty() ]]> + <![CDATA[ !useCalcifiedPieceSampling || availableStratas.isEmpty() ]]> </param> <message> tutti.validator.error.zoneEditor.availableStratas.remaining diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties index ec22d52..9a83634 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties @@ -1099,6 +1099,9 @@ tutti.editProtocol.field.comment.tip= tutti.editProtocol.field.protocol.name= tutti.editProtocol.field.protocol.name.tip= tutti.editProtocol.field.species.tip= +tutti.editProtocol.field.useCalcifiedPieceSampling= +tutti.editProtocol.field.useCalcifiedPieceSampling.tip= +tutti.editProtocol.tab.algorithm= tutti.editProtocol.tab.benthos= tutti.editProtocol.tab.caracteristic= tutti.editProtocol.tab.caracteristic.gearUseFeature= diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index 8b5fc63..e4c9229 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -1052,12 +1052,15 @@ tutti.editProtocol.field.comment.tip=Commentaire tutti.editProtocol.field.protocol.name=Nom tutti.editProtocol.field.protocol.name.tip=Nom du protocole tutti.editProtocol.field.species.tip=Espèces +tutti.editProtocol.field.useCalcifiedPieceSampling=Effectuer le prélèvement de pièces calcifiées +tutti.editProtocol.field.useCalcifiedPieceSampling.tip=Effectuer le prélèvement de pièces calcifiées +tutti.editProtocol.tab.algorithm=Algorithme tutti.editProtocol.tab.benthos=Benthos tutti.editProtocol.tab.caracteristic=Caractéristiques tutti.editProtocol.tab.caracteristic.individualObservation=Observations individuelles tutti.editProtocol.tab.caracteristic.lengthClasses=Classes de taille tutti.editProtocol.tab.caracteristic.mapping=Caractéristiques du trait -tutti.editProtocol.tab.cps= +tutti.editProtocol.tab.cps=Prélèvement de pièces calcifiées tutti.editProtocol.tab.info=Informations générales tutti.editProtocol.tab.species=Espèces tutti.editProtocol.tab.zone=Zones -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.