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 443233e2fca051e2b6e353e5cb7c820c005a5e72 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 28 11:18:09 2016 +0200 Ajout BranchelineComposition.tracelineLength (ui) --- .../content/table/impl/longline/BranchlinesCompositionUI.jaxx | 10 ++++++++++ .../content/table/impl/longline/BranchlinesCompositionUI.jcss | 11 +++++++++++ .../table/impl/longline/BranchlinesCompositionUIHandler.java | 3 +++ .../table/impl/longline/BranchlinesCompositionUIModel.java | 2 ++ .../main/resources/i18n/application-swing_en_GB.properties | 3 +++ .../main/resources/i18n/application-swing_es_ES.properties | 5 ++++- .../main/resources/i18n/application-swing_fr_FR.properties | 3 +++ 7 files changed, 36 insertions(+), 1 deletion(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx index 91cd55a..2b5bbc3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx @@ -99,6 +99,16 @@ </cell> </row> + <!-- tracelineLength --> + <row> + <cell> + <JLabel id='tracelineLengthLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <NumberEditor id='tracelineLength' constructorParams='this'/> + </cell> + </row> + <!-- proportion --> <row> <cell> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUI.jcss index 3579780..0d44414 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUI.jcss @@ -54,6 +54,17 @@ _validatorLabel:{t("observe.content.branchlinesComposition.length")}; } +#tracelineLengthLabel { + text:"observe.content.branchlinesComposition.tracelineLength"; + labelFor:{tracelineLength}; +} + +#tracelineLength { + property:{BranchlinesCompositionDto.PROPERTY_TRACELINE_LENGTH}; + model:{tableEditBean.getTracelineLength()}; + numberPattern:{fr.ird.observe.application.swing.ui.UIHelper.DECIMAL3_PATTERN}; +} + #proportionLabel { text:"observe.content.branchlinesComposition.proportion"; labelFor:{proportion}; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java index 960b1ff..b3fc46a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java @@ -82,6 +82,8 @@ public class BranchlinesCompositionUIHandler extends ContentTableUIHandler<SetLo n("observe.content.branchlinesComposition.table.tracelineType.tip"), n("observe.content.branchlinesComposition.table.length"), n("observe.content.branchlinesComposition.table.length.tip"), + n("observe.content.branchlinesComposition.table.tracelineLength"), + n("observe.content.branchlinesComposition.table.tracelineLength.tip"), n("observe.content.branchlinesComposition.table.proportion"), n("observe.content.branchlinesComposition.table.proportion.tip")); @@ -89,6 +91,7 @@ public class BranchlinesCompositionUIHandler extends ContentTableUIHandler<SetLo UIHelper.setTableColumnRenderer(table, 1, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, HookSizeDto.class)); UIHelper.setTableColumnRenderer(table, 2, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 3, UIHelper.newEmptyNumberTableCellRenderer(renderer)); + UIHelper.setTableColumnRenderer(table, 4, UIHelper.newEmptyNumberTableCellRenderer(renderer)); // when model change in table, let's recompute the proportion sum table.getModel().addTableModelListener(e -> { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUIModel.java index e7a78c0..cca3b4c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUIModel.java @@ -53,12 +53,14 @@ public class BranchlinesCompositionUIModel extends ContentTableUIModel<SetLongli new String[]{BranchlinesCompositionDto.PROPERTY_TOP_TYPE, BranchlinesCompositionDto.PROPERTY_TRACELINE_TYPE, BranchlinesCompositionDto.PROPERTY_LENGTH, + BranchlinesCompositionDto.PROPERTY_TRACELINE_LENGTH, BranchlinesCompositionDto.PROPERTY_PROPORTION}); List<ContentTableMeta<BranchlinesCompositionDto>> metas = Lists.newArrayList( ContentTableModel.newTableMeta(BranchlinesCompositionDto.class, BranchlinesCompositionDto.PROPERTY_TOP_TYPE, false), ContentTableModel.newTableMeta(BranchlinesCompositionDto.class, BranchlinesCompositionDto.PROPERTY_TRACELINE_TYPE, false), ContentTableModel.newTableMeta(BranchlinesCompositionDto.class, BranchlinesCompositionDto.PROPERTY_LENGTH, false), + ContentTableModel.newTableMeta(BranchlinesCompositionDto.class, BranchlinesCompositionDto.PROPERTY_TRACELINE_LENGTH, false), ContentTableModel.newTableMeta(BranchlinesCompositionDto.class, BranchlinesCompositionDto.PROPERTY_PROPORTION, false)); initModel(ui, metas); 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 a24fca8..5fe2a30 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 @@ -691,10 +691,13 @@ observe.content.branchlinesComposition.table.proportion=Proportion observe.content.branchlinesComposition.table.proportion.tip=Proportion observe.content.branchlinesComposition.table.topType=Top part type observe.content.branchlinesComposition.table.topType.tip=Top part type +observe.content.branchlinesComposition.table.tracelineLength=Traceline length (m) +observe.content.branchlinesComposition.table.tracelineLength.tip=Traceline length (m) observe.content.branchlinesComposition.table.tracelineType=Traceline type observe.content.branchlinesComposition.table.tracelineType.tip=Traceline type observe.content.branchlinesComposition.title=Branchlines observe.content.branchlinesComposition.topType=Top part type +observe.content.branchlinesComposition.tracelineLength=Traceline length (m) observe.content.branchlinesComposition.tracelineType=Traceline type observe.content.broughtOnDeck.comment=Only species brought on deck can be sampled observe.content.catchLongline.acquisitionMode=Acquisition mode 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 7f8ce44..e80c0fb 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 @@ -691,10 +691,13 @@ observe.content.branchlinesComposition.table.proportion=Proporción (%) observe.content.branchlinesComposition.table.proportion.tip=Proporción (%) observe.content.branchlinesComposition.table.topType=Tipo de la parte superior observe.content.branchlinesComposition.table.topType.tip=Tipo de la parte superior +observe.content.branchlinesComposition.table.tracelineLength=Parte baja (m) +observe.content.branchlinesComposition.table.tracelineLength.tip=Parte baja (m) observe.content.branchlinesComposition.table.tracelineType=Tipo bajo de línea observe.content.branchlinesComposition.table.tracelineType.tip=Tipo bajo de línea observe.content.branchlinesComposition.title=Composición de arponcillos observe.content.branchlinesComposition.topType=Tipo de la parte superior +observe.content.branchlinesComposition.tracelineLength=Parte baja (m) observe.content.branchlinesComposition.tracelineType=Tipo bajo de línea observe.content.broughtOnDeck.comment=Sólo las especies subidas a bordo se pueden muestrear. observe.content.catchLongline.acquisitionMode=Modo de ingreso @@ -935,7 +938,7 @@ observe.content.longlineDetailComposition.branchlinesTable.haulingIdentifier.tip observe.content.longlineDetailComposition.branchlinesTable.settingIdentifier=Id Calada observe.content.longlineDetailComposition.branchlinesTable.settingIdentifier.tip=Identificador Calada observe.content.longlineDetailComposition.branchlinesTable.tracelineLength=Parte baja (m) -observe.content.longlineDetailComposition.branchlinesTable.tracelineLength.tip=Longitud baja (m) +observe.content.longlineDetailComposition.branchlinesTable.tracelineLength.tip=Parte baja (m) observe.content.longlineDetailComposition.canGenerate=Autorizar la generación observe.content.longlineDetailComposition.firstTemplate.template.notCompilant.basketCount=el template a utilizar %s no es compatible con el número de cestas por sección (%s) observe.content.longlineDetailComposition.message.updating=Composición detallada del palangre en proceso de modificación. 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 8ca5b83..5612fe1 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 @@ -691,10 +691,13 @@ observe.content.branchlinesComposition.table.proportion=Proportion (%) observe.content.branchlinesComposition.table.proportion.tip=Proportion (%) observe.content.branchlinesComposition.table.topType=Type partie supérieure observe.content.branchlinesComposition.table.topType.tip=Type partie supérieure +observe.content.branchlinesComposition.table.tracelineLength=Longueur bas de ligne (m) +observe.content.branchlinesComposition.table.tracelineLength.tip=Longueur bas de ligne (m) observe.content.branchlinesComposition.table.tracelineType=Type basse de ligne observe.content.branchlinesComposition.table.tracelineType.tip=Type bas de ligne observe.content.branchlinesComposition.title=Composition des avançons observe.content.branchlinesComposition.topType=Type partie supérieure +observe.content.branchlinesComposition.tracelineLength=Longueur bas de ligne (m) observe.content.branchlinesComposition.tracelineType=Type bas de ligne observe.content.broughtOnDeck.comment=Seules les espèces montées sur le pont pourront être échantillonnées observe.content.catchLongline.acquisitionMode=Mode de saisie -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.