branch develop updated (86eadcd -> 7c2d503)
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 86eadcd [PS] Supprimer le champ floattingobject.supportvesselname (Fixes #6997) Merge branch 'feature/6997' into develop new 7436e8e Ajout BranchelineComposition.tracelineLength (persistence) new 74ed732 Ajout BranchelineComposition.tracelineLength (service) new 443233e Ajout BranchelineComposition.tracelineLength (ui) new 7c2d503 [LL] Ajout d'un champs sur l'écran Composition > Onglet Avançons (Fixes #6832) Merge branch 'feature/6832' into develop The 4 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 7c2d5038425e9db80ccfc13e974b5ccbc91a3fe0 Merge: 86eadcd 443233e Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 28 11:18:12 2016 +0200 [LL] Ajout d'un champs sur l'écran Composition > Onglet Avançons (Fixes #6832) Merge branch 'feature/6832' into develop commit 443233e2fca051e2b6e353e5cb7c820c005a5e72 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 28 11:18:09 2016 +0200 Ajout BranchelineComposition.tracelineLength (ui) commit 74ed7327a609ad3b1a36415a75acfbaac0925f3c Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 28 11:17:51 2016 +0200 Ajout BranchelineComposition.tracelineLength (service) commit 7436e8ed064ea097a5e3e1d5e66522c2824f5629 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 28 11:17:35 2016 +0200 Ajout BranchelineComposition.tracelineLength (persistence) Summary of changes: .../impl/longline/BranchlinesCompositionUI.jaxx | 10 ++++++++++ .../impl/longline/BranchlinesCompositionUI.jcss | 11 +++++++++++ .../longline/BranchlinesCompositionUIHandler.java | 3 +++ .../longline/BranchlinesCompositionUIModel.java | 2 ++ .../i18n/application-swing_en_GB.properties | 3 +++ .../i18n/application-swing_es_ES.properties | 5 ++++- .../i18n/application-swing_fr_FR.properties | 3 +++ .../versions/DataSourceMigrationForVersion_5_1.java | 1 + ...branchlineComposition_add_tracelineLength-H2.sql | 1 + ...branchlineComposition_add_tracelineLength-PG.sql | 1 + entities/src/main/xmi/observe-longline.zargo | Bin 93566 -> 93635 bytes .../main/xmi/observe-services-dto-longline.zargo | Bin 67504 -> 67604 bytes .../binder/data/BranchlinesCompositionBinder.java | 2 ++ 13 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_evol_6832_branchlineComposition_add_tracelineLength-H2.sql create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_evol_6832_branchlineComposition_add_tracelineLength-PG.sql -- 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 7436e8ed064ea097a5e3e1d5e66522c2824f5629 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 28 11:17:35 2016 +0200 Ajout BranchelineComposition.tracelineLength (persistence) --- .../versions/DataSourceMigrationForVersion_5_1.java | 1 + ...branchlineComposition_add_tracelineLength-H2.sql | 1 + ...branchlineComposition_add_tracelineLength-PG.sql | 1 + entities/src/main/xmi/observe-longline.zargo | Bin 93566 -> 93635 bytes 4 files changed, 3 insertions(+) diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java index 4de555b..df7f25a 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java @@ -30,6 +30,7 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC addScript("01", "evol_8374_delete_sonarUsed", queries); addScript("02", "evol_7886_catch_add_set_idx", queries); addScript("03", "evol_6997_delete_supportVesselName", queries); + addScript("03", "evol_6832_branchlineComposition_add_tracelineLength", queries); } diff --git a/entities-migration/src/main/resources/db/migration/V5_1_evol_6832_branchlineComposition_add_tracelineLength-H2.sql b/entities-migration/src/main/resources/db/migration/V5_1_evol_6832_branchlineComposition_add_tracelineLength-H2.sql new file mode 100644 index 0000000..b5ba5ac --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/V5_1_evol_6832_branchlineComposition_add_tracelineLength-H2.sql @@ -0,0 +1 @@ +ALTER TABLE observe_longline.branchlinescomposition ADD COLUMN tracelineLength REAL; \ No newline at end of file diff --git a/entities-migration/src/main/resources/db/migration/V5_1_evol_6832_branchlineComposition_add_tracelineLength-PG.sql b/entities-migration/src/main/resources/db/migration/V5_1_evol_6832_branchlineComposition_add_tracelineLength-PG.sql new file mode 100644 index 0000000..b5ba5ac --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/V5_1_evol_6832_branchlineComposition_add_tracelineLength-PG.sql @@ -0,0 +1 @@ +ALTER TABLE observe_longline.branchlinescomposition ADD COLUMN tracelineLength REAL; \ No newline at end of file diff --git a/entities/src/main/xmi/observe-longline.zargo b/entities/src/main/xmi/observe-longline.zargo index 9a401bd..11d0e01 100644 Binary files a/entities/src/main/xmi/observe-longline.zargo and b/entities/src/main/xmi/observe-longline.zargo differ -- 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 74ed7327a609ad3b1a36415a75acfbaac0925f3c Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 28 11:17:51 2016 +0200 Ajout BranchelineComposition.tracelineLength (service) --- .../main/xmi/observe-services-dto-longline.zargo | Bin 67504 -> 67604 bytes .../binder/data/BranchlinesCompositionBinder.java | 2 ++ 2 files changed, 2 insertions(+) diff --git a/services-dto/src/main/xmi/observe-services-dto-longline.zargo b/services-dto/src/main/xmi/observe-services-dto-longline.zargo index 5c61e0c..4d91b77 100644 Binary files a/services-dto/src/main/xmi/observe-services-dto-longline.zargo and b/services-dto/src/main/xmi/observe-services-dto-longline.zargo differ diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlinesCompositionBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlinesCompositionBinder.java index 3dd9dfb..90a6112 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlinesCompositionBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlinesCompositionBinder.java @@ -45,6 +45,7 @@ public class BranchlinesCompositionBinder extends DataBinderSupport<BranchlinesC copyDtoDataFieldsToEntity(dto, entity); entity.setLength(dto.getLength()); + entity.setTracelineLength(dto.getTracelineLength()); entity.setProportion(dto.getProportion()); entity.setTopType(toEntity(dto.getTopType(), LineType.class)); entity.setTracelineType(toEntity(dto.getTracelineType(), LineType.class)); @@ -57,6 +58,7 @@ public class BranchlinesCompositionBinder extends DataBinderSupport<BranchlinesC copyEntityDataFieldsToDto(entity, dto); dto.setLength(entity.getLength()); + dto.setTracelineLength(entity.getTracelineLength()); dto.setProportion(entity.getProportion()); dto.setTopType(toReferentialReference(referentialLocale, entity.getTopType(), LineTypeDto.class)); dto.setTracelineType(toReferentialReference(referentialLocale, entity.getTracelineType(), LineTypeDto.class)); -- 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 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>.
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 7c2d5038425e9db80ccfc13e974b5ccbc91a3fe0 Merge: 86eadcd 443233e Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 28 11:18:12 2016 +0200 [LL] Ajout d'un champs sur l'écran Composition > Onglet Avançons (Fixes #6832) Merge branch 'feature/6832' into develop .../impl/longline/BranchlinesCompositionUI.jaxx | 10 ++++++++++ .../impl/longline/BranchlinesCompositionUI.jcss | 11 +++++++++++ .../longline/BranchlinesCompositionUIHandler.java | 3 +++ .../longline/BranchlinesCompositionUIModel.java | 2 ++ .../i18n/application-swing_en_GB.properties | 3 +++ .../i18n/application-swing_es_ES.properties | 5 ++++- .../i18n/application-swing_fr_FR.properties | 3 +++ .../versions/DataSourceMigrationForVersion_5_1.java | 1 + ...branchlineComposition_add_tracelineLength-H2.sql | 1 + ...branchlineComposition_add_tracelineLength-PG.sql | 1 + entities/src/main/xmi/observe-longline.zargo | Bin 93566 -> 93635 bytes .../main/xmi/observe-services-dto-longline.zargo | Bin 67504 -> 67604 bytes .../binder/data/BranchlinesCompositionBinder.java | 2 ++ 13 files changed, 41 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm