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 b0b3fde4469f9609326e19680372ed566624eb9b Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 21:40:14 2016 +0200 Ajout des systèmes observés sur le dto ActivitySeine --- .../request/ReferenceSetRequestDefinitions.java | 3 ++- .../src/main/xmi/observe-services-dto-seine.zargo | Bin 59611 -> 59777 bytes services-dto/src/main/xmi/observe-services-dto.ini | 1 + .../topia/binder/data/ActivitySeineBinder.java | 4 ++++ .../service/seine/ActivitySeineServiceTopia.java | 2 -- 5 files changed, 7 insertions(+), 3 deletions(-) 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 b68ded4..820af5e 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 @@ -311,7 +311,8 @@ public enum ReferenceSetRequestDefinitions { .addKey(ActivitySeineDto.PROPERTY_REASON_FOR_NO_FISHING, REASON_FOR_NO_FISHING) .addKey(ActivitySeineDto.PROPERTY_PREVIOUS_FPA_ZONE, FPA_ZONE) .addKey(ActivitySeineDto.PROPERTY_CURRENT_FPA_ZONE, FPA_ZONE) - .addKey(ActivitySeineDto.PROPERTY_NEXT_FPA_ZONE, FPA_ZONE)), + .addKey(ActivitySeineDto.PROPERTY_NEXT_FPA_ZONE, FPA_ZONE) + .addKey(ActivitySeineDto.PROPERTY_OBSERVED_SYSTEM, OBSERVED_SYSTEM)), ACTIVITY_SEINE_OBSERVED_SYSTEM_FORM( newBuilder(ActivitySeineObservedSystemDto.class) 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 d40705f..8c10b27 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 4c2a453..52b494f 100644 --- a/services-dto/src/main/xmi/observe-services-dto.ini +++ b/services-dto/src/main/xmi/observe-services-dto.ini @@ -183,6 +183,7 @@ species.attributeGeneric = fr.ird.observe.services.dto.referential.Species currentFpaZone.attributeGeneric = fr.ird.observe.services.dto.referential.FpaZoneDto detectionMode.attributeGeneric = fr.ird.observe.services.dto.referential.seine.DetectionModeDto nextFpaZone.attributeGeneric = fr.ird.observe.services.dto.referential.FpaZoneDto +observedSystem.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ObservedSystemDto previousFpaZone.attributeGeneric = fr.ird.observe.services.dto.referential.FpaZoneDto reasonForNoFishing.attributeGeneric = fr.ird.observe.services.dto.referential.seine.ReasonForNoFishingDto setSeine.attributeGeneric = fr.ird.observe.services.dto.seine.SetSeineDto diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineBinder.java index 9be6227..8629b6f 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineBinder.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.topia.binder.data; import fr.ird.observe.entities.referentiel.FpaZone; import fr.ird.observe.entities.referentiel.seine.DetectionMode; +import fr.ird.observe.entities.referentiel.seine.ObservedSystem; import fr.ird.observe.entities.referentiel.seine.ReasonForNoFishing; import fr.ird.observe.entities.referentiel.seine.SurroundingActivity; import fr.ird.observe.entities.referentiel.seine.VesselActivitySeine; @@ -33,6 +34,7 @@ import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.FpaZoneDto; import fr.ird.observe.services.dto.referential.seine.DetectionModeDto; +import fr.ird.observe.services.dto.referential.seine.ObservedSystemDto; import fr.ird.observe.services.dto.referential.seine.ReasonForNoFishingDto; import fr.ird.observe.services.dto.referential.seine.SurroundingActivityDto; import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; @@ -71,6 +73,7 @@ public class ActivitySeineBinder extends DataBinderSupport<ActivitySeine, Activi entity.setCurrentFpaZone(toEntity(dto.getCurrentFpaZone(), FpaZone.class)); entity.setPreviousFpaZone(toEntity(dto.getPreviousFpaZone(), FpaZone.class)); entity.setNextFpaZone(toEntity(dto.getNextFpaZone(), FpaZone.class)); + entity.setObservedSystem(toEntitySet(dto.getObservedSystem(), ObservedSystem.class)); } @@ -97,6 +100,7 @@ public class ActivitySeineBinder extends DataBinderSupport<ActivitySeine, Activi dto.setPreviousFpaZone(toReferentialReference(referentialLocale, entity.getPreviousFpaZone(), FpaZoneDto.class)); dto.setNextFpaZone(toReferentialReference(referentialLocale, entity.getNextFpaZone(), FpaZoneDto.class)); dto.setSetSeine(toDataReference(referentialLocale, entity.getSetSeine(), SetSeineDto.class)); + dto.setObservedSystem(toReferentialReferenceList(referentialLocale, entity.getObservedSystem(), ObservedSystemDto.class)); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ActivitySeineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ActivitySeineServiceTopia.java index 41b6433..959914d 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ActivitySeineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ActivitySeineServiceTopia.java @@ -127,7 +127,6 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac activitySeine, ReferenceSetRequestDefinitions.ACTIVITY_SEINE_FORM); - form.getObject().setObservedSystemEmpty(activitySeine.isObservedSystemEmpty()); form.getObject().setFloatingObjectEmpty(activitySeine.isFloatingObjectEmpty()); return form; @@ -175,7 +174,6 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac preCreated, ReferenceSetRequestDefinitions.ACTIVITY_SEINE_FORM); - form.getObject().setObservedSystemEmpty(preCreated.isObservedSystemEmpty()); form.getObject().setFloatingObjectEmpty(preCreated.isFloatingObjectEmpty()); return form; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.