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 53c50a887dd8dd3549a4762181c9290175a6dd24 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 28 11:49:53 2016 +0200 Ajout nonTargCatch.well (ui) --- .../ui/content/table/impl/seine/NonTargetCatchUI.jaxx | 15 +++++++++++++++ .../ui/content/table/impl/seine/NonTargetCatchUI.jcss | 19 +++++++++++++++++++ .../table/impl/seine/NonTargetCatchUIHandler.java | 7 +++++-- .../table/impl/seine/NonTargetCatchUIModel.java | 2 ++ .../resources/i18n/application-swing_en_GB.properties | 2 ++ .../resources/i18n/application-swing_es_ES.properties | 2 ++ .../resources/i18n/application-swing_fr_FR.properties | 2 ++ 7 files changed, 47 insertions(+), 2 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx index df1c538..4dc0585 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx @@ -179,6 +179,21 @@ </cell> </row> + <!-- well --> + <row> + <cell> + <JLabel id='wellLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <JPanel layout='{new BorderLayout()}'> + <JToolBar id='wellToolbar' constraints='BorderLayout.WEST'> + <JButton id='resetWell' constraints='BorderLayout.WEST' styleClass='resetButton'/> + </JToolBar> + <JTextField id='well' constraints='BorderLayout.CENTER'/> + </JPanel> + </cell> + </row> + <!-- comment --> <row> <cell columns='3' weighty='1'> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jcss index b8485a8..abfbfed 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jcss @@ -54,6 +54,25 @@ selectedItem:{tableEditBean.getReasonForDiscard()}; } +#wellLabel { + text:"observe.common.well"; + toolTipText:"observe.content.targetCatch.table.well.tip"; + labelFor:{well}; +} + +#resetWell { + toolTipText:"observe.content.action.reset.well.tip"; + enabled:{!tableModel.isEditable() || !model.isRowSaved()}; + _resetTablePropertyName:{NonTargetCatchDto.PROPERTY_WELL}; +} + +#well { + text:{getStringValue(tableEditBean.getWell())}; + enabled:{!tableModel.isEditable() || !model.isRowSaved()}; + _tablePropertyName:{NonTargetCatchDto.PROPERTY_WELL}; +} + + #catchWeightLabel { text:"observe.common.catchWeight"; labelFor:{catchWeight}; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java index 1169eb6..c19bfb7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java @@ -265,6 +265,8 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa n("observe.content.nonTargetCatch.table.speciesFate.tip"), n("observe.content.nonTargetCatch.table.reasonForDiscard"), n("observe.content.nonTargetCatch.table.reasonForDiscard.tip"), + n("observe.content.nonTargetCatch.table.well"), + n("observe.content.nonTargetCatch.table.well.tip"), n("observe.content.nonTargetCatch.table.catchWeight"), n("observe.content.nonTargetCatch.table.catchWeight.tip"), n("observe.content.nonTargetCatch.table.totalCount"), @@ -279,11 +281,12 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa UIHelper.setTableColumnRenderer(table, 0, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, SpeciesDto.class)); UIHelper.setTableColumnRenderer(table, 1, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, SpeciesFateDto.class)); UIHelper.setTableColumnRenderer(table, 2, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, ReasonForDiscardDto.class)); - UIHelper.setTableColumnRenderer(table, 3, UIHelper.newEmptyNumberTableCellRenderer(renderer)); + UIHelper.setTableColumnRenderer(table, 3, UIHelper.newStringTableCellRenderer(renderer, 10, true)); UIHelper.setTableColumnRenderer(table, 4, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 5, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 6, UIHelper.newEmptyNumberTableCellRenderer(renderer)); - UIHelper.setTableColumnRenderer(table, 7, UIHelper.newStringTableCellRenderer(renderer, 10, true)); + UIHelper.setTableColumnRenderer(table, 7, UIHelper.newEmptyNumberTableCellRenderer(renderer)); + UIHelper.setTableColumnRenderer(table, 8, UIHelper.newStringTableCellRenderer(renderer, 10, true)); } @SuppressWarnings("Duplicates") diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIModel.java index 0f90dae..88ad908 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIModel.java @@ -61,6 +61,7 @@ public class NonTargetCatchUIModel extends ContentTableUIModel<SetSeineNonTarget NonTargetCatchDto.PROPERTY_MEAN_WEIGHT_COMPUTED_SOURCE, NonTargetCatchDto.PROPERTY_CATCH_WEIGHT_COMPUTED_SOURCE, NonTargetCatchDto.PROPERTY_MEAN_LENGTH_COMPUTED_SOURCE, + NonTargetCatchDto.PROPERTY_WELL, NonTargetCatchDto.PROPERTY_COMMENT }); @@ -68,6 +69,7 @@ public class NonTargetCatchUIModel extends ContentTableUIModel<SetSeineNonTarget ContentTableModel.newTableMeta(NonTargetCatchDto.class, NonTargetCatchDto.PROPERTY_SPECIES, false), ContentTableModel.newTableMeta(NonTargetCatchDto.class, NonTargetCatchDto.PROPERTY_SPECIES_FATE, false), ContentTableModel.newTableMeta(NonTargetCatchDto.class, NonTargetCatchDto.PROPERTY_REASON_FOR_DISCARD, false), + ContentTableModel.newTableMeta(NonTargetCatchDto.class, NonTargetCatchDto.PROPERTY_WELL, false), ContentTableModel.newTableMeta(NonTargetCatchDto.class, NonTargetCatchDto.PROPERTY_CATCH_WEIGHT, false), ContentTableModel.newTableMeta(NonTargetCatchDto.class, NonTargetCatchDto.PROPERTY_TOTAL_COUNT, false), ContentTableModel.newTableMeta(NonTargetCatchDto.class, NonTargetCatchDto.PROPERTY_MEAN_WEIGHT, false), 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 5fe2a30..376dd29 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 @@ -1008,6 +1008,8 @@ observe.content.nonTargetCatch.table.speciesFaune=Species observe.content.nonTargetCatch.table.speciesFaune.tip=non target species observe.content.nonTargetCatch.table.totalCount=Count observe.content.nonTargetCatch.table.totalCount.tip=Estimated count +observe.content.nonTargetCatch.table.well=Well +observe.content.nonTargetCatch.table.well.tip=Well observe.content.nonTargetSample.table.count=Count observe.content.nonTargetSample.table.count.tip=Count observe.content.nonTargetSample.table.gender=Sex 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 e80c0fb..cce359e 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 @@ -1008,6 +1008,8 @@ observe.content.nonTargetCatch.table.speciesFaune=Especie observe.content.nonTargetCatch.table.speciesFaune.tip=Especie observe.content.nonTargetCatch.table.totalCount=Número observe.content.nonTargetCatch.table.totalCount.tip=Número estimado +observe.content.nonTargetCatch.table.well=Cuba +observe.content.nonTargetCatch.table.well.tip=Cuba observe.content.nonTargetSample.table.count=Grupo de tallas observe.content.nonTargetSample.table.count.tip=Grupo de tallas observe.content.nonTargetSample.table.gender=Sexo 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 5612fe1..0b04c04 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 @@ -1008,6 +1008,8 @@ observe.content.nonTargetCatch.table.speciesFaune=Espèce de faune observe.content.nonTargetCatch.table.speciesFaune.tip=Espèce de faune observe.content.nonTargetCatch.table.totalCount=Nombre observe.content.nonTargetCatch.table.totalCount.tip=Nombre estimé +observe.content.nonTargetCatch.table.well=Cuve +observe.content.nonTargetCatch.table.well.tip=Numéro de cuve observe.content.nonTargetSample.table.count=Effectif observe.content.nonTargetSample.table.count.tip=Effectif observe.content.nonTargetSample.table.gender=Sex -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.