branch develop updated (4288df8 -> 08a36cc)
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 4288df8 [PS] Ajouter un champ "Numéro de cuve", sur le formulaire des captures accessoires (Fixes #6999) new 60bc9a6 Ajout boolean sur SetSeine (persistence) new 8021750 Ajout boolean sur SetSeine (service) new d0a9b49 Ajout boolean sur SetSeine (ui) new 08a36cc [PS] Ajout d'un champ sur les captures (Fixes #8375) Merge branch 'feature/8375' 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 08a36ccfef5181ee47474a2adc322f20229e315f Merge: 4288df8 d0a9b49 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 28 13:27:24 2016 +0200 [PS] Ajout d'un champ sur les captures (Fixes #8375) Merge branch 'feature/8375' into develop commit d0a9b499db43d06fe5c28e7886e0994099c3f424 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 28 13:27:19 2016 +0200 Ajout boolean sur SetSeine (ui) commit 80217501b9e69bcdddde21c3d0272986aa03016d Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 28 13:27:10 2016 +0200 Ajout boolean sur SetSeine (service) commit 60bc9a68b2d6cabe3504524ae3b5c864212489d0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 28 13:26:57 2016 +0200 Ajout boolean sur SetSeine (persistence) Summary of changes: .../ui/content/table/impl/seine/TargetCatchUI.jaxx | 11 +++++++++++ .../ui/content/table/impl/seine/TargetCatchUI.jcss | 7 +++++++ .../table/impl/seine/TargetDiscardCatchUI.jaxx | 11 +++++++++++ .../table/impl/seine/TargetDiscardCatchUI.jcss | 7 +++++++ .../i18n/application-swing_en_GB.properties | 2 ++ .../i18n/application-swing_es_ES.properties | 2 ++ .../i18n/application-swing_fr_FR.properties | 2 ++ .../versions/DataSourceMigrationForVersion_5_1.java | 1 + .../V5_1_06_evol_8375_setSeine_add_booleans-H2.sql | 2 ++ .../V5_1_06_evol_8375_setSeine_add_booleans-PG.sql | 2 ++ entities/src/main/xmi/observe-seine.zargo | Bin 83324 -> 83528 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 58992 -> 59440 bytes .../services/topia/binder/data/SetSeineBinder.java | 5 +++++ .../binder/data/SetSeineTargetCatchDtoBinder.java | 4 ++++ 14 files changed, 56 insertions(+) create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_06_evol_8375_setSeine_add_booleans-H2.sql create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_06_evol_8375_setSeine_add_booleans-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 60bc9a68b2d6cabe3504524ae3b5c864212489d0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 28 13:26:57 2016 +0200 Ajout boolean sur SetSeine (persistence) --- .../versions/DataSourceMigrationForVersion_5_1.java | 1 + .../V5_1_06_evol_8375_setSeine_add_booleans-H2.sql | 2 ++ .../V5_1_06_evol_8375_setSeine_add_booleans-PG.sql | 2 ++ entities/src/main/xmi/observe-seine.zargo | Bin 83324 -> 83528 bytes 4 files changed, 5 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 8ae6e57..2cccfe5 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 @@ -32,6 +32,7 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC addScript("03", "evol_6997_delete_supportVesselName", queries); addScript("04", "evol_6832_branchlineComposition_add_tracelineLength", queries); addScript("05", "evol_6999_nonTargetCatch_add_well", queries); + addScript("06", "evol_8375_setSeine_add_booleans", queries); } diff --git a/entities-migration/src/main/resources/db/migration/V5_1_06_evol_8375_setSeine_add_booleans-H2.sql b/entities-migration/src/main/resources/db/migration/V5_1_06_evol_8375_setSeine_add_booleans-H2.sql new file mode 100644 index 0000000..316639c --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/V5_1_06_evol_8375_setSeine_add_booleans-H2.sql @@ -0,0 +1,2 @@ +ALTER TABLE observe_seine.set ADD COLUMN targetCatchCompositionEstimatedByObserver BOOLEAN DEFAULT FALSE; +ALTER TABLE observe_seine.set ADD COLUMN targetDiscardCatchCompositionEstimatedByObserver BOOLEAN DEFAULT FALSE; \ No newline at end of file diff --git a/entities-migration/src/main/resources/db/migration/V5_1_06_evol_8375_setSeine_add_booleans-PG.sql b/entities-migration/src/main/resources/db/migration/V5_1_06_evol_8375_setSeine_add_booleans-PG.sql new file mode 100644 index 0000000..316639c --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/V5_1_06_evol_8375_setSeine_add_booleans-PG.sql @@ -0,0 +1,2 @@ +ALTER TABLE observe_seine.set ADD COLUMN targetCatchCompositionEstimatedByObserver BOOLEAN DEFAULT FALSE; +ALTER TABLE observe_seine.set ADD COLUMN targetDiscardCatchCompositionEstimatedByObserver BOOLEAN DEFAULT FALSE; \ No newline at end of file diff --git a/entities/src/main/xmi/observe-seine.zargo b/entities/src/main/xmi/observe-seine.zargo index d44cdf0..738b0ac 100644 Binary files a/entities/src/main/xmi/observe-seine.zargo and b/entities/src/main/xmi/observe-seine.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 80217501b9e69bcdddde21c3d0272986aa03016d Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 28 13:27:10 2016 +0200 Ajout boolean sur SetSeine (service) --- .../src/main/xmi/observe-services-dto-seine.zargo | Bin 58992 -> 59440 bytes .../services/topia/binder/data/SetSeineBinder.java | 5 +++++ .../binder/data/SetSeineTargetCatchDtoBinder.java | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/services-dto/src/main/xmi/observe-services-dto-seine.zargo b/services-dto/src/main/xmi/observe-services-dto-seine.zargo index 4cad8c4..43c7aa0 100644 Binary files a/services-dto/src/main/xmi/observe-services-dto-seine.zargo and b/services-dto/src/main/xmi/observe-services-dto-seine.zargo differ diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineBinder.java index 4fecada..d7c2b9d 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineBinder.java @@ -59,6 +59,8 @@ public class SetSeineBinder extends DataBinderSupport<SetSeine, SetSeineDto> { entity.setNonTargetDiscarded(dto.getNonTargetDiscarded()); entity.setCurrentMeasureDepth(dto.getCurrentMeasureDepth()); entity.setLastUpdateDate(dto.getLastUpdateDate()); + entity.setTargetCatchCompositionEstimatedByObserver(dto.isTargetCatchCompositionEstimatedByObserver()); + entity.setTargetDiscardCatchCompositionEstimatedByObserver(dto.isTargetDiscardCatchCompositionEstimatedByObserver()); entity.setSchoolType(SCHOOL_TYPE_TO_ENTITY.apply(dto.getSchoolType())); entity.setReasonForNullSet(toEntity(dto.getReasonForNullSet(), ReasonForNullSet.class)); @@ -83,6 +85,9 @@ public class SetSeineBinder extends DataBinderSupport<SetSeine, SetSeineDto> { dto.setNonTargetDiscarded(entity.getNonTargetDiscarded()); dto.setCurrentMeasureDepth(entity.getCurrentMeasureDepth()); + dto.setTargetCatchCompositionEstimatedByObserver(entity.isTargetCatchCompositionEstimatedByObserver()); + dto.setTargetDiscardCatchCompositionEstimatedByObserver(entity.isTargetDiscardCatchCompositionEstimatedByObserver()); + dto.setSchoolType(SCHOOL_TYPE_TO_DTO.apply(entity.getSchoolType())); dto.setReasonForNullSet(toReferentialReference(referentialLocale, entity.getReasonForNullSet(), ReasonForNullSetDto.class)); diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineTargetCatchDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineTargetCatchDtoBinder.java index 1547ee9..07e0a4c 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineTargetCatchDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineTargetCatchDtoBinder.java @@ -45,6 +45,8 @@ public class SetSeineTargetCatchDtoBinder extends DataBinderSupport<SetSeine, Se copyDtoDataFieldsToEntity(dto, entity); entity.setTargetCatch(toEntityCollection(referentialLocale, dto.getTargetCatch(), TargetCatch.class, entity.getTargetCatch())); + entity.setTargetCatchCompositionEstimatedByObserver(dto.isTargetCatchCompositionEstimatedByObserver()); + entity.setTargetDiscardCatchCompositionEstimatedByObserver(dto.isTargetDiscardCatchCompositionEstimatedByObserver()); } @@ -54,6 +56,8 @@ public class SetSeineTargetCatchDtoBinder extends DataBinderSupport<SetSeine, Se copyEntityDataFieldsToDto(entity, dto); dto.setTargetCatch(toLinkedHashSetData(referentialLocale, entity.getTargetCatch(), TargetCatchDto.class)); + dto.setTargetCatchCompositionEstimatedByObserver(entity.isTargetCatchCompositionEstimatedByObserver()); + dto.setTargetDiscardCatchCompositionEstimatedByObserver(entity.isTargetDiscardCatchCompositionEstimatedByObserver()); } } -- 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 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>.
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 08a36ccfef5181ee47474a2adc322f20229e315f Merge: 4288df8 d0a9b49 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 28 13:27:24 2016 +0200 [PS] Ajout d'un champ sur les captures (Fixes #8375) Merge branch 'feature/8375' into develop .../ui/content/table/impl/seine/TargetCatchUI.jaxx | 11 +++++++++++ .../ui/content/table/impl/seine/TargetCatchUI.jcss | 7 +++++++ .../table/impl/seine/TargetDiscardCatchUI.jaxx | 11 +++++++++++ .../table/impl/seine/TargetDiscardCatchUI.jcss | 7 +++++++ .../i18n/application-swing_en_GB.properties | 2 ++ .../i18n/application-swing_es_ES.properties | 2 ++ .../i18n/application-swing_fr_FR.properties | 2 ++ .../versions/DataSourceMigrationForVersion_5_1.java | 1 + .../V5_1_06_evol_8375_setSeine_add_booleans-H2.sql | 2 ++ .../V5_1_06_evol_8375_setSeine_add_booleans-PG.sql | 2 ++ entities/src/main/xmi/observe-seine.zargo | Bin 83324 -> 83528 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 58992 -> 59440 bytes .../services/topia/binder/data/SetSeineBinder.java | 5 +++++ .../binder/data/SetSeineTargetCatchDtoBinder.java | 4 ++++ 14 files changed, 56 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm