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 7346b7a63156afcca29a6421c64726440f8c50a9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 13:34:18 2016 +0100 Ajout TargetLength.sex (service) --- .../request/ReferenceSetRequestDefinitions.java | 1 + .../src/main/xmi/observe-services-dto-seine.zargo | Bin 59655 -> 59857 bytes services-dto/src/main/xmi/observe-services-dto.ini | 1 + .../seine/TargetLength-service-error-validation.xml | 12 ++++++++++++ .../i18n/services-topia-validation_en_GB.properties | 1 + .../i18n/services-topia-validation_es_ES.properties | 1 + .../i18n/services-topia-validation_fr_FR.properties | 1 + .../topia/binder/data/TargetLengthBinder.java | 4 ++++ 8 files changed, 21 insertions(+) diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java index 9140968..0b3c4c4 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java @@ -336,6 +336,7 @@ public enum ReferenceSetRequestDefinitions { TARGET_SAMPLE_FORM( newBuilder(TargetLengthDto.class) .addKey(TargetLengthDto.PROPERTY_SPECIES, SPECIES) + .addKey(TargetLengthDto.PROPERTY_SEX, SEX) .addKey(TargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE, SIZE_MEASURE_TYPE)), NON_TARGET_SAMPLE_FORM( 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 a4dbe6c..cab12be 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-dto/src/main/xmi/observe-services-dto.ini b/services-dto/src/main/xmi/observe-services-dto.ini index 0652591..85ac2f1 100644 --- a/services-dto/src/main/xmi/observe-services-dto.ini +++ b/services-dto/src/main/xmi/observe-services-dto.ini @@ -239,6 +239,7 @@ species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto weightCategory.attributeGeneric = fr.ird.observe.services.dto.referential.seine.WeightCategoryDto [class fr.ird.observe.services.dto.seine.TargetLength] +sex.attributeGeneric = fr.ird.observe.services.dto.referential.SexDto species.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesDto sizeMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.SizeMeasureTypeDto diff --git a/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetLength-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetLength-service-error-validation.xml index 266addf..c745c23 100644 --- a/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetLength-service-error-validation.xml +++ b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TargetLength-service-error-validation.xml @@ -26,6 +26,18 @@ "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> + <field name="sex"> + + <!-- sex desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ sex == null || sex.enabled ]]> + </param> + <message>validator.service.targetLength.desactivated.sex</message> + </field-validator> + + </field> + <field name="sizeMeasureType"> <!-- pas de sizeMeasureType selectionnee --> diff --git a/services-topia-validation/src/main/resources/i18n/services-topia-validation_en_GB.properties b/services-topia-validation/src/main/resources/i18n/services-topia-validation_en_GB.properties index 90a272e..bb9c670 100644 --- a/services-topia-validation/src/main/resources/i18n/services-topia-validation_en_GB.properties +++ b/services-topia-validation/src/main/resources/i18n/services-topia-validation_en_GB.properties @@ -519,6 +519,7 @@ validator.service.targetDiscarded.required.weightCategory=Weight category must b validator.service.targetDiscarded.uniqueKey=Tuple (category - reasonForDiscard) must be unique. validator.service.targetLength.bound.length=Length must be bound between %s and %s. validator.service.targetLength.bound.weight=Weight must be bound between %s and %s. +validator.service.targetLength.desactivated.sex=Selected sex is disabled. validator.service.targetLength.desactivated.sizeMeasureType=Selected size measure type is disabled. validator.service.targetLength.desactivated.species=Selected species is disabled. validator.service.targetLength.positive.length=Must be a positive number. diff --git a/services-topia-validation/src/main/resources/i18n/services-topia-validation_es_ES.properties b/services-topia-validation/src/main/resources/i18n/services-topia-validation_es_ES.properties index 217ae20..68c434b 100644 --- a/services-topia-validation/src/main/resources/i18n/services-topia-validation_es_ES.properties +++ b/services-topia-validation/src/main/resources/i18n/services-topia-validation_es_ES.properties @@ -519,6 +519,7 @@ validator.service.targetDiscarded.required.weightCategory=Es obligatorio selecci validator.service.targetDiscarded.uniqueKey=El par (categoria - causa del descarte) debe ser única. validator.service.targetLength.bound.length=La talla para esta especie debe estar comprendida entre %1$s y %2$s. validator.service.targetLength.bound.weight=La peso para esta especie debe estar comprendida entre %1$s y %2$s. +validator.service.targetLength.desactivated.sex=El sexo seleccionado está desactivado. validator.service.targetLength.desactivated.sizeMeasureType=Le type de mesure sélectionné est désactivé. \#TODO validator.service.targetLength.desactivated.species=La especie seleccionada está desactivada. validator.service.targetLength.positive.length=La talla debe ser un entero positivo. diff --git a/services-topia-validation/src/main/resources/i18n/services-topia-validation_fr_FR.properties b/services-topia-validation/src/main/resources/i18n/services-topia-validation_fr_FR.properties index f8a91a5..806b8eb 100644 --- a/services-topia-validation/src/main/resources/i18n/services-topia-validation_fr_FR.properties +++ b/services-topia-validation/src/main/resources/i18n/services-topia-validation_fr_FR.properties @@ -519,6 +519,7 @@ validator.service.targetDiscarded.required.weightCategory=La sélection d'une ca validator.service.targetDiscarded.uniqueKey=Le couple (catégorie - raison rejet) doit être unique. validator.service.targetLength.bound.length=La longueur pour cette espèce doit être comprise entre %1$s et %2$s. validator.service.targetLength.bound.weight=Le poids individuel de l'échantillon doit être compris entre %1$s et %2$s. +validator.service.targetLength.desactivated.sex=Le sexe sélectionnée est désactivé. validator.service.targetLength.desactivated.sizeMeasureType=Le type de mesure sélectionné est désactivé. validator.service.targetLength.desactivated.species=L'espèce sélectionnée est désactivée. validator.service.targetLength.positive.length=La longueur est un entier strictement positif. diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetLengthBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetLengthBinder.java index 9d081e8..b590d6a 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetLengthBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetLengthBinder.java @@ -22,11 +22,13 @@ package fr.ird.observe.services.topia.binder.data; * #L% */ +import fr.ird.observe.entities.referentiel.Sex; import fr.ird.observe.entities.referentiel.SizeMeasureType; import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.seine.TargetLength; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; +import fr.ird.observe.services.dto.referential.SexDto; import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.seine.TargetLengthDto; @@ -48,6 +50,7 @@ public class TargetLengthBinder extends DataBinderSupport<TargetLength, TargetLe copyDtoDataFieldsToEntity(dto, entity); entity.setSpecies(toEntity(dto.getSpecies(), Species.class)); + entity.setSex(toEntity(dto.getSex(), Sex.class)); entity.setSizeMeasureType(toEntity(dto.getSizeMeasureType(), SizeMeasureType.class)); entity.setLength(dto.getLength()); entity.setIsLengthComputed(dto.isIsLengthComputed()); @@ -64,6 +67,7 @@ public class TargetLengthBinder extends DataBinderSupport<TargetLength, TargetLe copyEntityDataFieldsToDto(entity, dto); dto.setSpecies(toReferentialReference(referentialLocale, entity.getSpecies(), SpeciesDto.class)); + dto.setSex(toReferentialReference(referentialLocale, entity.getSex(), SexDto.class)); dto.setSizeMeasureType(toReferentialReference(referentialLocale,entity.getSizeMeasureType(), SizeMeasureTypeDto.class)); dto.setLength(entity.getLength()); dto.setIsLengthComputed(entity.isIsLengthComputed()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.