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 6e60cfcd1abdfd685f70337570e68f62295bb272 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 10:18:24 2016 +0100 Déplacement de SizeMeasureType et WeightMeasureType dans le référentiel commun (ui) --- .../swing/decoration/DecoratorService.java | 4 +-- ...zeMeasureTypeDto-ui-create-error-validation.xml | 0 ...MeasureTypeDto-ui-create-warning-validation.xml | 0 ...zeMeasureTypeDto-ui-update-error-validation.xml | 0 ...MeasureTypeDto-ui-update-warning-validation.xml | 0 ...htMeasureTypeDto-ui-create-error-validation.xml | 0 ...MeasureTypeDto-ui-create-warning-validation.xml | 0 ...htMeasureTypeDto-ui-update-error-validation.xml | 0 ...MeasureTypeDto-ui-update-warning-validation.xml | 0 .../TargetLengthDto-ui-update-error-validation.xml | 18 ++++++++++ .../application-swing-validation_en_GB.properties | 3 ++ .../application-swing-validation_es_ES.properties | 3 ++ .../application-swing-validation_fr_FR.properties | 3 ++ .../validation/BeanValidatorDetectorTest.java | 4 +-- .../ref/impl/{longline => }/SizeMeasureTypeUI.jaxx | 8 ++--- .../{longline => }/SizeMeasureTypeUIModel.java | 4 +-- .../impl/{longline => }/WeightMeasureTypeUI.jaxx | 8 ++--- .../{longline => }/WeightMeasureTypeUIModel.java | 4 +-- .../impl/longline/CatchLonglineUIHandler.java | 4 +-- .../impl/longline/SizeMeasuresTableModel.java | 2 +- .../impl/longline/WeightMeasuresTableModel.java | 2 +- .../content/table/impl/seine/TargetSampleUI.jaxx | 30 +++++++--------- .../content/table/impl/seine/TargetSampleUI.jcss | 24 +++++++++---- .../table/impl/seine/TargetSampleUIHandler.java | 40 +++++++++++++++++++--- .../table/impl/seine/TargetSampleUIModel.java | 11 +++--- .../i18n/application-swing_en_GB.properties | 5 +-- .../i18n/application-swing_es_ES.properties | 5 +-- .../i18n/application-swing_fr_FR.properties | 5 +-- 28 files changed, 127 insertions(+), 60 deletions(-) diff --git a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java index 638550f..81d5cc3 100644 --- a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java +++ b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java @@ -88,11 +88,11 @@ import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; import fr.ird.observe.services.dto.referential.longline.SettingShapeDto; -import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.longline.StomacFullnessDto; import fr.ird.observe.services.dto.referential.longline.TripTypeDto; import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; -import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; +import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; import fr.ird.observe.services.dto.referential.seine.DetectionModeDto; import fr.ird.observe.services.dto.referential.seine.ObjectFateDto; import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SizeMeasureTypeDto-ui-create-error-validation.xml similarity index 100% rename from application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SizeMeasureTypeDto-ui-create-error-validation.xml diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SizeMeasureTypeDto-ui-create-warning-validation.xml similarity index 100% rename from application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SizeMeasureTypeDto-ui-create-warning-validation.xml diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SizeMeasureTypeDto-ui-update-error-validation.xml similarity index 100% rename from application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SizeMeasureTypeDto-ui-update-error-validation.xml diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SizeMeasureTypeDto-ui-update-warning-validation.xml similarity index 100% rename from application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SizeMeasureTypeDto-ui-update-warning-validation.xml diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/WeightMeasureTypeDto-ui-create-error-validation.xml similarity index 100% rename from application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-ui-create-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/WeightMeasureTypeDto-ui-create-error-validation.xml diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/WeightMeasureTypeDto-ui-create-warning-validation.xml similarity index 100% rename from application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-ui-create-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/WeightMeasureTypeDto-ui-create-warning-validation.xml diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/WeightMeasureTypeDto-ui-update-error-validation.xml similarity index 100% rename from application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-ui-update-error-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/WeightMeasureTypeDto-ui-update-error-validation.xml diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/WeightMeasureTypeDto-ui-update-warning-validation.xml similarity index 100% rename from application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-ui-update-warning-validation.xml rename to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/WeightMeasureTypeDto-ui-update-warning-validation.xml diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetLengthDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetLengthDto-ui-update-error-validation.xml index 9e3e337..0fea9ab 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetLengthDto-ui-update-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/TargetLengthDto-ui-update-error-validation.xml @@ -26,6 +26,24 @@ "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> + <field name="sizeMeasureType"> + + <!-- pas de sizeMeasureType selectionnee --> + <field-validator type="required" short-circuit="true"> + <message>validator.ui.targetLength.required.sizeMeasureType</message> + </field-validator> + + <!-- sizeMeasureType desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ sizeMeasureType.enabled ]]> + </param> + <message>validator.ui.targetLength.desactivated.sizeMeasureType</message> + </field-validator> + + </field> + + <field name="species"> <!-- pas de species selectionnee --> 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 cd26f38..3e9eca9 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 @@ -153,6 +153,7 @@ observe.common.settingStartTimeStamp=Setting start timeStamp observe.common.settingVesselSpeed=Setting vessel speed observe.common.sex=Sex observe.common.shooterSpeed=Shooter speed +observe.common.sizeMeasureType=Size measure type observe.common.snapWeight=Snap weight observe.common.species=Species observe.common.speciesCatch=Species @@ -533,10 +534,12 @@ validator.ui.targetDiscarded.required.weightCategory=Weight category must be fil validator.ui.targetDiscarded.uniqueKey=Tuple (category - reasonForDiscard) must be unique. validator.ui.targetLength.bound.length=Length must be bound between %s and %s. validator.ui.targetLength.bound.weight=Weight must be bound between %s and %s. +validator.ui.targetLength.desactivated.sizeMeasureType=Selected size measure type is disabled. validator.ui.targetLength.desactivated.species=Selected species is disabled. validator.ui.targetLength.positive.length=Must be a positive number. validator.ui.targetLength.positive.weight=Must be a positive number. validator.ui.targetLength.required.count=Count must be filled. +validator.ui.targetLength.required.sizeMeasureType=Size measure type is mandatory. validator.ui.targetLength.required.species=Species must be filled. validator.ui.targetLength.required.taille=Size must be filled. validator.ui.targetLength.required.weight.or.taille=Weight or size must be filled. 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 d7cc884..64dd001 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 @@ -153,6 +153,7 @@ observe.common.settingStartTimeStamp=Timestamp de inicio observe.common.settingVesselSpeed=Velocidad del barco (nd) observe.common.sex=Sexo observe.common.shooterSpeed=Velocidad shooter (nd) +observe.common.sizeMeasureType=Size measure type \#TODO observe.common.snapWeight=Peso snap (kg) observe.common.species=Especie observe.common.speciesCatch=Especie @@ -533,10 +534,12 @@ validator.ui.targetDiscarded.required.weightCategory=Es obligatorio seleccionar validator.ui.targetDiscarded.uniqueKey=El par (categoria - causa del descarte) debe ser única. validator.ui.targetLength.bound.length=La talla para esta especie debe estar comprendida entre %1$s y %2$s. validator.ui.targetLength.bound.weight=La peso para esta especie debe estar comprendida entre %1$s y %2$s. +validator.ui.targetLength.desactivated.sizeMeasureType=Selected size mesure type is disabled. \#TODO validator.ui.targetLength.desactivated.species=La especie seleccionada está desactivada. validator.ui.targetLength.positive.length=La talla debe ser un entero positivo. validator.ui.targetLength.positive.weight=El peso debe ser un entero positivo. validator.ui.targetLength.required.count=Es obligatoria especificar el número de grupo de talla. +validator.ui.targetLength.required.sizeMeasureType=Es obligatoria especificar el size measure type \#TODO validator.ui.targetLength.required.species=Es obligatoria seleccionar una especie de atún. validator.ui.targetLength.required.taille=Es obligatoria especificar el talla. validator.ui.targetLength.required.weight.or.taille=Al menos uno de los valores (talla/peso) debe ser rellenado. 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 10c1d1d..c090076 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 @@ -153,6 +153,7 @@ observe.common.settingStartTimeStamp=Horodatage début observe.common.settingVesselSpeed=Vitesse bateau (nd) observe.common.sex=Sexe observe.common.shooterSpeed=Vitesse shooter (nd) +observe.common.sizeMeasureType=Type de mesure observe.common.snapWeight=Poids snap (kg) observe.common.species=Espèces observe.common.speciesCatch=Espèce @@ -533,10 +534,12 @@ validator.ui.targetDiscarded.required.weightCategory=La sélection d'une catégo validator.ui.targetDiscarded.uniqueKey=Le couple (catégorie - raison rejet) doit être unique. validator.ui.targetLength.bound.length=La longueur pour cette espèce doit être comprise entre %1$s et %2$s. validator.ui.targetLength.bound.weight=Le poids individuel de l'échantillon doit être compris entre %1$s et %2$s. +validator.ui.targetLength.desactivated.sizeMeasureType=Le type de mesure sélectionné est désactivé. validator.ui.targetLength.desactivated.species=L'espèce sélectionnée est désactivée. validator.ui.targetLength.positive.length=La longueur est un entier strictement positif. validator.ui.targetLength.positive.weight=Le poids est un entier strictement positif. validator.ui.targetLength.required.count=Le nombre effectif est obligatoire. +validator.ui.targetLength.required.sizeMeasureType=Le type de mesure est obligatoire. validator.ui.targetLength.required.species=La sélection d'une espèce de thon est obligatoire. validator.ui.targetLength.required.taille=La taille est obligatoire. validator.ui.targetLength.required.weight.or.taille=Au moins une des valeurs (taille / poids) doit être renseignée. diff --git a/application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java b/application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java index bfd5ac4..b9cc5a5 100644 --- a/application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java +++ b/application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java @@ -79,11 +79,11 @@ import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; import fr.ird.observe.services.dto.referential.longline.SettingShapeDto; -import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.longline.StomacFullnessDto; import fr.ird.observe.services.dto.referential.longline.TripTypeDto; import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; -import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; +import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; import fr.ird.observe.services.dto.referential.seine.DetectionModeDto; import fr.ird.observe.services.dto.referential.seine.ObjectFateDto; import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SizeMeasureTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SizeMeasureTypeUI.jaxx similarity index 96% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SizeMeasureTypeUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SizeMeasureTypeUI.jaxx index 716227b..c4da1a3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SizeMeasureTypeUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SizeMeasureTypeUI.jaxx @@ -21,12 +21,12 @@ --> <fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='SizeMeasureTypeDto'> - <style source="../ReferenceEntity.jcss"/> - <style source="../I18nReferenceEntity.jcss"/> + <style source="ReferenceEntity.jcss"/> + <style source="I18nReferenceEntity.jcss"/> <import> fr.ird.observe.services.dto.constants.ReferenceStatus - fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto + fr.ird.observe.services.dto.referential.SizeMeasureTypeDto fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIModel @@ -36,7 +36,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto' + beanClass='fr.ird.observe.services.dto.referential.SizeMeasureTypeDto' context='ui-create' errorTableModel='{getErrorTableModel()}'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SizeMeasureTypeUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SizeMeasureTypeUIModel.java similarity index 89% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SizeMeasureTypeUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SizeMeasureTypeUIModel.java index 0b6c93d..cad3885 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SizeMeasureTypeUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SizeMeasureTypeUIModel.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.ui.content.ref.impl.longline; +package fr.ird.observe.application.swing.ui.content.ref.impl; /* * #%L @@ -22,7 +22,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.longline; * #L% */ -import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIModel; /** diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/WeightMeasureTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/WeightMeasureTypeUI.jaxx similarity index 96% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/WeightMeasureTypeUI.jaxx rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/WeightMeasureTypeUI.jaxx index 7796ec7..f29f5c9 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/WeightMeasureTypeUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/WeightMeasureTypeUI.jaxx @@ -21,12 +21,12 @@ --> <fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='WeightMeasureTypeDto'> - <style source="../ReferenceEntity.jcss"/> - <style source="../I18nReferenceEntity.jcss"/> + <style source="ReferenceEntity.jcss"/> + <style source="I18nReferenceEntity.jcss"/> <import> fr.ird.observe.services.dto.constants.ReferenceStatus - fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto + fr.ird.observe.services.dto.referential.WeightMeasureTypeDto fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIModel @@ -36,7 +36,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto' + beanClass='fr.ird.observe.services.dto.referential.WeightMeasureTypeDto' context='ui-create' errorTableModel='{getErrorTableModel()}'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/WeightMeasureTypeUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/WeightMeasureTypeUIModel.java similarity index 88% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/WeightMeasureTypeUIModel.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/WeightMeasureTypeUIModel.java index 108df3e..0243cf0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/WeightMeasureTypeUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/WeightMeasureTypeUIModel.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.ui.content.ref.impl.longline; +package fr.ird.observe.application.swing.ui.content.ref.impl; /* * #%L @@ -22,7 +22,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.longline; * #L% */ -import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; +import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIModel; /** diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java index b253832..c55755f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java @@ -55,8 +55,8 @@ import fr.ird.observe.services.dto.referential.ReferentialReferences; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.longline.CatchFateLonglineDto; import fr.ird.observe.services.dto.referential.longline.HealthnessDto; -import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; -import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; +import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.longline.BranchlineService; import fr.ird.observe.services.service.longline.SetLonglineCatchService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SizeMeasuresTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SizeMeasuresTableModel.java index 7ae0002..ee77d4e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SizeMeasuresTableModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SizeMeasuresTableModel.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.table.impl.longline; import fr.ird.observe.services.dto.longline.SizeMeasureDto; import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.application.swing.ui.util.table.EditableTableWithCacheTableModelSupport; /** diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/WeightMeasuresTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/WeightMeasuresTableModel.java index d8edf35..f8a1fa6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/WeightMeasuresTableModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/WeightMeasuresTableModel.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.table.impl.longline; import fr.ird.observe.services.dto.longline.WeightMeasureDto; import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; +import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; import fr.ird.observe.application.swing.ui.util.table.EditableTableWithCacheTableModelSupport; /** diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx index a0092bd..ae3f271 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx @@ -21,18 +21,18 @@ --> <fr.ird.observe.application.swing.ui.content.table.ContentTableUI - superGenericType='TargetSampleDto, TargetLengthDto' - abstract="true"> + superGenericType='TargetSampleDto, TargetLengthDto' + abstract="true"> <style source="AbstractSampleUI.jcss"/> <import> fr.ird.observe.services.dto.seine.TargetSampleDto fr.ird.observe.services.dto.seine.TargetLengthDto - fr.ird.observe.application.swing.ui.content.table.impl.seine.CodeMesureEnum fr.ird.observe.application.swing.ui.content.table.impl.seine.ModeSaisieEchantillonEnum fr.ird.observe.services.dto.referential.ReferentialReference fr.ird.observe.services.dto.referential.SpeciesDto + fr.ird.observe.services.dto.referential.SizeMeasureTypeDto fr.ird.observe.application.swing.ui.content.table.* jaxx.runtime.swing.editor.NumberEditor @@ -106,12 +106,10 @@ public String getLengthDataTip(boolean computed) { <JRadioButton id='acquisitionModeEffectif'/> <JRadioButton id='acquisitionModeIndividu'/> </JPanel> - <JPanel id='measureTypePanel' layout='{new BorderLayout()}'> - <EnumEditor id='measureType' - constraints="BorderLayout.CENTER" - constructorParams='CodeMesureEnum.class' - genericType='CodeMesureEnum' - onItemStateChanged='getTableEditBean().setMeasureType(measureType.getSelectedIndex())'/> + <JPanel id='sizeMeasureTypePanel' layout='{new BorderLayout()}'> + <JLabel id='sizeMeasureTypeLabel' constraints="BorderLayout.WEST"/> + <BeanComboBox id='sizeMeasureType' genericType='ReferentialReference<SizeMeasureTypeDto>' + constructorParams='this' constraints="BorderLayout.CENTER"/> </JPanel> </JPanel> </cell> @@ -123,7 +121,7 @@ public String getLengthDataTip(boolean computed) { <JLabel id='speciesLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanComboBox id='species' genericType='ReferentialReference<SpeciesDto>' _entityClass='SpeciesDto.class' constructorParams='this'/> + <BeanComboBox id='species' genericType='ReferentialReference<SpeciesDto>' constructorParams='this'/> </cell> </row> @@ -137,8 +135,7 @@ public String getLengthDataTip(boolean computed) { </cell> <cell anchor='east'> <JToolBar id='lengthSourceAction'> - <JButton id='lengthSourceInformation' - onActionPerformed='getHandler().resetIsLengthComputed()'/> + <JButton id='lengthSourceInformation' onActionPerformed='getHandler().resetIsLengthComputed()'/> </JToolBar> </cell> </row> @@ -153,8 +150,7 @@ public String getLengthDataTip(boolean computed) { </cell> <cell anchor='east'> <JToolBar id='weightSourceAction'> - <JButton id='weightSourceInformation' - onActionPerformed='getHandler().resetIsWeightComputed()'/> + <JButton id='weightSourceInformation' onActionPerformed='getHandler().resetIsWeightComputed()'/> </JToolBar> </cell> </row> @@ -173,10 +169,8 @@ public String getLengthDataTip(boolean computed) { <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> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jcss index 17c1381..699dadf 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jcss @@ -22,6 +22,12 @@ #speciesLabel { text:"observe.common.speciesThon"; + labelFor:{species}; +} + + +#species { + _entityClass:{SpeciesDto.class}; } #modeAndCodePanel { @@ -37,12 +43,20 @@ layout:{new GridLayout(0,1)}; } -#measureTypePanel { - border:{new TitledBorder(t("observe.common.measureType"))}; +#sizeMeasureTypePanel { + border:{new TitledBorder(t("observe.common.sizeMeasureType"))}; +} + +#sizeMeasureTypeLabel { + labelFor:{sizeMeasureType}; } -#measureType { - selectedIndex:{tableEditBean.getMeasureType()}; +#sizeMeasureType { + _entityClass:{SizeMeasureTypeDto.class}; + _tablePropertyName:{TargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE}; + property:{TargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE}; + selectedItem:{tableEditBean.getSizeMeasureType()}; + bean:{tableEditBean}; } #acquisitionModeEffectif { @@ -51,7 +65,6 @@ text:{ModeSaisieEchantillonEnum.byEffectif.getI18nKey()}; selected:{tableEditBean.getAcquisitionMode() == 0}; enabled:{!tableModel.isEditable() || tableModel.isCreate()}; - /*enabled:{!tableModel.isEditable() || !model.isRowSaved()};*/ } #acquisitionModeIndividu { @@ -60,7 +73,6 @@ text:{ModeSaisieEchantillonEnum.byIndividu.getI18nKey()}; selected:{tableEditBean.getAcquisitionMode() == 1}; enabled:{!tableModel.isEditable() || tableModel.isCreate()}; - /*enabled:{!tableModel.isEditable() || !model.isRowSaved()};*/ } #lengthLabel { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java index 6dfdb3e..e5b9d83 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java @@ -30,6 +30,8 @@ import fr.ird.observe.application.swing.ui.content.table.ContentTableUI; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeHelper; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.SetSeineDto; @@ -44,6 +46,7 @@ import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JComponent; import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; +import java.util.ArrayList; import java.util.Collection; import java.util.LinkedList; import java.util.List; @@ -109,6 +112,7 @@ public class TargetSampleUIHandler extends AbstractSampleUIHandler<TargetSampleD JComponent requestFocus; ModeSaisieEchantillonEnum modeSaisieEchantillonEnum; + ReferentialReference<SizeMeasureTypeDto> sizeMeasureType = null; if (create) { @@ -123,8 +127,8 @@ public class TargetSampleUIHandler extends AbstractSampleUIHandler<TargetSampleD } // on utilise par défaut le code mesure lf - ui.getMeasureType().setSelectedItem(null); - ui.getMeasureType().setSelectedItem(CodeMesureEnum.lf); + sizeMeasureType = SizeMeasureTypeHelper.getLf(ui.getSizeMeasureType().getData()); + } requestFocus = ui.getSpecies(); @@ -135,12 +139,18 @@ public class TargetSampleUIHandler extends AbstractSampleUIHandler<TargetSampleD int acquisitionMode = bean.getAcquisitionMode(); modeSaisieEchantillonEnum = ModeSaisieEchantillonEnum.valueOf(acquisitionMode); + + sizeMeasureType = bean.getSizeMeasureType(); + } ui.getAcquisitionModeGroup().setSelectedValue(null); ui.getAcquisitionModeGroup().setSelectedValue(modeSaisieEchantillonEnum); + ui.getSizeMeasureType().setSelectedItem(null); + ui.getSizeMeasureType().setSelectedItem(sizeMeasureType); + // on met a jour l'espce ui.getSpecies().setSelectedItem(null); @@ -161,6 +171,22 @@ public class TargetSampleUIHandler extends AbstractSampleUIHandler<TargetSampleD } @Override + public void openUI() { + super.openUI(); + + List<ReferentialReference<SizeMeasureTypeDto>> sizeMeasureTypes = new ArrayList<>(getDataSource().getReferentialReferences(SizeMeasureTypeDto.class)); + List<ReferentialReference<SizeMeasureTypeDto>> data = SizeMeasureTypeHelper.filterForSeine(sizeMeasureTypes); + if (log.isInfoEnabled()) { + log.info("Using " + data.size() + " size measure type(s)."); + } + if (data.size() != 2) { + throw new IllegalStateException("WHY???"); + } + getUi().getSizeMeasureType().setData(data); + + } + + @Override protected void initTableUI(DefaultTableCellRenderer renderer) { JTable table = getUi().getTable(); @@ -169,8 +195,8 @@ public class TargetSampleUIHandler extends AbstractSampleUIHandler<TargetSampleD table, n("observe.content.targetSample.table.speciesThon"), n("observe.content.targetSample.table.speciesThon.tip"), - n("observe.content.targetSample.table.measureType"), - n("observe.content.targetSample.table.measureType.tip"), + n("observe.content.targetSample.table.sizeMeasureType"), + n("observe.content.targetSample.table.sizeMeasureType.tip"), n("observe.content.targetSample.table.length"), n("observe.content.targetSample.table.length.tip"), n("observe.content.targetSample.table.meanWeight"), @@ -181,7 +207,7 @@ public class TargetSampleUIHandler extends AbstractSampleUIHandler<TargetSampleD n("observe.content.targetSample.table.totalWeight.tip")); UIHelper.setTableColumnRenderer(table, 0, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, SpeciesDto.class)); - UIHelper.setTableColumnRenderer(table, 1, UIHelper.newEnumTableCellRenderer(renderer, CodeMesureEnum.class)); + UIHelper.setTableColumnRenderer(table, 1, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, SizeMeasureTypeDto.class)); UIHelper.setTableColumnRenderer(table, 2, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 3, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 4, UIHelper.newEmptyNumberTableCellRenderer(renderer)); @@ -292,6 +318,10 @@ public class TargetSampleUIHandler extends AbstractSampleUIHandler<TargetSampleD loadReferentialReferenceSetsInModel(form); getModel().setForm(form); TargetSampleHelper.copyTargetSampleDto(form.getObject(), getBean()); + for (TargetLengthDto targetLengthDto : getBean().getTargetLength()) { + ReferentialReference<SizeMeasureTypeDto> sizeMeasureType = targetLengthDto.getSizeMeasureType(); + SizeMeasureTypeHelper.filterForSeine(sizeMeasureType); + } } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIModel.java index 605ed3c..e8f06f0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIModel.java @@ -24,13 +24,13 @@ package fr.ird.observe.application.swing.ui.content.table.impl.seine; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import fr.ird.observe.services.dto.seine.TargetLengthDto; -import fr.ird.observe.services.dto.seine.TargetLengthHelper; -import fr.ird.observe.services.dto.seine.TargetSampleDto; import fr.ird.observe.application.swing.ui.content.table.ContentTableMeta; import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; import fr.ird.observe.application.swing.ui.content.table.ContentTableUIModel; import fr.ird.observe.application.swing.ui.content.table.ObserveContentTableUI; +import fr.ird.observe.services.dto.seine.TargetLengthDto; +import fr.ird.observe.services.dto.seine.TargetLengthHelper; +import fr.ird.observe.services.dto.seine.TargetSampleDto; import java.util.Collection; import java.util.List; @@ -59,12 +59,12 @@ public class TargetSampleUIModel extends ContentTableUIModel<TargetSampleDto, Ta TargetLengthDto.PROPERTY_WEIGHT, TargetLengthDto.PROPERTY_IS_WEIGHT_COMPUTED, TargetLengthDto.PROPERTY_COUNT, - TargetLengthDto.PROPERTY_MEASURE_TYPE, + TargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE, TargetLengthDto.PROPERTY_ACQUISITION_MODE}); List<ContentTableMeta<TargetLengthDto>> metas = Lists.newArrayList( ContentTableModel.newTableMeta(TargetLengthDto.class, TargetLengthDto.PROPERTY_SPECIES, true), - ContentTableModel.newTableMeta(TargetLengthDto.class, TargetLengthDto.PROPERTY_MEASURE_TYPE, true), + ContentTableModel.newTableMeta(TargetLengthDto.class, TargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE, true), ContentTableModel.newTableMeta(TargetLengthDto.class, TargetLengthDto.PROPERTY_LENGTH, true), ContentTableModel.newTableMeta(TargetLengthDto.class, TargetLengthDto.PROPERTY_WEIGHT, true), ContentTableModel.newTableMeta(TargetLengthDto.class, TargetLengthDto.PROPERTY_COUNT, false), @@ -80,6 +80,7 @@ public class TargetSampleUIModel extends ContentTableUIModel<TargetSampleDto, Ta List<ContentTableMeta<TargetLengthDto>> contentTableMetas) { return new ContentTableModel<TargetSampleDto, TargetLengthDto>(ui, contentTableMetas) { private static final long serialVersionUID = 1L; + @Override protected Collection<TargetLengthDto> getChilds(TargetSampleDto bean) { return bean.getTargetLength(); 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 c5d2ea1..449536f 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 @@ -473,6 +473,7 @@ observe.common.scientificLabel=Scientific label observe.common.seaSurfaceTemperature=Sea surface temperature observe.common.searchMaximum=Search maximum observe.common.sex=Sex +observe.common.sizeMeasureType=Measure type observe.common.species=Species observe.common.speciesFate=Species fate observe.common.speciesFaune=Fauna species @@ -1190,8 +1191,8 @@ observe.content.targetSample.table.length=Length observe.content.targetSample.table.length.tip=Length (cm inf.) observe.content.targetSample.table.meanWeight=Indiv. weight observe.content.targetSample.table.meanWeight.tip=Individual weight (in Kg) -observe.content.targetSample.table.measureType=Measure type -observe.content.targetSample.table.measureType.tip=Measure type (LF or LD1) +observe.content.targetSample.table.sizeMeasureType=Measure type +observe.content.targetSample.table.sizeMeasureType.tip=Measure type (LF or LD1) observe.content.targetSample.table.speciesThon=Species observe.content.targetSample.table.speciesThon.tip=Target sample species observe.content.targetSample.table.totalWeight=Total weight (in t) 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 57ac15f..92d3ad0 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 @@ -473,6 +473,7 @@ observe.common.scientificLabel=Texto científico observe.common.seaSurfaceTemperature=Temperatura en superficie (°) observe.common.searchMaximum=Velocidad máxima de prospección observe.common.sex=Sexo +observe.common.sizeMeasureType=Tipo de medida observe.common.species=Especie observe.common.speciesFate=Devenir de fauna observe.common.speciesFaune=Especie de fauna @@ -1190,8 +1191,8 @@ observe.content.targetSample.table.length=Longitud observe.content.targetSample.table.length.tip=Longitud (cm inf.) observe.content.targetSample.table.meanWeight=Peso ind. observe.content.targetSample.table.meanWeight.tip=Peso individual (en Kg) -observe.content.targetSample.table.measureType=Tipo de medición -observe.content.targetSample.table.measureType.tip=El tipo de medición utilizado (LF ou LD1) +observe.content.targetSample.table.sizeMeasureType=Tipo de medición +observe.content.targetSample.table.sizeMeasureType.tip=El tipo de medición utilizado (LF ou LD1) observe.content.targetSample.table.speciesThon=Especie de atún observe.content.targetSample.table.speciesThon.tip=Especie de atún observe.content.targetSample.table.totalWeight=Peso tot. 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 7a80abf..dfdcecc 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 @@ -473,6 +473,7 @@ observe.common.scientificLabel=Libellé scientifique observe.common.seaSurfaceTemperature=Température surface (°) observe.common.searchMaximum=Vitesse maximale observe.common.sex=Sexe +observe.common.sizeMeasureType=Type de mensuration observe.common.species=Espèce observe.common.speciesFate=Devenir espèce observe.common.speciesFaune=Espèce de faune @@ -1190,8 +1191,8 @@ observe.content.targetSample.table.length=Longueur observe.content.targetSample.table.length.tip=Longueur (cm inf.) observe.content.targetSample.table.meanWeight=Poids ind. observe.content.targetSample.table.meanWeight.tip=Poids individuel (en Kg) -observe.content.targetSample.table.measureType=Type de mensuration -observe.content.targetSample.table.measureType.tip=Le type de mensuration utilisé (LF ou LD1) +observe.content.targetSample.table.sizeMeasureType=Type de mensuration +observe.content.targetSample.table.sizeMeasureType.tip=Le type de mensuration utilisé (LF ou LD1) observe.content.targetSample.table.speciesThon=Espèce de thon observe.content.targetSample.table.speciesThon.tip=Espèce de thon observe.content.targetSample.table.totalWeight=Poids tot. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.