branch develop updated (3c6e833 -> 24f3443)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 3c6e833 [LL] défaut d'affichage coord DMD (Fixes #7891) Merge branch 'feature/7891' into develop new 24f3443 [LL] champ boolean «rejeté avec hamecon» doit accepter une valeur NULL (Fixes #7887) 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 24f344362d60fbbc4800652c82e3a5b975b69e25 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 20:51:36 2016 +0200 [LL] champ boolean «rejeté avec hamecon» doit accepter une valeur NULL (Fixes #7887) Summary of changes: .../swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx | 8 ++++++-- .../swing/ui/content/table/impl/longline/CatchLonglineUI.jcss | 10 +++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 24f344362d60fbbc4800652c82e3a5b975b69e25 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 20:51:36 2016 +0200 [LL] champ boolean «rejeté avec hamecon» doit accepter une valeur NULL (Fixes #7887) --- .../swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx | 8 ++++++-- .../swing/ui/content/table/impl/longline/CatchLonglineUI.jcss | 10 +++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx index bf7b2c1..45ab0cd 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx @@ -47,6 +47,7 @@ fr.ird.observe.services.dto.referential.longline.MaturityStatusDto fr.ird.observe.services.dto.referential.longline.StomacFullnessDto fr.ird.observe.application.swing.ui.content.table.* + fr.ird.observe.application.swing.ui.util.BooleanEditor jaxx.runtime.swing.editor.NumberEditor jaxx.runtime.swing.editor.bean.BeanComboBox @@ -239,8 +240,11 @@ <!-- hookWhenDiscarded --> <!-- photoReferences --> <row> - <cell anchor='west' fill="both" columns="2"> - <JCheckBox id='hookWhenDiscarded'/> + <cell anchor="west"> + <JLabel id='hookWhenDiscardedLabel'/> + </cell> + <cell anchor='west' fill="both"> + <BooleanEditor id='hookWhenDiscarded'/> </cell> <cell anchor='west'> <JLabel id='photoReferencesLabel'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss index c8e08b7..5b6069d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss @@ -148,11 +148,15 @@ _validatorLabel: {t("observe.content.catchLongline.totalWeight")}; } -#hookWhenDiscarded { - horizontalTextPosition:{JCheckBox.LEFT}; +#hookWhenDiscardedLabel { text:"observe.content.catchLongline.hookWhenDiscarded"; + labelFor:{hookWhenDiscarded}; +} + +#hookWhenDiscarded { _tablePropertyName:{CatchLonglineDto.PROPERTY_HOOK_WHEN_DISCARDED}; - selected:{BooleanUtils.isTrue(tableEditBean.getHookWhenDiscarded())}; + _propertyName:{CatchLonglineDto.PROPERTY_HOOK_WHEN_DISCARDED}; + booleanValue:{tableEditBean.getHookWhenDiscarded()}; } #catchFateLonglineLabel { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm