This is an automated email from the git hooks/post-receive script. New change to branch feature/7604-PS-VerifEcranCaptureCibleDUneCalee in repository tutti. See http://git.codelutin.com/tutti.git at 68e1a48 Ajouter du code dans les réfétrence des catégories de poids (see #7604). This branch includes the following new commits: new fb939d7 Ajouter une fonction dans le service de référentiel pour recupéré la list des espèces pour lun list et l'océan d'une marée (see #7603). new 29f4e65 Ajout de trace dans les appels des services Suppression d'un paramêtre inutil (see #7604). new 4b85601 Ajouter du filtre sur les espèces (see #7604). new 68e1a48 Ajouter du code dans les réfétrence des catégories de poids (see #7604). The 4 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 68e1a48d96e462fc056e737cab32b11f85275afa Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 8 14:23:02 2016 +0100 Ajouter du code dans les réfétrence des catégories de poids (see #7604). commit 4b85601ec28a2fab3ba03418e376a0d5f75e79d4 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 8 14:21:44 2016 +0100 Ajouter du filtre sur les espèces (see #7604). commit 29f4e65c5a6d9db90509e9e5cd8601ca384f5ff4 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 8 14:20:25 2016 +0100 Ajout de trace dans les appels des services Suppression d'un paramêtre inutil (see #7604). commit fb939d739507f35c61ea24953a0e8fe08042333b Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 8 11:20:20 2016 +0100 Ajouter une fonction dans le service de référentiel pour recupéré la list des espèces pour lun list et l'océan d'une marée (see #7603). -- 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/7604-PS-VerifEcranCaptureCibleDUneCalee in repository tutti. See http://git.codelutin.com/tutti.git commit fb939d739507f35c61ea24953a0e8fe08042333b Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 8 11:20:20 2016 +0100 Ajouter une fonction dans le service de référentiel pour recupéré la list des espèces pour lun list et l'océan d'une marée (see #7603). --- .../table/impl/seine/SchoolEstimateUIHandler.java | 35 ++++++++++++++++ .../v1/ReferentialServiceController.java | 5 +++ .../services/service/ReferentialService.java | 4 ++ .../services/service/ReferentialServiceTopia.java | 46 ++++++++++++++++++++++ 4 files changed, 90 insertions(+) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java index b33abab..6aa4bd1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java @@ -28,12 +28,16 @@ import com.google.common.collect.Lists; 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.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.result.SaveResultDto; +import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; import fr.ird.observe.services.dto.seine.SchoolEstimateDto; import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto; import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDtos; +import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.services.service.seine.SchoolEstimateService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableModel; @@ -46,6 +50,7 @@ import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; import java.util.Collection; import java.util.Collections; +import java.util.LinkedList; import java.util.List; import java.util.Set; @@ -142,6 +147,36 @@ public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeineSchoo SetSeineSchoolEstimateDtos.copySetSeineSchoolEstimateDto(form.getObject(), getBean()); } + @Override + protected <D extends ReferentialDto> Iterable<ReferentialReference<D>> filterReferentialReferences(Class<D> dtoType, String propertyName, LinkedList<ReferentialReference<D>> incomingReferences) { + + Iterable<ReferentialReference<D>> result = super.filterReferentialReferences(dtoType, propertyName, incomingReferences); + + switch (propertyName) { + + case ObjectSchoolEstimateDto.PROPERTY_SPECIES: { + + String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineSchoolEstimateId(); + String tripSeineId = getDataContext().getSelectedTripSeineId(); + + ReferentialService referentialService = ObserveSwingApplicationContext.get().newService(ReferentialService.class); + result = referentialService.getSpeciesByListAndTrip(speciesListId, tripSeineId); + + 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 SchoolEstimateService getSchoolEstimateService() { return ObserveSwingApplicationContext.get().newService(SchoolEstimateService.class); } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java index 6e44588..01dc814 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java @@ -102,4 +102,9 @@ public class ReferentialServiceController extends ObserveAuthenticatedServiceCon public <R extends ReferentialDto> boolean exists(Class<R> type, String id) { return service.exists(type, id); } + + @Override + public <D extends ReferentialDto> Iterable<ReferentialReference<D>> getSpeciesByListAndTrip(String speciesListId, String tripId) { + return service.getSpeciesByListAndTrip(speciesListId, tripId); + } } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java index fed9025..f01374c 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java @@ -90,4 +90,8 @@ public interface ReferentialService extends ObserveService { @ReadReferentialPermission @ReadDataPermission <R extends ReferentialDto> boolean exists(Class<R> type, String id); + + @ReadReferentialPermission + @ReadDataPermission + <D extends ReferentialDto> Iterable<ReferentialReference<D>> getSpeciesByListAndTrip(String speciesListId, String tripId); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java index 1304147..537178e 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java @@ -25,11 +25,17 @@ package fr.ird.observe.services.service; import com.google.common.base.Joiner; import com.google.common.base.Optional; import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import fr.ird.observe.entities.EntityMap; +import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; +import fr.ird.observe.entities.referentiel.Ocean; import fr.ird.observe.entities.referentiel.Species; +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.services.ObserveServiceTopia; import fr.ird.observe.services.binder.BinderEngine; import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; @@ -37,7 +43,10 @@ import fr.ird.observe.services.dto.AbstractReferenceSet; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.DtoMap; import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.IdDtos; import fr.ird.observe.services.dto.constants.ReferenceStatus; +import fr.ird.observe.services.dto.constants.ReferentialLocale; +import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinition; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; @@ -45,7 +54,9 @@ import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; 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 org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaDao; @@ -264,4 +275,39 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe return existsEntity(entityType, id); } + @Override + public ImmutableList<ReferentialReference<SpeciesDto>> getSpeciesByListAndTrip(String speciesListId, String tripId) { + if (log.isTraceEnabled()) { + log.trace("getSpeciesByListAndTrip(" + speciesListId + ", " + tripId + ")"); + } + + // find Ocean + Ocean ocean; + if (IdDtos.isTripSeineId(tripId)) { + TripSeine tripSeine = loadEntity(TripSeineDto.class, tripId); + ocean = tripSeine.getOcean(); + } else { + TripLongline tripLongline = loadEntity(TripLonglineDto.class, tripId); + ocean = tripLongline.getOcean(); + } + + SpeciesList speciesList = loadEntity(SpeciesListDto.class, speciesListId); + + List<Species> species2 = Species2.filterByOcean(speciesList.getSpecies(), ocean); + + ReferentialBinderSupport<Species, SpeciesDto> binder = getReferentialBinder(SpeciesDto.class); + + ReferentialLocale referentialLocale = getReferentialLocale(); + + ImmutableList.Builder<ReferentialReference<SpeciesDto>> references = ImmutableList.builder(); + for (Species species : species2) { + + ReferentialReference<SpeciesDto> reference = binder.toReferentialReference(referentialLocale, species); + references.add(reference); + + } + + return references.build(); + } + } -- 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/7604-PS-VerifEcranCaptureCibleDUneCalee in repository tutti. See http://git.codelutin.com/tutti.git commit 29f4e65c5a6d9db90509e9e5cd8601ca384f5ff4 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 8 14:20:25 2016 +0100 Ajout de trace dans les appels des services Suppression d'un paramêtre inutil (see #7604). --- .../table/impl/seine/TargetDiscardCatchUIHandler.java | 3 +-- .../v1/seine/TargetCatchServiceController.java | 4 ++-- .../services/service/seine/TargetCatchService.java | 2 +- .../services/service/seine/TargetCatchServiceTopia.java | 17 +++++++++++------ 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java index 5167056..2a8a5a0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java @@ -492,8 +492,7 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT @Override protected void loadEditBean(String beanId) { - String tripSeineId = getDataContext().getSelectedTripSeineId(); - Form<SetSeineTargetCatchDto> form = getTargetCatchService().loadForm(beanId, true, tripSeineId); + Form<SetSeineTargetCatchDto> form = getTargetCatchService().loadForm(beanId, true); loadReferentialReferenceSetsInModel(form); getModel().setForm(form); SetSeineTargetCatchDtos.copySetSeineTargetCatchDto(form.getObject(), getBean()); diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetCatchServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetCatchServiceController.java index cf613f5..b4e8242 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetCatchServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetCatchServiceController.java @@ -38,8 +38,8 @@ public class TargetCatchServiceController extends ObserveAuthenticatedServiceCon } @Override - public Form<SetSeineTargetCatchDto> loadForm(String setSeineId, boolean discarded, String tripSeineId) { - return service.loadForm(setSeineId, discarded, tripSeineId); + public Form<SetSeineTargetCatchDto> loadForm(String setSeineId, boolean discarded) { + return service.loadForm(setSeineId, discarded); } @Override diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetCatchService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetCatchService.java index be5bdb1..a0de095 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetCatchService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetCatchService.java @@ -37,7 +37,7 @@ import fr.ird.observe.services.spi.WriteDataPermission; public interface TargetCatchService extends ObserveService { @ReadDataPermission - Form<SetSeineTargetCatchDto> loadForm(String setSeineId, boolean discarded, String tripSeineId); + Form<SetSeineTargetCatchDto> loadForm(String setSeineId, boolean discarded); @Write @WriteDataPermission diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetCatchServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetCatchServiceTopia.java index 4e26028..60180e7 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetCatchServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetCatchServiceTopia.java @@ -11,7 +11,6 @@ import fr.ird.observe.entities.seine.TargetCatchs; import fr.ird.observe.entities.seine.TargetLenghts; import fr.ird.observe.entities.seine.TargetLength; import fr.ird.observe.entities.seine.TargetSample; -import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.binder.data.DataBinderSupport; import fr.ird.observe.services.dto.Form; @@ -20,7 +19,8 @@ import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; import fr.ird.observe.services.dto.seine.TargetCatchDto; import fr.ird.observe.services.dto.seine.TargetCatchDtos; -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.Collection; @@ -32,18 +32,20 @@ import java.util.Set; */ public class TargetCatchServiceTopia extends ObserveServiceTopia implements TargetCatchService { + private static final Log log = LogFactory.getLog(TargetCatchServiceTopia.class); + @Override - public Form<SetSeineTargetCatchDto> loadForm(String setSeineId, boolean discarded, String tripSeineId) { + public Form<SetSeineTargetCatchDto> loadForm(String setSeineId, boolean discarded) { + if (log.isTraceEnabled()) { + log.trace("loadForm(" + setSeineId + ", " + discarded + ")"); + } SetSeine setSeine = loadEntity(SetSeineTargetCatchDto.class, setSeineId); - TripSeine tripSeine = loadEntity(TripSeineDto.class, tripSeineId); - Form<SetSeineTargetCatchDto> form = dataEntityToForm( SetSeineTargetCatchDto.class, setSeine, ReferenceSetRequestDefinitions.SET_SEINE_TARGET_CATCH_FORM - //ImmutableMap.<String, Object>of(Species.PROPERTY_OCEAN, ocean), //FIXME context ); SetSeineTargetCatchDto setSeineTargetCatchDto = form.getObject(); @@ -83,6 +85,9 @@ public class TargetCatchServiceTopia extends ObserveServiceTopia implements Targ @Override public SaveResultDto save(SetSeineTargetCatchDto dto) { + if (log.isTraceEnabled()) { + log.trace("save(" + dto.getId() + ")"); + } // on affect le discarded a toute les capture reçus. for (TargetCatchDto targetCatchDto : dto.getTargetCatch()) { -- 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/7604-PS-VerifEcranCaptureCibleDUneCalee in repository tutti. See http://git.codelutin.com/tutti.git commit 4b85601ec28a2fab3ba03418e376a0d5f75e79d4 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 8 14:21:44 2016 +0100 Ajouter du filtre sur les espèces (see #7604). --- .../table/impl/seine/TargetCatchUIHandler.java | 38 ++++++++++++++++++++-- .../dto/referential/ReferentialReferences.java | 2 +- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java index 06810be..2538717 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java @@ -26,14 +26,18 @@ import com.google.common.collect.Sets; 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.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.WeightCategoryDto; import fr.ird.observe.services.dto.result.SaveResultDto; +import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDtos; import fr.ird.observe.services.dto.seine.TargetCatchDto; import fr.ird.observe.services.dto.seine.TargetCatchDtos; +import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.services.service.seine.TargetCatchService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableModel; @@ -50,6 +54,7 @@ import javax.swing.table.DefaultTableCellRenderer; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.Collections; +import java.util.LinkedList; import java.util.List; import java.util.Set; @@ -284,13 +289,42 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineTargetCa @Override protected void loadEditBean(String beanId) { - String tripSeineId = getDataContext().getSelectedTripSeineId(); - Form<SetSeineTargetCatchDto> form = getTargetCatchService().loadForm(beanId, false, tripSeineId); + Form<SetSeineTargetCatchDto> form = getTargetCatchService().loadForm(beanId, false); loadReferentialReferenceSetsInModel(form); getModel().setForm(form); SetSeineTargetCatchDtos.copySetSeineTargetCatchDto(form.getObject(), getBean()); } + @Override + protected <D extends ReferentialDto> Iterable<ReferentialReference<D>> filterReferentialReferences(Class<D> dtoType, String propertyName, LinkedList<ReferentialReference<D>> incomingReferences) { + + Iterable<ReferentialReference<D>> result = super.filterReferentialReferences(dtoType, propertyName, incomingReferences); + + switch (propertyName) { + + case ObjectSchoolEstimateDto.PROPERTY_SPECIES: { + + String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineTargetCatchId(); + String tripSeineId = getDataContext().getSelectedTripSeineId(); + + ReferentialService referentialService = ObserveSwingApplicationContext.get().newService(ReferentialService.class); + result = referentialService.getSpeciesByListAndTrip(speciesListId, tripSeineId); + + 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 TargetCatchService getTargetCatchService() { return ObserveSwingApplicationContext.get().newService(TargetCatchService.class); } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferences.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferences.java index 0e3491f..400e8e5 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferences.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferences.java @@ -21,7 +21,7 @@ public class ReferentialReferences { } }; - public static <D extends ReferentialDto> List<ReferentialReference<D>> filterEnabled(List<ReferentialReference<D>> references) { + public static <D extends ReferentialDto> List<ReferentialReference<D>> filterEnabled(Iterable<ReferentialReference<D>> references) { List<ReferentialReference<D>> result = Lists.newArrayList(Iterables.filter(references, IS_ENABLE_PREDICATE)); return result; -- 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/7604-PS-VerifEcranCaptureCibleDUneCalee in repository tutti. See http://git.codelutin.com/tutti.git commit 68e1a48d96e462fc056e737cab32b11f85275afa Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 8 14:23:02 2016 +0100 Ajouter du code dans les réfétrence des catégories de poids (see #7604). --- .../services/dto/reference/ReferentialReferenceSetDefinitions.java | 1 + .../ird/observe/services/binder/referential/WeightCategoryBinder.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java index 97f8e60..4cb1e9b 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java @@ -231,6 +231,7 @@ public enum ReferentialReferenceSetDefinitions { VESSEL_ACTIVITY_SEINE(newDefaultDefinitionBuilder(VesselActivitySeineDto.class)), WEIGHT_CATEGORY(newDefinitionBuilder(WeightCategoryDto.class) + .addProperty(String.class, WeightCategoryDto.PROPERTY_CODE) .addProperty(String.class, WeightCategoryDto.PROPERTY_SPECIES)), WIND(newDefinitionBuilder(WindDto.class) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/WeightCategoryBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/WeightCategoryBinder.java index 61d3760..2385aff 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/WeightCategoryBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/WeightCategoryBinder.java @@ -45,6 +45,7 @@ public class WeightCategoryBinder extends ReferentialBinderSupport<WeightCategor return toReferentialReference(entity, getLabel(referentialLocale, entity), + entity.getCode(), toReferentialReference(referentialLocale, entity.getSpecies(), SpeciesDto.class)); } @@ -54,6 +55,7 @@ public class WeightCategoryBinder extends ReferentialBinderSupport<WeightCategor return toReferentialReference(dto, getLabel(referentialLocale, dto), + dto.getCode(), toEntity(dto.getSpecies(), Species.class)); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm