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 389f44185d7fa310bb9aeb636771e7c5b9936756 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 14:53:28 2016 +0200 Ajout du type de marée LL --- .../entities/longline/TripLonglineTopiaDao.java | 22 ++++++++++++++++------ .../dto/reference/DataReferenceSetDefinitions.java | 1 + .../topia/binder/data/TripLonglineBinder.java | 2 ++ 3 files changed, 19 insertions(+), 6 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 86f875f..ae0e43f 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 @@ -33,6 +33,8 @@ 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 fr.ird.observe.entities.referentiel.longline.TripType; +import fr.ird.observe.entities.referentiel.longline.TripTypeImpl; import org.nuiton.topia.persistence.support.TopiaSqlQuery; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import org.nuiton.util.DateUtil; @@ -251,14 +253,16 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl " t.startDate," + " t.endDate," + " pr.topiaId," + + " tt.topiaId," + " p.lastName," + " p.firstName," + " v.topiaId," + " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + - " FROM observe_longline.trip t, observe_common.person p, observe_common.vessel v, observe_common.program pr" + + " FROM observe_longline.trip t, observe_common.person p, observe_common.vessel v, observe_common.program pr, observe_longline.triptype tt" + " WHERE " + " t.program = ?" + " AND t.program = pr.topiaId" + + " AND t.tripType = tt.topiaId" + " AND t.observer = p.topiaId" + " AND t.vessel = v.topiaId" + " ORDER BY t.endDate"; @@ -275,14 +279,16 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl " t.startDate," + " t.endDate," + " pr.topiaId," + + " tt.topiaId," + " p.lastName," + " p.firstName," + " v.topiaId," + " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + - " FROM observe_longline.trip t, observe_common.person p, observe_common.vessel v, observe_common.program pr" + + " FROM observe_longline.trip t, observe_common.person p, observe_common.vessel v, observe_common.program pr, observe_longline.triptype tt" + " WHERE " + " t.topiaId = ?" + " AND t.program = pr.topiaId" + + " AND t.tripType = tt.topiaId" + " AND t.observer = p.topiaId" + " AND t.vessel = v.topiaId" + " ORDER BY t.endDate"; @@ -311,17 +317,21 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl program.setTopiaId(set.getString(4)); trip.setProgram(program); - String observerLastName = set.getString(5); - String observerFirstName = set.getString(6); + TripType tripType = new TripTypeImpl(); + tripType.setTopiaId(set.getString(5)); + trip.setTripType(tripType); + + String observerLastName = set.getString(6); + String observerFirstName = set.getString(7); Person observer = new PersonImpl(); observer.setFirstName(observerFirstName); observer.setLastName(observerLastName); trip.setObserver(observer); Vessel vessel = new VesselImpl(); - String vesselId = set.getString(7); + String vesselId = set.getString(8); vessel.setTopiaId(vesselId); - String label = set.getString(8); + String label = set.getString(9); 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 48a19a0..6bd788d 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 @@ -128,6 +128,7 @@ public enum DataReferenceSetDefinitions { .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_TRIP_TYPE + "Id") .addProperty(String.class, TripLonglineDto.PROPERTY_VESSEL) .addProperty(String.class, TripLonglineDto.PROPERTY_OBSERVER)), 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 7e216da..8fa58ec 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 @@ -104,6 +104,7 @@ public class TripLonglineBinder extends DataBinderSupport<TripLongline, TripLong entity.getStartDate(), entity.getEndDate(), entity.getProgram().getTopiaId(), + entity.getTripType().getTopiaId(), getLabel(referentialLocale, entity.getVessel()), entity.getObserverLabel()); @@ -116,6 +117,7 @@ public class TripLonglineBinder extends DataBinderSupport<TripLongline, TripLong dto.getStartDate(), dto.getEndDate(), dto.getProgram().getId(), + dto.getTripType().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>.