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 d4ee7172fe78d39e64bc6e4677a876eb223a90eb Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 25 15:14:49 2016 +0200 Remontée des identifiants de type d'activité --- .../fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java | 6 +++++- .../java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java | 6 +++++- .../observe/services/dto/reference/DataReferenceSetDefinitions.java | 2 ++ .../observe/services/topia/binder/data/ActivityLonglineBinder.java | 2 ++ .../ird/observe/services/topia/binder/data/ActivitySeineBinder.java | 2 ++ 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java b/entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java index 9245799..b8773f0 100644 --- a/entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java +++ b/entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java @@ -63,6 +63,7 @@ public class ActivityLonglineTopiaDao extends AbstractActivityLonglineTopiaDao<A " a.timestamp," + // " a.open," + " a.set," + + " va.topiaId," + " va." + I18nReferenceEntities.getPropertyName(referenceLocale) + " FROM observe_longline.activity a, observe_longline.vesselactivity va" + " WHERE " + @@ -82,6 +83,7 @@ public class ActivityLonglineTopiaDao extends AbstractActivityLonglineTopiaDao<A " a.timestamp," + // " a.open," + " a.set," + + " va.topiaId," + " va." + I18nReferenceEntities.getPropertyName(referenceLocale) + " FROM observe_longline.activity a, observe_longline.vesselactivity va" + " WHERE " + @@ -124,7 +126,9 @@ public class ActivityLonglineTopiaDao extends AbstractActivityLonglineTopiaDao<A } VesselActivityLongline vesselActivity = new VesselActivityLonglineImpl(); - String label = set.getString(4); + String vesselActivityId = set.getString(4); + vesselActivity.setTopiaId(vesselActivityId); + String label = set.getString(5); I18nReferenceEntities.setLabel(referenceLocale,vesselActivity, label); activity.setVesselActivityLongline(vesselActivity); diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java b/entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java index 1bf95ba..972b41e 100644 --- a/entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java +++ b/entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java @@ -62,6 +62,7 @@ public class ActivitySeineTopiaDao extends AbstractActivitySeineTopiaDao<Activit " a.topiaId," + " a.time," + " a.set," + + " va.topiaId," + " va." + I18nReferenceEntities.getPropertyName(referenceLocale) + " FROM observe_seine.activity a, observe_seine.vesselactivity va" + " WHERE " + @@ -80,6 +81,7 @@ public class ActivitySeineTopiaDao extends AbstractActivitySeineTopiaDao<Activit " a.topiaId," + " a.time," + " a.set," + + " va.topiaId," + " va." + I18nReferenceEntities.getPropertyName(referenceLocale) + " FROM observe_seine.activity a, observe_seine.vesselactivity va" + " WHERE " + @@ -122,7 +124,9 @@ public class ActivitySeineTopiaDao extends AbstractActivitySeineTopiaDao<Activit } VesselActivitySeine vesselActivity = new VesselActivitySeineImpl(); - String label = set.getString(4); + String vesselActivityId = set.getString(4); + vesselActivity.setTopiaId(vesselActivityId); + String label = set.getString(5); I18nReferenceEntities.setLabel(referenceLocale, vesselActivity, label); activity.setVesselActivitySeine(vesselActivity); 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 023560c..3a336e1 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 @@ -97,6 +97,7 @@ public enum DataReferenceSetDefinitions { ACTIVITY_SEINE(newDefinitionBuilder(ActivitySeineDto.class) .addProperty(Date.class, ActivitySeineDto.PROPERTY_TIME) + .addProperty(String.class, ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE + "Id") .addProperty(String.class, ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE) .addProperty(DataReference.class, ActivitySeineDto.PROPERTY_SET_SEINE) ), @@ -129,6 +130,7 @@ public enum DataReferenceSetDefinitions { ACTIVITY_LONGLINE(newDefinitionBuilder(ActivityLonglineDto.class) .addProperty(Date.class, ActivityLonglineDto.PROPERTY_TIME_STAMP) + .addProperty(String.class, ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE + "Id") .addProperty(String.class, ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE) .addProperty(DataReference.class, ActivityLonglineDto.PROPERTY_SET_LONGLINE) ), diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineBinder.java index 1ec3b38..88ff856 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineBinder.java @@ -77,6 +77,7 @@ public class ActivityLonglineBinder extends DataBinderSupport<ActivityLongline, return toDataReference(entity, entity.getTimeStamp(), + entity.getVesselActivityLongline().getTopiaId(), getLabel(referentialLocale, entity.getVesselActivityLongline()), toDataReference(referentialLocale, entity.getSetLongline(), SetLonglineDto.class)); @@ -87,6 +88,7 @@ public class ActivityLonglineBinder extends DataBinderSupport<ActivityLongline, return toDataReference(dto, dto.getTimeStamp(), + dto.getVesselActivityLongline().getId(), getLabel(referentialLocale, dto.getVesselActivityLongline()), dto.getSetLongline()); } 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 0e7fcee..9be6227 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 @@ -105,6 +105,7 @@ public class ActivitySeineBinder extends DataBinderSupport<ActivitySeine, Activi return toDataReference(entity, entity.getTime(), + entity.getVesselActivitySeine().getTopiaId(), getLabel(referentialLocale, entity.getVesselActivitySeine()), toDataReference(referentialLocale, entity.getSetSeine(), SetSeineDto.class)); @@ -115,6 +116,7 @@ public class ActivitySeineBinder extends DataBinderSupport<ActivitySeine, Activi return toDataReference(dto, dto.getTime(), + dto.getVesselActivitySeine().getId(), getLabel(referentialLocale, dto.getVesselActivitySeine()), dto.getSetSeine()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.