This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 83e27fcbced876ae0bb7e22363349220dc5b11a5 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Oct 7 09:17:06 2015 +0200 créer une methode de service pour recupérer la position d'une marée seine dans un programe (refs #7587). --- .../ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java | 7 +------ .../web/controller/v1/seine/TripSeineServiceController.java | 5 +++++ .../fr/ird/observe/services/service/seine/TripSeineService.java | 6 ++++-- .../ird/observe/services/service/seine/TripSeineServiceTopia.java | 6 ++++++ 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java index c98d327..83de93e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java @@ -21,14 +21,11 @@ */ package fr.ird.observe.ui.content.open.impl.seine; -import com.google.common.collect.Iterables; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.IdDtos; -import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.SaveResultDto; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.seine.TripSeineDto; @@ -284,9 +281,7 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> { protected int getOpenablePosition(String parentId, TripSeineDto bean) { - ReferenceSetDto<TripSeineDto> tripSeineByProgram = getTripSeineService().getTripSeineByProgram(parentId); - - int position = Iterables.indexOf(tripSeineByProgram.getReference(), IdDtos.newIdPredicate(bean.getId())); + int position = getTripSeineService().getTripSeinePositionInProgram(parentId, bean.getId()); return position; } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java index 29cc65e..53a1760 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java @@ -45,6 +45,11 @@ public class TripSeineServiceController extends ObserveAuthenticatedServiceContr } @Override + public int getTripSeinePositionInProgram(String programId, String tripSeineId) { + return service.getTripSeinePositionInProgram(programId, tripSeineId); + } + + @Override public TripMapDto getTripSeineMap(String tripSeineId) { return service.getTripSeineMap(tripSeineId); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java index 632a71b..7dbf404 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java @@ -43,6 +43,9 @@ public interface TripSeineService extends ObserveService { ReferenceSetDto<TripSeineDto> getTripSeineByProgram(String programId); @ReadDataPermission + int getTripSeinePositionInProgram(String programId, String tripSeineId); + + @ReadDataPermission TripMapDto getTripSeineMap(String tripSeineId); @ReadDataPermission @@ -63,5 +66,4 @@ public interface TripSeineService extends ObserveService { @WriteDataPermission @DeleteRequest void delete(String tripSeineId); - - } \ No newline at end of file +} \ No newline at end of file diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java index 2c789dd..9682918 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java @@ -91,6 +91,12 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe } @Override + public int getTripSeinePositionInProgram(String programId, String tripSeineId) { + int position = getDao().findPositionByProgramId(programId, tripSeineId); + return position; + } + + @Override public TripMapDto getTripSeineMap(String tripSeineId) { LinkedHashSet<TripMapPointDto> points = getDao().extractTripMapActivityPoints(tripSeineId); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.