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 65687342106a7d0141330798db833484c6b53c3b Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 17:50:12 2016 +0200 Remonté du nombre de routes par marée --- .../ird/observe/entities/seine/TripSeineImpl.java | 10 ++++++++++ .../observe/entities/seine/TripSeineTopiaDao.java | 10 +++++++--- entities/src/main/xmi/observe-seine.zargo | Bin 83234 -> 83418 bytes .../dto/reference/DataReferenceSetDefinitions.java | 1 + .../src/main/xmi/observe-services-dto-seine.zargo | Bin 59520 -> 59611 bytes .../services/topia/binder/data/TripSeineBinder.java | 2 ++ .../topia/service/seine/TripSeineServiceTopia.java | 9 +++++---- 7 files changed, 25 insertions(+), 7 deletions(-) diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/TripSeineImpl.java b/entities/src/main/java/fr/ird/observe/entities/seine/TripSeineImpl.java index c1984ba..064a66d 100644 --- a/entities/src/main/java/fr/ird/observe/entities/seine/TripSeineImpl.java +++ b/entities/src/main/java/fr/ird/observe/entities/seine/TripSeineImpl.java @@ -28,10 +28,20 @@ package fr.ird.observe.entities.seine; public class TripSeineImpl extends TripSeineAbstract { private static final long serialVersionUID = 1L; + private int routeCount; @Override public String getObserverLabel() { return observer == null ? "" : observer.getLastName() + " " + observer.getFirstName(); } + @Override + public int getRouteCount() { + return routeCount; + } + + @Override + public void setRouteCount(int routeCount) { + this.routeCount = routeCount; + } } 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 114fc08..b6df52e 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 @@ -196,7 +196,8 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { " p.lastName," + " p.firstName," + " v.topiaId, " + - " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + + " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + "," + + " select count(*) from observe_seine.route r where r.trip = t.topiaId" + " FROM observe_seine.trip t, observe_common.person p, observe_common.vessel v,observe_common.program pr " + " WHERE " + " t.program = ?" + @@ -220,7 +221,8 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { " p.lastName," + " p.firstName," + " v.topiaId," + - " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + + " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + "," + + " select count(*) from observe_seine.route r where r.trip = t.topiaId" + " FROM observe_seine.trip t, observe_common.person p, observe_common.vessel v, observe_common.program pr" + " WHERE " + " t.topiaId = ?" + @@ -250,7 +252,7 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { @Override public TripSeine prepareResult(ResultSet set) throws SQLException { - TripSeine trip = new TripSeineImpl(); + TripSeineImpl trip = new TripSeineImpl(); trip.setTopiaId(set.getString(1)); trip.setStartDate(set.getDate(2)); @@ -273,6 +275,8 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { String label = set.getString(8); I18nReferenceEntities.setLabel(referenceLocale, vessel, label); trip.setVessel(vessel); + trip.setRouteCount(set.getInt(9)); + return trip; diff --git a/entities/src/main/xmi/observe-seine.zargo b/entities/src/main/xmi/observe-seine.zargo index 5fddab0..1184998 100644 Binary files a/entities/src/main/xmi/observe-seine.zargo and b/entities/src/main/xmi/observe-seine.zargo differ 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 1960c2e..4b29461 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 @@ -70,6 +70,7 @@ public enum DataReferenceSetDefinitions { .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_ROUTE_COUNT) .addProperty(String.class, TripSeineDto.PROPERTY_VESSEL) .addProperty(String.class, TripSeineDto.PROPERTY_OBSERVER)), 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 cc6e08c..d40705f 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-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 aad134c..232c670 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 @@ -105,6 +105,7 @@ public class TripSeineBinder extends DataBinderSupport<TripSeine, TripSeineDto> entity.getStartDate(), entity.getEndDate(), entity.getProgram().getTopiaId(), + entity.getRouteCount(), getLabel(referentialLocale, entity.getVessel()), entity.getObserverLabel()); @@ -117,6 +118,7 @@ public class TripSeineBinder extends DataBinderSupport<TripSeine, TripSeineDto> dto.getStartDate(), dto.getEndDate(), dto.getProgram().getId(), + dto.getRouteCount(), getLabel(referentialLocale, dto.getVessel()), PersonHelper.getNames(dto.getObserver())); diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TripSeineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TripSeineServiceTopia.java index 5d78fc5..bf77b50 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TripSeineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/TripSeineServiceTopia.java @@ -32,9 +32,6 @@ import fr.ird.observe.entities.referentiel.Species2; import fr.ird.observe.entities.referentiel.SpeciesList; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.entities.seine.TripSeineTopiaDao; -import fr.ird.observe.services.service.seine.TripSeineService; -import fr.ird.observe.services.topia.ObserveServiceTopia; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.Form; @@ -47,6 +44,9 @@ import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.TripSeineDto; +import fr.ird.observe.services.service.seine.TripSeineService; +import fr.ird.observe.services.topia.ObserveServiceTopia; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.topia.entity.TripMapDtoFactory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -77,6 +77,7 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe List<TripSeine> tripSeines = loadEntities(TripSeine.class); + tripSeines.forEach(t -> t.setRouteCount(t.sizeRoute())); return toDataReferenceSet(TripSeineDto.class, tripSeines); } @@ -157,7 +158,7 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe } TripSeine tripSeine = loadEntity(TripSeineDto.class, tripSeineId); - + tripSeine.setRouteCount(tripSeine.sizeRoute()); return toReference(tripSeine); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.