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 bf37388f3470b899c6f5f8ddaf6aa8f9d484468c Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 15:34:27 2016 +0100 Ajout Species.sizeMeatureType + suppresion Species.lengthMeasureType (service) --- .../ReferentialReferenceSetDefinitions.java | 2 +- .../src/main/xmi/observe-services-dto-common.zargo | Bin 42563 -> 42688 bytes services-dto/src/main/xmi/observe-services-dto.ini | 1 + .../Species-service-error-validation.xml | 10 ++++++++++ .../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/referential/SpeciesBinder.java | 10 ++++++---- 8 files changed, 21 insertions(+), 5 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 98d93cc..09c1277 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 @@ -147,7 +147,7 @@ public enum ReferentialReferenceSetDefinitions { .addProperty(String.class, SpeciesDto.PROPERTY_FAO_CODE) .addProperty(String.class, SpeciesDto.PROPERTY_SCIENTIFIC_LABEL) .addProperty(String.class, SpeciesDto.PROPERTY_HOME_ID) - .addProperty(String.class, SpeciesDto.PROPERTY_LENGTH_MEASURE_TYPE)), + .addProperty(String.class, SpeciesDto.PROPERTY_SIZE_MEASURE_TYPE)), SPECIES_GROUP(newDefaultDefinitionBuilder(SpeciesGroupDto.class)), diff --git a/services-dto/src/main/xmi/observe-services-dto-common.zargo b/services-dto/src/main/xmi/observe-services-dto-common.zargo index 33bb2d0..960fb61 100644 Binary files a/services-dto/src/main/xmi/observe-services-dto-common.zargo and b/services-dto/src/main/xmi/observe-services-dto-common.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 85ac2f1..1fdf7dd 100644 --- a/services-dto/src/main/xmi/observe-services-dto.ini +++ b/services-dto/src/main/xmi/observe-services-dto.ini @@ -167,6 +167,7 @@ organism.attributeGeneric = fr.ird.observe.services.dto.referential.Organism ocean.attributeGeneric = fr.ird.observe.services.dto.referential.Ocean ocean.ordered = true speciesGroup.attributeGeneric = fr.ird.observe.services.dto.referential.SpeciesGroup +sizeMeasureType.attributeGeneric = fr.ird.observe.services.dto.referential.SizeMeasureType [class fr.ird.observe.services.dto.referential.SpeciesList] species.attributeGeneric = fr.ird.observe.services.dto.referential.Species diff --git a/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-service-error-validation.xml index 78acc39..3ddc143 100644 --- a/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-service-error-validation.xml +++ b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-service-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.service.species.desactivated.sizeMeasureType</message> + </field-validator> + </field> + <field name="scientificLabel"> <!-- pas de scientificLabel renseigne --> <field-validator type="requiredstring" short-circuit="true"> 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 bb9c670..8e3de70 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 @@ -485,6 +485,7 @@ validator.service.setLongline.required.settingStartTimeStamp=Timestamp must be f validator.service.setLongline.required.totalSectionsCount=Total sections count must be filled. validator.service.setLongline.settingEndTimeStamp.before.haulingStartTimeStamp=Setting end time must be before hauling start time. validator.service.setLongline.settingStartTimeStamp.before.settingEndTimeStamp=Setting start time must be before setting end time. +validator.service.species.desactivated.sizeMeasureType=Selected size measure type is disabled. validator.service.species.desactivated.speciesGroup=Selected species group is disabled. validator.service.species.invalid.faoCode.uniqueKey=Fao code must be unique, value %s is already used. validator.service.species.invalid.homeId.uniqueKey=Home id must be unique, value %s is already used. 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 68c434b..03aca51 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 @@ -485,6 +485,7 @@ validator.service.setLongline.required.settingStartTimeStamp=Timestamp de inicio validator.service.setLongline.required.totalSectionsCount=Número de secciones vacío. validator.service.setLongline.settingEndTimeStamp.before.haulingStartTimeStamp=La hora de inicio de arrastre debe ser superior o igual a la hora de fin de calada. validator.service.setLongline.settingStartTimeStamp.before.settingEndTimeStamp=L'heure de fin de calada debe ser superior o igual a la hora de inicio de calada. +validator.service.species.desactivated.sizeMeasureType=Le type de mensuration sélectionné est désactivé. \#TODO validator.service.species.desactivated.speciesGroup=El grupo de especies seleccionado está desactivado. validator.service.species.invalid.faoCode.uniqueKey=El código debe ser único, el valor %1$s ya se ha usado. validator.service.species.invalid.homeId.uniqueKey=El código debe ser único, el valor %1$s ya se ha usado. 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 806b8eb..4fa8d22 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 @@ -485,6 +485,7 @@ validator.service.setLongline.required.settingStartTimeStamp=Horodatage de débu validator.service.setLongline.required.totalSectionsCount=Nombre de sections non renseigné. validator.service.setLongline.settingEndTimeStamp.before.haulingStartTimeStamp=L'heure de début de virage doit être supérieure ou égal à l'heure de fin de filage. validator.service.setLongline.settingStartTimeStamp.before.settingEndTimeStamp=L'heure de fin de filage doit être supérieure ou égal à l'heure de début de filage. +validator.service.species.desactivated.sizeMeasureType=Le type de mensuration sélectionné est désactivé. validator.service.species.desactivated.speciesGroup=Le groupe d'espèce sélectionnée est désactivé. validator.service.species.invalid.faoCode.uniqueKey=Le codeFAO doit être unique, la valeur %1$s est déjà utilisée. validator.service.species.invalid.homeId.uniqueKey=Le code3l doit être unique, la valeur %1$s est déjà utilisée. diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesBinder.java index 5bd8f8b..d16cf79 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesBinder.java @@ -23,11 +23,13 @@ package fr.ird.observe.services.topia.binder.referential; */ import fr.ird.observe.entities.referentiel.Ocean; +import fr.ird.observe.entities.referentiel.SizeMeasureType; import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.referentiel.SpeciesGroup; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.OceanDto; import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesGroupDto; @@ -53,7 +55,7 @@ public class SpeciesBinder extends ReferentialBinderSupport<Species, SpeciesDto> entity.setScientificLabel(dto.getScientificLabel()); entity.setHomeId(dto.getHomeId()); entity.setWormsId(dto.getWormsId()); - entity.setLengthMeasureType(dto.getLengthMeasureType()); + entity.setSizeMeasureType(toEntity(dto.getSizeMeasureType(), SizeMeasureType.class)); entity.setMinLength(dto.getMinLength()); entity.setMaxLength(dto.getMaxLength()); entity.setMinWeight(dto.getMinWeight()); @@ -73,7 +75,7 @@ public class SpeciesBinder extends ReferentialBinderSupport<Species, SpeciesDto> dto.setScientificLabel(entity.getScientificLabel()); dto.setHomeId(entity.getHomeId()); dto.setWormsId(entity.getWormsId()); - dto.setLengthMeasureType(entity.getLengthMeasureType()); + dto.setSizeMeasureType(toReferentialReference(referentialLocale, entity.getSizeMeasureType(), SizeMeasureTypeDto.class)); dto.setMinLength(entity.getMinLength()); dto.setMaxLength(entity.getMaxLength()); dto.setMinWeight(entity.getMinWeight()); @@ -90,7 +92,7 @@ public class SpeciesBinder extends ReferentialBinderSupport<Species, SpeciesDto> entity.getFaoCode(), entity.getScientificLabel(), entity.getHomeId(), - entity.getLengthMeasureType()); + entity.getSizeMeasureType() == null ? null : getLabel(referentialLocale, entity.getSizeMeasureType())); } @@ -102,7 +104,7 @@ public class SpeciesBinder extends ReferentialBinderSupport<Species, SpeciesDto> dto.getFaoCode(), dto.getScientificLabel(), dto.getHomeId(), - dto.getLengthMeasureType()); + dto.getSizeMeasureType() == null ? null : getLabel(referentialLocale, dto.getSizeMeasureType())); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.