branch develop updated (fd97a40 -> 18a9780)
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 fd97a40 [LL] Problème sur l'ordre des sections/baskets dans le schéma de palangre selon le tri (Fixes #7892) new dfe5d2b Ajout VesselActivitySeine.allowFad (persistence) new 94a5139 Ajout VesselActivitySeine.allowFad (service) new 54d4775 Ajout VesselActivitySeine.allowFad (ui) new 18a9780 [PS] Limiter l'usage du formulaire DCP (Fixes #8376) Merge branch 'feature/8376' 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 18a978099b4a01fb82ad9a8f08355d126d023adc Merge: fd97a40 54d4775 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 5 09:28:15 2016 +0100 [PS] Limiter l'usage du formulaire DCP (Fixes #8376) Merge branch 'feature/8376' into develop commit 54d4775537d063f6eaba2f9ff668ab5f769242f3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 5 09:28:06 2016 +0100 Ajout VesselActivitySeine.allowFad (ui) commit 94a513951bc75cc3a0d75f51c8a89ba076cd35ff Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 5 09:27:54 2016 +0100 Ajout VesselActivitySeine.allowFad (service) commit dfe5d2b7246f904eaf590ba47ac722f4f8062231 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 5 09:27:33 2016 +0100 Ajout VesselActivitySeine.allowFad (persistence) Summary of changes: ...tivitySeineDto-ui-update-warning-validation.xml | 2 +- .../content/open/impl/seine/ActivitySeineUI.jcss | 4 +- .../open/impl/seine/ActivitySeineUIModel.java | 27 ++++++++---- .../ref/impl/seine/VesselActivitySeineUI.jaxx | 49 +++++++++------------ .../ref/impl/seine/VesselActivitySeineUI.jcss | 4 ++ .../ref/impl/seine/VesselActivitySeineUIModel.java | 7 ++- .../i18n/application-swing_en_GB.properties | 1 + .../i18n/application-swing_es_ES.properties | 1 + .../i18n/application-swing_fr_FR.properties | 1 + .../DataSourceMigrationForVersion_5_1.java | 1 + ...ol_8376_vesselActivitySeine_add_allowFad-H2.sql | 4 ++ ...ol_8376_vesselActivitySeine_add_allowFad-PG.sql | 4 ++ entities/src/main/xmi/observe-seine.zargo | Bin 86801 -> 86910 bytes .../ReferentialReferenceSetDefinitions.java | 3 +- .../seine/VesselActivitySeineHelper.java | 17 +++---- .../services/dto/seine/ActivitySeineDto.java | 28 ++++++++++++ .../src/main/xmi/observe-services-dto-seine.zargo | Bin 60613 -> 60743 bytes .../referential/VesselActivitySeineBinder.java | 10 ++++- 18 files changed, 110 insertions(+), 53 deletions(-) create mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/VesselActivitySeineUI.jcss create mode 100644 entities-migration/src/main/resources/db/migration/5.1/V5_1_17_evol_8376_vesselActivitySeine_add_allowFad-H2.sql create mode 100644 entities-migration/src/main/resources/db/migration/5.1/V5_1_17_evol_8376_vesselActivitySeine_add_allowFad-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 dfe5d2b7246f904eaf590ba47ac722f4f8062231 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 5 09:27:33 2016 +0100 Ajout VesselActivitySeine.allowFad (persistence) --- .../DataSourceMigrationForVersion_5_1.java | 1 + ...vol_8376_vesselActivitySeine_add_allowFad-H2.sql | 4 ++++ ...vol_8376_vesselActivitySeine_add_allowFad-PG.sql | 4 ++++ entities/src/main/xmi/observe-seine.zargo | Bin 86801 -> 86910 bytes 4 files changed, 9 insertions(+) diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_1.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_1.java index 3eef5d7..4b2ce80 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_1.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_1.java @@ -82,6 +82,7 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC addScript("14", "evol_8196_lengthWeightParameter_add_source", queries); addScript("15", "evol_8578_nonTargetLength_add_speciesFate", queries); addScript("16", "evol_8377_speciesFate_add_discard", queries); + addScript("17", "evol_8376_vesselActivitySeine_add_allowFad", queries); } private void evol8391(TopiaSqlSupport topiaSqlSupport, List<String> queries) { diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_17_evol_8376_vesselActivitySeine_add_allowFad-H2.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_17_evol_8376_vesselActivitySeine_add_allowFad-H2.sql new file mode 100644 index 0000000..d59de75 --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/5.1/V5_1_17_evol_8376_vesselActivitySeine_add_allowFad-H2.sql @@ -0,0 +1,4 @@ +ALTER TABLE observe_seine.vesselactivity ADD COLUMN allowFad BOOLEAN NOT NULL DEFAULT FALSE; +UPDATE observe_seine.vesselactivity SET allowFad = TRUE WHERE code = '6'; +UPDATE observe_seine.vesselactivity SET allowFad = TRUE WHERE code = '13'; +UPDATE observe_seine.vesselactivity SET topiaVersion = topiaVersion + 1 ; \ No newline at end of file diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_17_evol_8376_vesselActivitySeine_add_allowFad-PG.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_17_evol_8376_vesselActivitySeine_add_allowFad-PG.sql new file mode 100644 index 0000000..d59de75 --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/5.1/V5_1_17_evol_8376_vesselActivitySeine_add_allowFad-PG.sql @@ -0,0 +1,4 @@ +ALTER TABLE observe_seine.vesselactivity ADD COLUMN allowFad BOOLEAN NOT NULL DEFAULT FALSE; +UPDATE observe_seine.vesselactivity SET allowFad = TRUE WHERE code = '6'; +UPDATE observe_seine.vesselactivity SET allowFad = TRUE WHERE code = '13'; +UPDATE observe_seine.vesselactivity SET topiaVersion = topiaVersion + 1 ; \ 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 68f4ce1..7886e18 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 94a513951bc75cc3a0d75f51c8a89ba076cd35ff Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 5 09:27:54 2016 +0100 Ajout VesselActivitySeine.allowFad (service) --- .../ReferentialReferenceSetDefinitions.java | 3 ++- .../seine/VesselActivitySeineHelper.java | 17 +++++++------ .../services/dto/seine/ActivitySeineDto.java | 28 +++++++++++++++++++++ .../src/main/xmi/observe-services-dto-seine.zargo | Bin 60613 -> 60743 bytes .../referential/VesselActivitySeineBinder.java | 10 ++++++-- 5 files changed, 47 insertions(+), 11 deletions(-) diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java index a9cfa45..1844180 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java @@ -254,7 +254,8 @@ public enum ReferentialReferenceSetDefinitions { TRANSMITTING_BUOY_TYPE(newDefaultDefinitionBuilder(TransmittingBuoyTypeDto.class)), - VESSEL_ACTIVITY_SEINE(newDefaultDefinitionBuilder(VesselActivitySeineDto.class)), + VESSEL_ACTIVITY_SEINE(newDefaultDefinitionBuilder(VesselActivitySeineDto.class) + .addProperty(boolean.class, VesselActivitySeineDto.PROPERTY_ALLOW_FAD)), WEIGHT_CATEGORY(newDefinitionBuilder(WeightCategoryDto.class) .addProperty(String.class, WeightCategoryDto.PROPERTY_CODE) diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineHelper.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineHelper.java index 14c1d8b..4b8395d 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineHelper.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineHelper.java @@ -22,6 +22,7 @@ package fr.ird.observe.services.dto.referential.seine; * #L% */ +import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.dto.referential.ReferentialReference; public class VesselActivitySeineHelper extends GeneratedVesselActivitySeineHelper { @@ -34,20 +35,20 @@ public class VesselActivitySeineHelper extends GeneratedVesselActivitySeineHelpe return VESSEL_ACTIVITY_ID_FOR_SET.equals(id); } - public static boolean isSetOperation(VesselActivitySeineDto vesselActivitySeineDto) { - return vesselActivitySeineDto != null && isSetOpreration(vesselActivitySeineDto.getId()); - } - public static boolean isSetOperation(ReferentialReference<VesselActivitySeineDto> vesselActivitySeineRef) { return vesselActivitySeineRef != null && isSetOpreration(vesselActivitySeineRef.getId()); } - public static boolean isChangedZoneOperation(String id) { - return VESSEL_ACTIVITY_ID_CHANGED_ZONE.equals(id); + public static boolean isDcpOperation(ReferentialReference<VesselActivitySeineDto> vesselActivitySeineRef) { + boolean result = vesselActivitySeineRef != null; + if (result) { + result = (boolean) vesselActivitySeineRef.getPropertyValue(VesselActivitySeineDto.PROPERTY_ALLOW_FAD); + } + return result; } - public static boolean isChangedZoneOperation(VesselActivitySeineDto vesselActivitySeineDto) { - return vesselActivitySeineDto != null && isChangedZoneOperation(vesselActivitySeineDto.getId()); + public static boolean isChangedZoneOperation(String id) { + return VESSEL_ACTIVITY_ID_CHANGED_ZONE.equals(id); } public static boolean isChangedZoneOperation(ReferentialReference<VesselActivitySeineDto> vesselActivitySeineRef) { diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDto.java index a7ab37a..6e6bd06 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDto.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDto.java @@ -22,7 +22,9 @@ package fr.ird.observe.services.dto.seine; * #L% */ +import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; +import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineHelper; import org.nuiton.util.DateUtil; import java.util.Date; @@ -37,6 +39,10 @@ public class ActivitySeineDto extends GeneratedActivitySeineDto { public static final String PROPERTY_SET_SEINE = "setSeine"; + public static final String PROPERTY_SET_OPERATION = "setOperation"; + + public static final String PROPERTY_DCP_OPERATION = "dcpOperation"; + private static final long serialVersionUID = 3846974823980413495L; public boolean isActivityFinDeVeille() { @@ -45,6 +51,28 @@ public class ActivitySeineDto extends GeneratedActivitySeineDto { vesselActivitySeine.getPropertyValue(VesselActivitySeineDto.PROPERTY_CODE)); } + public boolean isDcpOperation() { + boolean result = vesselActivitySeine != null; + if (result) { + result = (boolean) vesselActivitySeine .getPropertyValue(VesselActivitySeineDto.PROPERTY_ALLOW_FAD); + } + return result; + } + public boolean isSetOperation() { + boolean result = vesselActivitySeine != null; + if (result) { + result = VesselActivitySeineHelper.isSetOperation(vesselActivitySeine); + } + return result; + } + + @Override + public void setVesselActivitySeine(ReferentialReference<VesselActivitySeineDto> vesselActivitySeine) { + super.setVesselActivitySeine(vesselActivitySeine); + firePropertyChange(PROPERTY_DCP_OPERATION, null, isDcpOperation()); + firePropertyChange(PROPERTY_SET_OPERATION, null, isSetOperation()); + } + public Date getTimeSecond() { return DateUtil.getTime(time, false, false); } 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 ee71220..5e95186 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-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselActivitySeineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselActivitySeineBinder.java index 173bf4c..0de11b2 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselActivitySeineBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselActivitySeineBinder.java @@ -44,6 +44,7 @@ public class VesselActivitySeineBinder extends ReferentialBinderSupport<VesselAc copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); + entity.setAllowFad(dto.isAllowFad()); } @@ -53,6 +54,7 @@ public class VesselActivitySeineBinder extends ReferentialBinderSupport<VesselAc copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); + dto.setAllowFad(entity.isAllowFad()); } @@ -60,7 +62,9 @@ public class VesselActivitySeineBinder extends ReferentialBinderSupport<VesselAc public ReferentialReference<VesselActivitySeineDto> toReferentialReference(ReferentialLocale referentialLocale, VesselActivitySeine entity) { return toReferentialReference(entity, - entity.getCode(), getLabel(referentialLocale, entity)); + entity.getCode(), + getLabel(referentialLocale, entity), + entity.isAllowFad()); } @@ -68,7 +72,9 @@ public class VesselActivitySeineBinder extends ReferentialBinderSupport<VesselAc public ReferentialReference<VesselActivitySeineDto> toReferentialReference(ReferentialLocale referentialLocale, VesselActivitySeineDto dto) { return toReferentialReference(dto, - dto.getCode(), getLabel(referentialLocale, dto)); + dto.getCode(), + getLabel(referentialLocale, dto), + dto.isAllowFad()); } } -- 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 54d4775537d063f6eaba2f9ff668ab5f769242f3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 5 09:28:06 2016 +0100 Ajout VesselActivitySeine.allowFad (ui) --- ...tivitySeineDto-ui-update-warning-validation.xml | 2 +- .../content/open/impl/seine/ActivitySeineUI.jcss | 4 +- .../open/impl/seine/ActivitySeineUIModel.java | 27 ++++++++---- .../ref/impl/seine/VesselActivitySeineUI.jaxx | 49 +++++++++------------- .../ref/impl/seine/VesselActivitySeineUI.jcss | 4 ++ .../ref/impl/seine/VesselActivitySeineUIModel.java | 7 +++- .../i18n/application-swing_en_GB.properties | 1 + .../i18n/application-swing_es_ES.properties | 1 + .../i18n/application-swing_fr_FR.properties | 1 + 9 files changed, 54 insertions(+), 42 deletions(-) diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-warning-validation.xml index 4e71dc5..f3ba8da 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-warning-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-warning-validation.xml @@ -49,7 +49,7 @@ <!-- Aucun DCP saisie --> <field-validator type="fieldexpression"> - <param name="expression"><![CDATA[ !floatingObjectEmpty ]]></param> + <param name="expression"><![CDATA[ !dcpOperation || floatingObjectNotEmpty ]]></param> <message>validator.ui.activity.null.dcp</message> </field-validator> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jcss index 1f2d831..b82835e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jcss @@ -245,7 +245,8 @@ } #addSet { - enabled:{!model.isModified() && model.isValid() && model.isSetOperation() && bean.getSetSeine() == null}; + enabled:{!model.isModified() && model.isValid()}; + visible:{bean.isSetOperation() && bean.getSetSeine() == null}; text:"observe.action.add.set"; toolTipText:"observe.action.add.set.tip"; actionIcon:"add"; @@ -253,6 +254,7 @@ #addDCP { enabled:{!model.isModified() && model.isValid()}; + visible:{bean.isDcpOperation()}; text:"observe.action.add.floatingObject"; toolTipText:"observe.action.add.floatingObject.tip"; actionIcon:"add"; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIModel.java index 63afc5f..2c2eb5f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIModel.java @@ -23,11 +23,11 @@ package fr.ird.observe.application.swing.ui.content.open.impl.seine; */ import com.google.common.collect.ImmutableSet; +import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIModel; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineHelper; import fr.ird.observe.services.dto.seine.ActivitySeineDto; -import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIModel; import java.util.Set; @@ -45,7 +45,9 @@ public class ActivitySeineUIModel extends ContentOpenableUIModel<ActivitySeineDt public static final String PROPERTY_OBSERVED_SYSTEM_TAB_VALID = "observedSystemTabValid"; - public static final String PROPERTY_SET_OPERATION = "setOperation"; +// public static final String PROPERTY_SET_OPERATION = "setOperation"; +// +// public static final String PROPERTY_DCP_OPERATION = "dcpOperation"; public static final String PROPERTY_CHANGED_ZONE_OPERATION = "changedZoneOperation"; @@ -77,7 +79,6 @@ public class ActivitySeineUIModel extends ContentOpenableUIModel<ActivitySeineDt private static final long serialVersionUID = 1L; protected boolean generalTabValid; - protected boolean measurementsTabValid; protected boolean observedSystemTabValid; @@ -86,11 +87,15 @@ public class ActivitySeineUIModel extends ContentOpenableUIModel<ActivitySeineDt getBean().addPropertyChangeListener(ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, evt -> { ReferentialReference<VesselActivitySeineDto> oldActivitySeine = (ReferentialReference<VesselActivitySeineDto>) evt.getOldValue(); ReferentialReference<VesselActivitySeineDto> newActivitySeine = (ReferentialReference<VesselActivitySeineDto>) evt.getNewValue(); - { - boolean oldValue = VesselActivitySeineHelper.isSetOperation(oldActivitySeine); - boolean newValue = VesselActivitySeineHelper.isSetOperation(newActivitySeine); - firePropertyChange(PROPERTY_SET_OPERATION, oldValue, newValue); - } +// { +// boolean oldValue = VesselActivitySeineHelper.isSetOperation(oldActivitySeine); +// boolean newValue = VesselActivitySeineHelper.isSetOperation(newActivitySeine); +// firePropertyChange(PROPERTY_SET_OPERATION, oldValue, newValue); +// } +// { +// boolean newValue = VesselActivitySeineHelper.isDcpOperation(newActivitySeine); +// firePropertyChange(PROPERTY_DCP_OPERATION, null, newValue); +// } { boolean oldValue = VesselActivitySeineHelper.isChangedZoneOperation(oldActivitySeine); boolean newValue = VesselActivitySeineHelper.isChangedZoneOperation(newActivitySeine); @@ -131,7 +136,11 @@ public class ActivitySeineUIModel extends ContentOpenableUIModel<ActivitySeineDt } public boolean isSetOperation() { - return VesselActivitySeineHelper.isSetOperation(bean.getVesselActivitySeine()); + return bean.isSetOperation(); + } + + public boolean isDcpOperation() { + return bean.isDcpOperation(); } public boolean isChangedZoneOperation() { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/VesselActivitySeineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/VesselActivitySeineUI.jaxx index fbedb92..4001742 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/VesselActivitySeineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/VesselActivitySeineUI.jaxx @@ -35,11 +35,8 @@ </import> <!-- validator --> - <BeanValidator id='validator' - autoField='true' - beanClass='fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto' - errorTableModel='{getErrorTableModel()}' - context='ui-create'/> + <BeanValidator id='validator' autoField='true' context='ui-create' errorTableModel='{getErrorTableModel()}' + beanClass='fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto'/> <!-- model --> <VesselActivitySeineUIModel id='model'/> @@ -55,8 +52,7 @@ <JLabel id='uriLabel' styleClass='unique'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='uri' styleClass='unique' - onKeyReleased='getBean().setUri(uri.getText())'/> + <JTextField id='uri' styleClass='unique' onKeyReleased='getBean().setUri(uri.getText())'/> </cell> </row> @@ -67,10 +63,8 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> - <JTextField id='code' constraints='BorderLayout.WEST' - onKeyReleased='getBean().setCode(code.getText())'/> - <EnumEditor id='status' constraints='BorderLayout.CENTER' - constructorParams='ReferenceStatus.class' + <JTextField id='code' constraints='BorderLayout.WEST' onKeyReleased='getBean().setCode(code.getText())'/> + <EnumEditor id='status' constraints='BorderLayout.CENTER' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())'/> </JPanel> @@ -80,8 +74,13 @@ <!-- needComment --> <row> <cell anchor='east' weightx="1" fill="both" columns="2"> - <JCheckBox id='needComment' - onItemStateChanged='getBean().setNeedComment(needComment.isSelected())'/> + <JCheckBox id='needComment' onItemStateChanged='getBean().setNeedComment(needComment.isSelected())'/> + </cell> + </row> + <!-- allowFad --> + <row> + <cell anchor='east' weightx="1" fill="both" columns="2"> + <JCheckBox id='allowFad' onItemStateChanged='getBean().setAllowFad(allowFad.isSelected())'/> </cell> </row> </Table> @@ -92,15 +91,13 @@ <JLabel id='label1Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label1' - onKeyReleased='getBean().setLabel1(label1.getText())'/> + <JTextField id='label1' onKeyReleased='getBean().setLabel1(label1.getText())'/> </cell> <cell anchor="west"> <JLabel id='label2Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label2' - onKeyReleased='getBean().setLabel2(label2.getText())'/> + <JTextField id='label2' onKeyReleased='getBean().setLabel2(label2.getText())'/> </cell> </row> <row> @@ -108,15 +105,13 @@ <JLabel id='label3Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label3' - onKeyReleased='getBean().setLabel3(label3.getText())'/> + <JTextField id='label3' onKeyReleased='getBean().setLabel3(label3.getText())'/> </cell> <cell anchor="west"> <JLabel id='label4Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label4' - onKeyReleased='getBean().setLabel4(label4.getText())'/> + <JTextField id='label4' onKeyReleased='getBean().setLabel4(label4.getText())'/> </cell> </row> <row> @@ -124,15 +119,13 @@ <JLabel id='label5Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label5' - onKeyReleased='getBean().setLabel5(label5.getText())'/> + <JTextField id='label5' onKeyReleased='getBean().setLabel5(label5.getText())'/> </cell> <cell anchor="west"> <JLabel id='label6Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label6' - onKeyReleased='getBean().setLabel6(label6.getText())'/> + <JTextField id='label6' onKeyReleased='getBean().setLabel6(label6.getText())'/> </cell> </row> <row> @@ -140,15 +133,13 @@ <JLabel id='label7Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label7' - onKeyReleased='getBean().setLabel7(label7.getText())'/> + <JTextField id='label7' onKeyReleased='getBean().setLabel7(label7.getText())'/> </cell> <cell anchor="west"> <JLabel id='label8Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='label8' - onKeyReleased='getBean().setLabel8(label8.getText())'/> + <JTextField id='label8' onKeyReleased='getBean().setLabel8(label8.getText())'/> </cell> </row> </Table> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/VesselActivitySeineUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/VesselActivitySeineUI.jcss new file mode 100644 index 0000000..8936729 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/VesselActivitySeineUI.jcss @@ -0,0 +1,4 @@ +#allowFad { + text:"observe.common.allowFad"; + selected:{bean.isAllowFad()}; +} \ No newline at end of file diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/VesselActivitySeineUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/VesselActivitySeineUIModel.java index 56fc5e9..7739bcb 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/VesselActivitySeineUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/VesselActivitySeineUIModel.java @@ -24,19 +24,22 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.seine; import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIModel; +import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; /** * Created on 9/28/14. * * @author Tony Chemit - chemit@codelutin.com - * @since XXX + * @since 5.1 */ public class VesselActivitySeineUIModel extends ContentReferenceUIModel<VesselActivitySeineDto> { private static final long serialVersionUID = 1L; public VesselActivitySeineUIModel() { - super(VesselActivitySeineDto.class); + super(VesselActivitySeineDto.class, + new String[]{VesselActivitySeineDto.PROPERTY_ALLOW_FAD}, + new String[]{VesselActivitySeineUI.BINDING_ALLOW_FAD_SELECTED}); } } 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 660ea39..7427f4e 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 @@ -339,6 +339,7 @@ observe.choice.save=Save observe.choice.useRemoteStorage=Use a remote storage observe.common.acquisitionMode=Acquisition mode observe.common.activities.list=List of activities +observe.common.allowFad=Allow Fad ? observe.common.baitObservation=Bait observation observe.common.birdsObservation=Birds observe.common.boolean.false=No 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 323b731..d4ee3ba 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 @@ -339,6 +339,7 @@ observe.choice.save=Grabar observe.choice.useRemoteStorage=Usar la base de datos remota observe.common.acquisitionMode=Modo de entrada de datos observe.common.activities.list=Lista de las actividades +observe.common.allowFad=Utilisation Object flottant ? \#TODO observe.common.baitObservation=Carnada observe.common.birdsObservation=Pájaros observe.common.boolean.false=No 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 c0ea086..0212c82 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 @@ -339,6 +339,7 @@ observe.choice.save=Enregistrer observe.choice.useRemoteStorage=Utiliser une base distante observe.common.acquisitionMode=Mode de saisie observe.common.activities.list=Liste des activités +observe.common.allowFad=Utilisation Object flottant ? observe.common.baitObservation=Gleure observe.common.birdsObservation=Oiseaux observe.common.boolean.false=Non -- 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 18a978099b4a01fb82ad9a8f08355d126d023adc Merge: fd97a40 54d4775 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 5 09:28:15 2016 +0100 [PS] Limiter l'usage du formulaire DCP (Fixes #8376) Merge branch 'feature/8376' into develop ...tivitySeineDto-ui-update-warning-validation.xml | 2 +- .../content/open/impl/seine/ActivitySeineUI.jcss | 4 +- .../open/impl/seine/ActivitySeineUIModel.java | 27 ++++++++---- .../ref/impl/seine/VesselActivitySeineUI.jaxx | 49 +++++++++------------ .../ref/impl/seine/VesselActivitySeineUI.jcss | 4 ++ .../ref/impl/seine/VesselActivitySeineUIModel.java | 7 ++- .../i18n/application-swing_en_GB.properties | 1 + .../i18n/application-swing_es_ES.properties | 1 + .../i18n/application-swing_fr_FR.properties | 1 + .../DataSourceMigrationForVersion_5_1.java | 1 + ...ol_8376_vesselActivitySeine_add_allowFad-H2.sql | 4 ++ ...ol_8376_vesselActivitySeine_add_allowFad-PG.sql | 4 ++ entities/src/main/xmi/observe-seine.zargo | Bin 86801 -> 86910 bytes .../ReferentialReferenceSetDefinitions.java | 3 +- .../seine/VesselActivitySeineHelper.java | 17 +++---- .../services/dto/seine/ActivitySeineDto.java | 28 ++++++++++++ .../src/main/xmi/observe-services-dto-seine.zargo | Bin 60613 -> 60743 bytes .../referential/VesselActivitySeineBinder.java | 10 ++++- 18 files changed, 110 insertions(+), 53 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm