branch feature/validation_des_donnees updated (17fa57b -> 5f14e0e)
This is an automated email from the git hooks/post-receive script. New change to branch feature/validation_des_donnees in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 17fa57b Ajoute les dépendances manquantes vers les modules de validations pour permettre la validation en mode serveur distant new 5f14e0e Corrige la validation des capteurs utilisés en ajoutant un decorateur The 1 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 5f14e0e9fa41c48f2f97fa7890592140e27fb0d4 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Tue Sep 6 17:53:05 2016 +0200 Corrige la validation des capteurs utilisés en ajoutant un decorateur fixes #8523 Summary of changes: .../swing/decoration/DecoratorService.java | 6 ++++++ .../dto/reference/DataReferenceSetDefinitions.java | 6 +++++- .../services/topia/binder/data/SensorUsedBinder.java | 19 ++++++++++++++++++- 3 files changed, 29 insertions(+), 2 deletions(-) -- 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 feature/validation_des_donnees in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 5f14e0e9fa41c48f2f97fa7890592140e27fb0d4 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Tue Sep 6 17:53:05 2016 +0200 Corrige la validation des capteurs utilisés en ajoutant un decorateur fixes #8523 --- .../swing/decoration/DecoratorService.java | 6 ++++++ .../dto/reference/DataReferenceSetDefinitions.java | 6 +++++- .../services/topia/binder/data/SensorUsedBinder.java | 19 ++++++++++++++++++- 3 files changed, 29 insertions(+), 2 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 6c56d67..7831a5a 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 @@ -43,6 +43,7 @@ import fr.ird.observe.services.dto.longline.CatchLonglineDto; import fr.ird.observe.services.dto.longline.EncounterDto; import fr.ird.observe.services.dto.longline.SectionDto; import fr.ird.observe.services.dto.longline.SectionTemplate; +import fr.ird.observe.services.dto.longline.SensorUsedDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.TdrDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; @@ -534,6 +535,11 @@ public class DecoratorService extends DecoratorProvider { "${encounterType}$s##${species}$s", " - "); + registerDataAndDataReferenceDecorator(SensorUsedDto.class, + "${sensorType/label}$s", + "${sensorType}$s"); + + // gps decorators registerObserveDecorator("activity-gps", ActivitySeineDto.class, diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java index 9d086f6..a7ca61c 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java @@ -33,6 +33,7 @@ import fr.ird.observe.services.dto.longline.BranchlineWithBasketIdDto; import fr.ird.observe.services.dto.longline.CatchLonglineDto; import fr.ird.observe.services.dto.longline.EncounterDto; import fr.ird.observe.services.dto.longline.SectionDto; +import fr.ird.observe.services.dto.longline.SensorUsedDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.TdrDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; @@ -162,7 +163,10 @@ public enum DataReferenceSetDefinitions { .addProperty(String.class, BranchlineWithBasketIdDto.PROPERTY_BASKET_ID)), TDR(newDefinitionBuilder(TdrDto.class) - .addProperty(String.class, TdrDto.PROPERTY_HOME_ID)); + .addProperty(String.class, TdrDto.PROPERTY_HOME_ID)), + + SENSOR_USED(newDefinitionBuilder(SensorUsedDto.class) + .addProperty(String.class, SensorUsedDto.PROPERTY_SENSOR_TYPE)); public static final Map<String, ReferenceSetDefinition> MAPPING = new TreeMap<>(); diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SensorUsedBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SensorUsedBinder.java index 4e1dcc3..17fafc8 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SensorUsedBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SensorUsedBinder.java @@ -26,6 +26,7 @@ import fr.ird.observe.entities.longline.SensorUsed; import fr.ird.observe.entities.referentiel.longline.SensorBrand; import fr.ird.observe.entities.referentiel.longline.SensorDataFormat; import fr.ird.observe.entities.referentiel.longline.SensorType; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.SensorUsedDto; import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; @@ -40,7 +41,7 @@ import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; public class SensorUsedBinder extends DataBinderSupport<SensorUsed, SensorUsedDto> { public SensorUsedBinder() { - super(SensorUsed.class, SensorUsedDto.class, false); + super(SensorUsed.class, SensorUsedDto.class); } @Override @@ -82,4 +83,20 @@ public class SensorUsedBinder extends DataBinderSupport<SensorUsed, SensorUsedDt dto.setSensorDataFormat(toReferentialReference(referentialLocale, entity.getSensorDataFormat(), SensorDataFormatDto.class)); } + + @Override + public DataReference<SensorUsedDto> toDataReference(ReferentialLocale referentialLocale, SensorUsed entity) { + + return toDataReference(entity, + getLabel(referentialLocale, entity.getSensorType())); + + } + + @Override + public DataReference<SensorUsedDto> toDataReference(ReferentialLocale referentialLocale, SensorUsedDto dto) { + + return toDataReference(dto, + getLabel(referentialLocale, dto.getSensorType())); + + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm