branch feature/7609-VerifEcranFauneAccesoire created (now 19d437d)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7609-VerifEcranFauneAccesoire in repository tutti. See http://git.codelutin.com/tutti.git at 19d437d Ajouter du filtre sur les espèces (see #7609). This branch includes the following new commits: new 32cbe03 suppression d'un paramêtre inutil (see #7609). new 8b3648f Ajout de trace dans les appels des services (see #7609). new 19d437d Ajouter du filtre sur les espèces (see #7609). The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 19d437da321e097466b86e850908cb9b9e539875 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Mar 9 14:03:43 2016 +0100 Ajouter du filtre sur les espèces (see #7609). commit 32cbe039c62ad17f5a1854cd742392d82a8f464c Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Mar 9 11:06:31 2016 +0100 suppression d'un paramêtre inutil (see #7609). commit 8b3648fc63ece65cceacb1a99928882315a35bc2 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Mar 9 11:08:44 2016 +0100 Ajout de trace dans les appels des services (see #7609). -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7609-VerifEcranFauneAccesoire in repository tutti. See http://git.codelutin.com/tutti.git commit 32cbe039c62ad17f5a1854cd742392d82a8f464c Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Mar 9 11:06:31 2016 +0100 suppression d'un paramêtre inutil (see #7609). --- .../ui/content/table/impl/seine/NonTargetCatchUIHandler.java | 3 +-- .../web/controller/v1/seine/NonTargetCatchServiceController.java | 4 ++-- .../ird/observe/services/service/seine/NonTargetCatchService.java | 2 +- .../observe/services/service/seine/NonTargetCatchServiceTopia.java | 7 +------ 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java index e99beac..96042ff 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java @@ -369,8 +369,7 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa @Override protected void loadEditBean(String beanId) { - String tripSeineId = getDataContext().getSelectedTripSeineId(); - Form<SetSeineNonTargetCatchDto> form = getNonTargetCatchService().loadForm(beanId, tripSeineId); + Form<SetSeineNonTargetCatchDto> form = getNonTargetCatchService().loadForm(beanId); loadReferentialReferenceSetsInModel(form); getModel().setForm(form); SetSeineNonTargetCatchDtos.copySetSeineNonTargetCatchDto(form.getObject(), getBean()); diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetCatchServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetCatchServiceController.java index cd82162..09ea8ac 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetCatchServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetCatchServiceController.java @@ -38,8 +38,8 @@ public class NonTargetCatchServiceController extends ObserveAuthenticatedService } @Override - public Form<SetSeineNonTargetCatchDto> loadForm(String setSeineId, String tripSeineId) { - return service.loadForm(setSeineId, tripSeineId); + public Form<SetSeineNonTargetCatchDto> loadForm(String setSeineId) { + return service.loadForm(setSeineId); } @Override diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchService.java index df1b67b..86c7553 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchService.java @@ -37,7 +37,7 @@ import fr.ird.observe.services.spi.WriteDataPermission; public interface NonTargetCatchService extends ObserveService { @ReadDataPermission - Form<SetSeineNonTargetCatchDto> loadForm(String setSeineId, String tripSeineId); + Form<SetSeineNonTargetCatchDto> loadForm(String setSeineId); @Write @WriteDataPermission diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java index 57b91b1..8193f2f 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java @@ -50,19 +50,14 @@ import java.util.Set; public class NonTargetCatchServiceTopia extends ObserveServiceTopia implements NonTargetCatchService { @Override - public Form<SetSeineNonTargetCatchDto> loadForm(String setSeineId, String tripSeineId) { + public Form<SetSeineNonTargetCatchDto> loadForm(String setSeineId) { SetSeine setSeine = loadEntity(SetSeineNonTargetCatchDto.class, setSeineId); - TripSeine tripSeine = loadEntity(TripSeineDto.class, tripSeineId); - - Ocean ocean = tripSeine.getOcean(); - Form<SetSeineNonTargetCatchDto> form = dataEntityToForm( SetSeineNonTargetCatchDto.class, setSeine, ReferenceSetRequestDefinitions.SET_SEINE_FORM - //ImmutableMap.<String, Object>of(Species.PROPERTY_OCEAN, ocean), //FIXME context ); SetSeineNonTargetCatchDto setSeineNonTargetCatchDto = form.getObject(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7609-VerifEcranFauneAccesoire in repository tutti. See http://git.codelutin.com/tutti.git commit 8b3648fc63ece65cceacb1a99928882315a35bc2 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Mar 9 11:08:44 2016 +0100 Ajout de trace dans les appels des services (see #7609). --- .../services/service/seine/NonTargetCatchServiceTopia.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java index 8193f2f..baaa3c8 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java @@ -24,7 +24,6 @@ package fr.ird.observe.services.service.seine; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; -import fr.ird.observe.entities.referentiel.Ocean; import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.seine.NonTargetCatch; import fr.ird.observe.entities.seine.NonTargetCatchs; @@ -32,14 +31,14 @@ import fr.ird.observe.entities.seine.NonTargetLenghts; import fr.ird.observe.entities.seine.NonTargetLength; import fr.ird.observe.entities.seine.NonTargetSample; import fr.ird.observe.entities.seine.SetSeine; -import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.NonTargetCatchDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto; -import fr.ird.observe.services.dto.seine.TripSeineDto; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaEntities; import java.util.Set; @@ -49,8 +48,13 @@ import java.util.Set; */ public class NonTargetCatchServiceTopia extends ObserveServiceTopia implements NonTargetCatchService { + private static final Log log = LogFactory.getLog(NonTargetCatchServiceTopia.class); + @Override public Form<SetSeineNonTargetCatchDto> loadForm(String setSeineId) { + if (log.isTraceEnabled()) { + log.trace("loadForm(" + setSeineId + ")"); + } SetSeine setSeine = loadEntity(SetSeineNonTargetCatchDto.class, setSeineId); @@ -90,6 +94,9 @@ public class NonTargetCatchServiceTopia extends ObserveServiceTopia implements N @Override public SaveResultDto save(SetSeineNonTargetCatchDto dto) { + if (log.isTraceEnabled()) { + log.trace("save(" + dto.getId() + ")"); + } SetSeine entity = loadOrCreateEntityAndCheckLastUpdate(dto); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7609-VerifEcranFauneAccesoire in repository tutti. See http://git.codelutin.com/tutti.git commit 19d437da321e097466b86e850908cb9b9e539875 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Mar 9 14:03:43 2016 +0100 Ajouter du filtre sur les espèces (see #7609). --- .../table/impl/seine/NonTargetCatchUIHandler.java | 35 ++++++++++++++++++++++ .../service/seine/NonTargetCatchServiceTopia.java | 2 +- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java index 96042ff..9cb5098 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java @@ -28,7 +28,9 @@ import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource; +import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialReferences; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto; import fr.ird.observe.services.dto.referential.seine.SpeciesFateDto; @@ -38,6 +40,7 @@ import fr.ird.observe.services.dto.seine.NonTargetCatchDtos; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDtos; import fr.ird.observe.services.service.seine.NonTargetCatchService; +import fr.ird.observe.services.service.seine.TripSeineService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIHandler; @@ -52,6 +55,8 @@ import javax.swing.table.DefaultTableCellRenderer; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedList; import java.util.List; import java.util.Set; @@ -375,6 +380,36 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa SetSeineNonTargetCatchDtos.copySetSeineNonTargetCatchDto(form.getObject(), getBean()); } + @Override + protected <D extends ReferentialDto> Collection<ReferentialReference<D>> filterReferentialReferences(Class<D> dtoType, String propertyName, LinkedList<ReferentialReference<D>> incomingReferences) { + + Collection<ReferentialReference<D>> result = super.filterReferentialReferences(dtoType, propertyName, incomingReferences); + + switch (propertyName) { + + case NonTargetCatchDto.PROPERTY_SPECIES: { + + String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineNonTargetCatchId(); + String tripSeineId = getDataContext().getSelectedTripSeineId(); + + TripSeineService tripSeineService = ObserveSwingApplicationContext.get().newService(TripSeineService.class); + result = (List) tripSeineService.getSpeciesByListAndTrip(tripSeineId, speciesListId); + + result = ReferentialReferences.filterEnabled(result); + + if (log.isDebugEnabled()) { + log.debug(String.format("Filter referential references (type %s - property %s), final size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); + } + } + + break; + + } + + return result; + + } + protected NonTargetCatchService getNonTargetCatchService() { return ObserveSwingApplicationContext.get().newService(NonTargetCatchService.class); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java index baaa3c8..16827cd 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java @@ -61,7 +61,7 @@ public class NonTargetCatchServiceTopia extends ObserveServiceTopia implements N Form<SetSeineNonTargetCatchDto> form = dataEntityToForm( SetSeineNonTargetCatchDto.class, setSeine, - ReferenceSetRequestDefinitions.SET_SEINE_FORM + ReferenceSetRequestDefinitions.SET_SEINE_NON_TARGET_CATCH_FORM ); SetSeineNonTargetCatchDto setSeineNonTargetCatchDto = form.getObject(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm