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 7640d6fc078b62b64f44d2b517843d4ee715a268 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 16:11:06 2016 +0200 Onb remonte le programme dans les marées sur les stubs --- .../entities/longline/TripLonglineTopiaDao.java | 22 ++++++++++++++++------ .../observe/entities/seine/TripSeineTopiaDao.java | 22 ++++++++++++++++------ .../dto/reference/DataReferenceSetDefinitions.java | 18 ++++++++++-------- .../topia/binder/data/TripLonglineBinder.java | 2 ++ .../topia/binder/data/TripSeineBinder.java | 2 ++ 5 files changed, 46 insertions(+), 20 deletions(-) diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java b/entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java index 5e04ca8..86f875f 100644 --- a/entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java +++ b/entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java @@ -29,6 +29,8 @@ import fr.ird.observe.entities.referentiel.Harbour; import fr.ird.observe.entities.referentiel.I18nReferenceEntities; import fr.ird.observe.entities.referentiel.Person; import fr.ird.observe.entities.referentiel.PersonImpl; +import fr.ird.observe.entities.referentiel.Program; +import fr.ird.observe.entities.referentiel.ProgramImpl; import fr.ird.observe.entities.referentiel.Vessel; import fr.ird.observe.entities.referentiel.VesselImpl; import org.nuiton.topia.persistence.support.TopiaSqlQuery; @@ -248,13 +250,15 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl " t.topiaId," + " t.startDate," + " t.endDate," + + " pr.topiaId," + " p.lastName," + " p.firstName," + " v.topiaId," + " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + - " FROM observe_longline.trip t, observe_common.person p, observe_common.vessel v" + + " FROM observe_longline.trip t, observe_common.person p, observe_common.vessel v, observe_common.program pr" + " WHERE " + " t.program = ?" + + " AND t.program = pr.topiaId" + " AND t.observer = p.topiaId" + " AND t.vessel = v.topiaId" + " ORDER BY t.endDate"; @@ -270,13 +274,15 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl " t.topiaId," + " t.startDate," + " t.endDate," + + " pr.topiaId," + " p.lastName," + " p.firstName," + " v.topiaId," + " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + - " FROM observe_longline.trip t, observe_common.person p, observe_common.vessel v" + + " FROM observe_longline.trip t, observe_common.person p, observe_common.vessel v, observe_common.program pr" + " WHERE " + " t.topiaId = ?" + + " AND t.program = pr.topiaId" + " AND t.observer = p.topiaId" + " AND t.vessel = v.topiaId" + " ORDER BY t.endDate"; @@ -301,17 +307,21 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl trip.setStartDate(set.getTimestamp(2)); trip.setEndDate(set.getTimestamp(3)); - String observerLastName = set.getString(4); - String observerFirstName = set.getString(5); + Program program = new ProgramImpl(); + program.setTopiaId(set.getString(4)); + trip.setProgram(program); + + String observerLastName = set.getString(5); + String observerFirstName = set.getString(6); Person observer = new PersonImpl(); observer.setFirstName(observerFirstName); observer.setLastName(observerLastName); trip.setObserver(observer); Vessel vessel = new VesselImpl(); - String vesselId = set.getString(6); + String vesselId = set.getString(7); vessel.setTopiaId(vesselId); - String label = set.getString(7); + String label = set.getString(8); I18nReferenceEntities.setLabel(referenceLocale, vessel, label); trip.setVessel(vessel); diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java b/entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java index 8299e27..114fc08 100644 --- a/entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java +++ b/entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java @@ -28,6 +28,8 @@ import fr.ird.observe.entities.referentiel.Harbour; import fr.ird.observe.entities.referentiel.I18nReferenceEntities; import fr.ird.observe.entities.referentiel.Person; import fr.ird.observe.entities.referentiel.PersonImpl; +import fr.ird.observe.entities.referentiel.Program; +import fr.ird.observe.entities.referentiel.ProgramImpl; import fr.ird.observe.entities.referentiel.Vessel; import fr.ird.observe.entities.referentiel.VesselImpl; import org.nuiton.topia.persistence.support.TopiaSqlQuery; @@ -190,13 +192,15 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { " t.topiaId," + " t.startDate," + " t.endDate," + + " pr.topiaId," + " p.lastName," + " p.firstName," + " v.topiaId, " + " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + - " FROM observe_seine.trip t, observe_common.person p, observe_common.vessel v" + + " FROM observe_seine.trip t, observe_common.person p, observe_common.vessel v,observe_common.program pr " + " WHERE " + " t.program = ?" + + " AND t.program = pr.topiaId" + " AND t.observer = p.topiaId" + " AND t.vessel = v.topiaId" + " ORDER BY t.endDate"; @@ -212,13 +216,15 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { " t.topiaId," + " t.startDate," + " t.endDate," + + " pr.topiaId," + " p.lastName," + " p.firstName," + " v.topiaId," + " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + - " FROM observe_seine.trip t, observe_common.person p, observe_common.vessel v" + + " FROM observe_seine.trip t, observe_common.person p, observe_common.vessel v, observe_common.program pr" + " WHERE " + " t.topiaId = ?" + + " AND t.program = pr.topiaId" + " AND t.observer = p.topiaId" + " AND t.vessel = v.topiaId" + " ORDER BY t.endDate"; @@ -250,17 +256,21 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { trip.setStartDate(set.getDate(2)); trip.setEndDate(set.getDate(3)); - String observerLastName = set.getString(4); - String observerFirstName = set.getString(5); + Program program = new ProgramImpl(); + program.setTopiaId(set.getString(4)); + trip.setProgram(program); + + String observerLastName = set.getString(5); + String observerFirstName = set.getString(6); Person observer = new PersonImpl(); observer.setFirstName(observerFirstName); observer.setLastName(observerLastName); trip.setObserver(observer); Vessel vessel = new VesselImpl(); - String vesselId = set.getString(6); + String vesselId = set.getString(7); vessel.setTopiaId(vesselId); - String label = set.getString(7); + String label = set.getString(8); I18nReferenceEntities.setLabel(referenceLocale, vessel, label); trip.setVessel(vessel); 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 3a336e1..1960c2e 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 @@ -69,6 +69,7 @@ public enum DataReferenceSetDefinitions { TRIP_SEINE(newDefinitionBuilder(TripSeineDto.class) .addProperty(Date.class, TripSeineDto.PROPERTY_START_DATE) .addProperty(Date.class, TripSeineDto.PROPERTY_END_DATE) + .addProperty(String.class, TripSeineDto.PROPERTY_PROGRAM + "Id") .addProperty(String.class, TripSeineDto.PROPERTY_VESSEL) .addProperty(String.class, TripSeineDto.PROPERTY_OBSERVER)), @@ -125,6 +126,7 @@ public enum DataReferenceSetDefinitions { TRIP_LONGLINE(newDefinitionBuilder(TripLonglineDto.class) .addProperty(Date.class, TripLonglineDto.PROPERTY_START_DATE) .addProperty(Date.class, TripLonglineDto.PROPERTY_END_DATE) + .addProperty(String.class, TripLonglineDto.PROPERTY_PROGRAM + "Id") .addProperty(String.class, TripLonglineDto.PROPERTY_VESSEL) .addProperty(String.class, TripLonglineDto.PROPERTY_OBSERVER)), @@ -154,20 +156,20 @@ public enum DataReferenceSetDefinitions { .addProperty(Integer.class, BranchlineDto.PROPERTY_SETTING_IDENTIFIER)), BASKET_WITH_SECTION(newDefinitionBuilder(BasketWithSectionIdDto.class) - .addProperty(Integer.class, BasketWithSectionIdDto.PROPERTY_HAULING_IDENTIFIER) - .addProperty(Integer.class, BasketWithSectionIdDto.PROPERTY_SETTING_IDENTIFIER) - .addProperty(String.class, BasketWithSectionIdDto.PROPERTY_SECTION_ID)), + .addProperty(Integer.class, BasketWithSectionIdDto.PROPERTY_HAULING_IDENTIFIER) + .addProperty(Integer.class, BasketWithSectionIdDto.PROPERTY_SETTING_IDENTIFIER) + .addProperty(String.class, BasketWithSectionIdDto.PROPERTY_SECTION_ID)), BRANCHLINE_WITH_BASKET(newDefinitionBuilder(BranchlineWithBasketIdDto.class) - .addProperty(Integer.class, BranchlineWithBasketIdDto.PROPERTY_HAULING_IDENTIFIER) - .addProperty(Integer.class, BranchlineWithBasketIdDto.PROPERTY_SETTING_IDENTIFIER) - .addProperty(String.class, BranchlineWithBasketIdDto.PROPERTY_BASKET_ID)), + .addProperty(Integer.class, BranchlineWithBasketIdDto.PROPERTY_HAULING_IDENTIFIER) + .addProperty(Integer.class, BranchlineWithBasketIdDto.PROPERTY_SETTING_IDENTIFIER) + .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)); + .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/TripLonglineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineBinder.java index a69e022..7e216da 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineBinder.java @@ -103,6 +103,7 @@ public class TripLonglineBinder extends DataBinderSupport<TripLongline, TripLong return toDataReference(entity, entity.getStartDate(), entity.getEndDate(), + entity.getProgram().getTopiaId(), getLabel(referentialLocale, entity.getVessel()), entity.getObserverLabel()); @@ -114,6 +115,7 @@ public class TripLonglineBinder extends DataBinderSupport<TripLongline, TripLong return toDataReference(dto, dto.getStartDate(), dto.getEndDate(), + dto.getProgram().getId(), getLabel(referentialLocale, dto.getVessel()), PersonHelper.getNames(dto.getObserver())); diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineBinder.java index b861ce6..aad134c 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineBinder.java @@ -104,6 +104,7 @@ public class TripSeineBinder extends DataBinderSupport<TripSeine, TripSeineDto> return toDataReference(entity, entity.getStartDate(), entity.getEndDate(), + entity.getProgram().getTopiaId(), getLabel(referentialLocale, entity.getVessel()), entity.getObserverLabel()); @@ -115,6 +116,7 @@ public class TripSeineBinder extends DataBinderSupport<TripSeine, TripSeineDto> return toDataReference(dto, dto.getStartDate(), dto.getEndDate(), + dto.getProgram().getId(), getLabel(referentialLocale, dto.getVessel()), PersonHelper.getNames(dto.getObserver())); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.