This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit d0a9b499db43d06fe5c28e7886e0994099c3f424 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 28 13:27:19 2016 +0200 Ajout boolean sur SetSeine (ui) --- .../swing/ui/content/table/impl/seine/TargetCatchUI.jaxx | 11 +++++++++++ .../swing/ui/content/table/impl/seine/TargetCatchUI.jcss | 7 +++++++ .../ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx | 11 +++++++++++ .../ui/content/table/impl/seine/TargetDiscardCatchUI.jcss | 7 +++++++ .../main/resources/i18n/application-swing_en_GB.properties | 2 ++ .../main/resources/i18n/application-swing_es_ES.properties | 2 ++ .../main/resources/i18n/application-swing_fr_FR.properties | 2 ++ 7 files changed, 42 insertions(+) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jaxx index eb69f64..39efaa2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jaxx @@ -40,6 +40,8 @@ jaxx.runtime.swing.editor.NumberEditor jaxx.runtime.swing.editor.bean.BeanComboBox + org.apache.commons.lang3.BooleanUtils + java.awt.Dimension static fr.ird.observe.application.swing.ui.UIHelper.getStringValue @@ -138,4 +140,13 @@ </row> </Table> + <Table id='extraZone'> + <!-- targetCatchCompositionEstimatedByObserver --> + <row> + <cell> + <JCheckBox id='targetCatchCompositionEstimatedByObserver'/> + </cell> + </row> + </Table> + </fr.ird.observe.application.swing.ui.content.table.ContentTableUI> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jcss index 25905db..96d8532 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jcss @@ -86,3 +86,10 @@ #comment2 { text:{getStringValue(tableEditBean.getComment())}; } + +#targetCatchCompositionEstimatedByObserver { + text:"observe.content.setLongline.targetCatchCompositionEstimatedByObserver"; + horizontalTextPosition:{JCheckBox.LEFT}; + _propertyName:{SetSeineTargetCatchDto.PROPERTY_TARGET_CATCH_COMPOSITION_ESTIMATED_BY_OBSERVER}; + selected:{BooleanUtils.isTrue(bean.isTargetCatchCompositionEstimatedByObserver())}; +} \ No newline at end of file diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx index 9fd112a..affb831 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx @@ -42,6 +42,8 @@ jaxx.runtime.swing.editor.NumberEditor jaxx.runtime.swing.editor.bean.BeanComboBox + org.apache.commons.lang3.BooleanUtils + java.awt.Dimension static fr.ird.observe.application.swing.ui.UIHelper.getStringValue @@ -148,4 +150,13 @@ </Table> + <Table id='extraZone'> + <!-- targetDiscardCatchCompositionEstimatedByObserver --> + <row> + <cell weightx='1'> + <JCheckBox id='targetDiscardCatchCompositionEstimatedByObserver'/> + </cell> + </row> + </Table> + </fr.ird.observe.application.swing.ui.content.table.ContentTableUI> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jcss index 9aabfc8..5231364 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jcss @@ -98,3 +98,10 @@ #comment2 { text:{getStringValue(tableEditBean.getComment())}; } + +#targetDiscardCatchCompositionEstimatedByObserver { + text:"observe.content.setLongline.targetDiscardCatchCompositionEstimatedByObserver"; + horizontalTextPosition:{JCheckBox.LEFT}; + _propertyName:{SetSeineTargetCatchDto.PROPERTY_TARGET_DISCARD_CATCH_COMPOSITION_ESTIMATED_BY_OBSERVER}; + selected:{BooleanUtils.isTrue(bean.isTargetDiscardCatchCompositionEstimatedByObserver())}; +} \ No newline at end of file diff --git a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties index 376dd29..c5d2ea1 100644 --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -1115,6 +1115,8 @@ observe.content.setLongline.swivelWeight=swivel weight (kg) observe.content.setLongline.tab.hauling=Hauling observe.content.setLongline.tab.setting=Setting observe.content.setLongline.tab.settingCaracteristics=Caracteristics +observe.content.setLongline.targetCatchCompositionEstimatedByObserver=Composition estimated by observer? +observe.content.setLongline.targetDiscardCatchCompositionEstimatedByObserver=Composition estimated by observer? observe.content.setLongline.timeBetweenHooks=time between hooks observe.content.setLongline.title=Fishing operation observe.content.setLongline.totalBasketsCount=Total baskets count diff --git a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties index cce359e..57ac15f 100644 --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -1115,6 +1115,8 @@ observe.content.setLongline.swivelWeight=Peso de el destorcedor (kg) observe.content.setLongline.tab.hauling=Arrastre observe.content.setLongline.tab.setting=Calada observe.content.setLongline.tab.settingCaracteristics=Características +observe.content.setLongline.targetCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? \#TODO +observe.content.setLongline.targetDiscardCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? \#TODO observe.content.setLongline.timeBetweenHooks=Temps entre anzuelos (s) observe.content.setLongline.title=Operación de pesca observe.content.setLongline.totalBasketsCount=Número total de baskets diff --git a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties index 0b04c04..7a80abf 100644 --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -1115,6 +1115,8 @@ observe.content.setLongline.swivelWeight=Poids de l'émerillon (kg) observe.content.setLongline.tab.hauling=Virage observe.content.setLongline.tab.setting=Filage observe.content.setLongline.tab.settingCaracteristics=Caractéristiques +observe.content.setLongline.targetCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? +observe.content.setLongline.targetDiscardCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? observe.content.setLongline.timeBetweenHooks=Temps entre hameçons (s) observe.content.setLongline.title=Opération de pêche observe.content.setLongline.totalBasketsCount=Nombre total de paniers -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.