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 3b7c516965f91fe8dee0549e06b8734f3132c9f4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 15:35:14 2016 +0100 Ajout Species.sizeMeatureType + suppresion Species.lengthMeasureType (ui) --- .../SpeciesDto-ui-create-error-validation.xml | 11 +++++++++++ .../SpeciesDto-ui-update-error-validation.xml | 10 ++++++++++ .../application-swing-validation_en_GB.properties | 1 + .../application-swing-validation_es_ES.properties | 1 + .../application-swing-validation_fr_FR.properties | 1 + .../swing/ui/content/ref/impl/SpeciesUI.jaxx | 23 +++++++++++++--------- .../swing/ui/content/ref/impl/SpeciesUI.jcss | 22 ++++++++++++--------- .../swing/ui/content/ref/impl/SpeciesUIModel.java | 5 +++-- .../content/table/impl/seine/AbstractSampleUI.jcss | 1 + .../table/impl/seine/NonTargetSampleUI.jaxx | 15 ++++++-------- 10 files changed, 61 insertions(+), 29 deletions(-) diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-ui-create-error-validation.xml index 154a370..234f6ac 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-ui-create-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-ui-create-error-validation.xml @@ -97,6 +97,17 @@ </field-validator> </field> + <field name="sizeMeasureType"> + + <!-- sizeMeasureType desactivee --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ sizeMeasureType == null || sizeMeasureType.enabled ]]> + </param> + <message>validator.ui.species.desactivated.sizeMeasureType</message> + </field-validator> + </field> + + <field name="scientificLabel"> <!-- pas de scientificLabel renseigne --> diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-ui-update-error-validation.xml index 91c317b..6655bfb 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-ui-update-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-ui-update-error-validation.xml @@ -97,6 +97,16 @@ </field-validator> </field> + <field name="sizeMeasureType"> + + <!-- sizeMeasureType desactivee --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ sizeMeasureType == null || sizeMeasureType.enabled ]]> + </param> + <message>validator.ui.species.desactivated.sizeMeasureType</message> + </field-validator> + </field> + <field name="scientificLabel"> <!-- pas de scientificLabel renseigne --> <field-validator type="requiredstring" short-circuit="true"> diff --git a/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties b/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties index f7dc53b..8bf986a 100644 --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties @@ -500,6 +500,7 @@ validator.ui.setLongline.required.settingStartTimeStamp=Timestamp must be filled validator.ui.setLongline.required.totalSectionsCount=Total sections count must be filled. validator.ui.setLongline.settingEndTimeStamp.before.haulingStartTimeStamp=Setting end time must be before hauling start time. validator.ui.setLongline.settingStartTimeStamp.before.settingEndTimeStamp=Setting start time must be before setting end time. +validator.ui.species.desactivated.sizeMeasureType=Selected size measure type is dabled. validator.ui.species.desactivated.speciesGroup=Selected species group is disabled. validator.ui.species.invalid.faoCode.uniqueKey=Fao code must be unique, value %s is already used. validator.ui.species.invalid.homeId.uniqueKey=Home id must be unique, value %s is already used. diff --git a/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties b/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties index 7be652c..35d081f 100644 --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties @@ -500,6 +500,7 @@ validator.ui.setLongline.required.settingStartTimeStamp=Timestamp de inicio de c validator.ui.setLongline.required.totalSectionsCount=Número de secciones vacío. validator.ui.setLongline.settingEndTimeStamp.before.haulingStartTimeStamp=La hora de inicio de arrastre debe ser superior o igual a la hora de fin de calada. validator.ui.setLongline.settingStartTimeStamp.before.settingEndTimeStamp=L'heure de fin de calada debe ser superior o igual a la hora de inicio de calada. +validator.ui.species.desactivated.sizeMeasureType=Le type de mesure taille est désactivé. \#TODO validator.ui.species.desactivated.speciesGroup=El grupo de especies seleccionado está desactivado. validator.ui.species.invalid.faoCode.uniqueKey=El código debe ser único, el valor %1$s ya se ha usado. validator.ui.species.invalid.homeId.uniqueKey=El código debe ser único, el valor %1$s ya se ha usado. diff --git a/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties b/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties index a906fe4..0246150 100644 --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties @@ -500,6 +500,7 @@ validator.ui.setLongline.required.settingStartTimeStamp=Horodatage de début de validator.ui.setLongline.required.totalSectionsCount=Nombre de sections non renseigné. validator.ui.setLongline.settingEndTimeStamp.before.haulingStartTimeStamp=L'heure de début de virage doit être supérieure ou égal à l'heure de fin de filage. validator.ui.setLongline.settingStartTimeStamp.before.settingEndTimeStamp=L'heure de fin de filage doit être supérieure ou égal à l'heure de début de filage. +validator.ui.species.desactivated.sizeMeasureType=Le type de lensuration est désactivé. validator.ui.species.desactivated.speciesGroup=Le groupe d'espèce sélectionnée est désactivé. validator.ui.species.invalid.faoCode.uniqueKey=Le codeFAO doit être unique, la valeur %1$s est déjà utilisée. validator.ui.species.invalid.homeId.uniqueKey=Le code3l doit être unique, la valeur %1$s est déjà utilisée. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jaxx index 08fb3b5..51ece3d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jaxx @@ -31,6 +31,7 @@ fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.services.dto.referential.SpeciesGroupDto fr.ird.observe.services.dto.referential.OceanDto + fr.ird.observe.services.dto.referential.SizeMeasureTypeDto jaxx.runtime.swing.editor.NumberEditor jaxx.runtime.swing.editor.bean.BeanComboBox @@ -80,8 +81,10 @@ </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' genericType='ReferenceStatus' + <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> </cell> @@ -107,7 +110,9 @@ <JLabel id='speciesGroupLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='speciesGroup' constructorParams='this' genericType='ReferentialReference<SpeciesGroupDto>' _entityClass='SpeciesGroupDto.class'/> + <BeanComboBox id='speciesGroup' constructorParams='this' + genericType='ReferentialReference<SpeciesGroupDto>' + _entityClass='SpeciesGroupDto.class'/> </cell> </row> <!-- needComment --> @@ -203,14 +208,14 @@ <cell weightx="1"> <Table id="editTaillePoids" fill='both' insets="1"> - <!-- lengthMeasureType --> + <!-- sizeMeasuretype --> <row> - <cell anchor="west"> - <JLabel id='lengthMeasureTypeLabel'/> + <cell anchor='west'> + <JLabel id='sizeMeasureTypeLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <JTextField id='lengthMeasureType' - onKeyReleased='getBean().setLengthMeasureType(lengthMeasureType.getText())'/> + <BeanComboBox id='sizeMeasureType' constructorParams='this' + genericType='ReferentialReference<SizeMeasureTypeDto>'/> </cell> </row> @@ -247,7 +252,7 @@ <row> <cell weightx="1"> <JScrollPane id='oceanPane' layout='{new GridLayout(1,1)}' onFocusGained='ocean.requestFocus()'> - <FilterableDoubleList id='ocean' genericType='ReferentialReference<OceanDto>' _entityClass='OceanDto.class'/> + <FilterableDoubleList id='ocean' genericType='ReferentialReference<OceanDto>'/> </JScrollPane> </cell> </row> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jcss index ee9ed1a..a34bafc 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jcss @@ -72,6 +72,7 @@ } #ocean { + _entityClass:{OceanDto.class}; property: {SpeciesDto.PROPERTY_OCEAN}; selected:{(Collection)bean.getOcean()}; _validatorLabel: {t("observe.common.ocean")}; @@ -90,21 +91,24 @@ _validatorLabel: {t("observe.common.speciesGroup")}; } -#editExtraTable { - visible:true; +#sizeMeasureTypeLabel { + text:"observe.common.sizeMeasureType"; + labelFor:{sizeMeasureType}; } -#editTaillePoids { - border:{new TitledBorder(t("observe.common.taillePoids.caracteristics"))}; +#sizeMeasureType { + property:{SpeciesDto.PROPERTY_SIZE_MEASURE_TYPE}; + _entityClass:{SizeMeasureTypeDto.class}; + selectedItem:{bean.getSizeMeasureType()}; + _validatorLabel: {t("observe.common.sizeMeasureType")}; } -#lengthMeasureTypeLabel { - text:"observe.common.lengthMeasureType"; - labelFor:{lengthMeasureType}; +#editExtraTable { + visible:true; } -#lengthMeasureType { - text:{getStringValue(bean.getLengthMeasureType())}; +#editTaillePoids { + border:{new TitledBorder(t("observe.common.taillePoids.caracteristics"))}; } #minLengthMaxLabel { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUIModel.java index 4a53c6b..e0802c7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUIModel.java @@ -60,6 +60,7 @@ public class SpeciesUIModel extends ContentReferenceUIModel<SpeciesDto> { public static final Set<String> OTHER_TAB_PROPERTIES = ImmutableSet.<String>builder().add(SpeciesDto.PROPERTY_SPECIES_GROUP, + SpeciesDto.PROPERTY_SIZE_MEASURE_TYPE, SpeciesDto.PROPERTY_OCEAN, SpeciesDto.PROPERTY_MAX_LENGTH, SpeciesDto.PROPERTY_MIN_LENGTH, @@ -77,7 +78,7 @@ public class SpeciesUIModel extends ContentReferenceUIModel<SpeciesDto> { super(SpeciesDto.class, new String[]{SpeciesDto.PROPERTY_SPECIES_GROUP, SpeciesDto.PROPERTY_OCEAN, - SpeciesDto.PROPERTY_LENGTH_MEASURE_TYPE, + SpeciesDto.PROPERTY_SIZE_MEASURE_TYPE, SpeciesDto.PROPERTY_MIN_LENGTH, SpeciesDto.PROPERTY_MAX_LENGTH, SpeciesDto.PROPERTY_MIN_WEIGHT, @@ -88,7 +89,7 @@ public class SpeciesUIModel extends ContentReferenceUIModel<SpeciesDto> { SpeciesDto.PROPERTY_SCIENTIFIC_LABEL}, new String[]{ SpeciesDto.PROPERTY_SPECIES_GROUP + SUFFIX_SELECTED_ITEM, - SpeciesDto.PROPERTY_LENGTH_MEASURE_TYPE + SUFFIX_TEXT, + SpeciesDto.PROPERTY_SIZE_MEASURE_TYPE + SUFFIX_SELECTED_ITEM, SpeciesDto.PROPERTY_MIN_LENGTH + SUFFIX_MODEL, SpeciesDto.PROPERTY_MAX_LENGTH + SUFFIX_MODEL, SpeciesDto.PROPERTY_MIN_WEIGHT + SUFFIX_MODEL, diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUI.jcss index 8be3504..7e76dab 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUI.jcss @@ -38,6 +38,7 @@ JToolBar { } #species { + _entityClass:{SpeciesDto.class}; property:species; bean:{tableEditBean}; showReset:true; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx index 81581f5..1098ec4 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx @@ -98,7 +98,7 @@ public String getLengthDataTip(boolean computed) { } public String getSpeciesFauneTypeTaille(ReferentialReference<SpeciesDto> species) { - return species == null ? t("observe.message.no.species.selected") : (String) species.getPropertyValue(SpeciesDto.PROPERTY_LENGTH_MEASURE_TYPE); + return species == null ? t("observe.message.no.species.selected") : (String) species.getPropertyValue(SpeciesDto.PROPERTY_SIZE_MEASURE_TYPE); } ]]> </script> @@ -123,7 +123,7 @@ public String getSpeciesFauneTypeTaille(ReferentialReference<SpeciesDto> species <JLabel id='speciesLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='species' constructorParams='this' genericType='ReferentialReference<SpeciesDto>' _entityClass='SpeciesDto.class'/> + <BeanComboBox id='species' constructorParams='this' genericType='ReferentialReference<SpeciesDto>'/> </cell> </row> @@ -163,8 +163,7 @@ public String getSpeciesFauneTypeTaille(ReferentialReference<SpeciesDto> species </cell> <cell anchor='east'> <JToolBar id='weightSourceAction'> - <JButton id='weightSourceInformation' - onActionPerformed='getHandler().resetIsWeightComputed()'/> + <JButton id='weightSourceInformation' onActionPerformed='getHandler().resetIsWeightComputed()'/> </JToolBar> </cell> </row> @@ -185,7 +184,7 @@ public String getSpeciesFauneTypeTaille(ReferentialReference<SpeciesDto> species <JLabel id='sexLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='sex' genericType='ReferentialReference<SexDto>' _entityClass='SexDto.class' constructorParams='this'/> + <BeanComboBox id='sex' genericType='ReferentialReference<SexDto>' constructorParams='this'/> </cell> </row> @@ -209,10 +208,8 @@ public String getSpeciesFauneTypeTaille(ReferentialReference<SpeciesDto> species <Table id='extraZone' fill='both' weightx='1' insets='0'> <row> <cell weighty='1'> - <JScrollPane id='comment' - onFocusGained='comment2.requestFocus()'> - <JTextArea id='comment2' - onKeyReleased='getBean().setComment(comment2.getText())'/> + <JScrollPane id='comment' onFocusGained='comment2.requestFocus()'> + <JTextArea id='comment2' onKeyReleased='getBean().setComment(comment2.getText())'/> </JScrollPane> </cell> </row> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.