Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: de4d9d68 by tchemit at 2019-07-23T13:13:57Z [LL][LOGBOOKS] Source d'information d'un débarquement - Closes #1364 - - - - - 2 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/TripLonglineLandingUIHandler.java - dto/src/main/java/fr/ird/observe/dto/referential/common/PersonReference.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/TripLonglineLandingUIHandler.java ===================================== @@ -32,6 +32,8 @@ import fr.ird.observe.client.ui.content.api.ui.ObserveLayoutFocusTraversalPolicy import fr.ird.observe.dto.data.ll.landing.LandingLonglineDto; import fr.ird.observe.dto.data.ll.landing.LandingLonglineReference; import fr.ird.observe.dto.form.Form; +import fr.ird.observe.dto.referential.common.PersonDto; +import fr.ird.observe.dto.referential.common.PersonReference; import fr.ird.observe.dto.referential.common.VesselDto; import fr.ird.observe.dto.referential.common.VesselReference; import fr.ird.observe.dto.referential.ll.landing.DataSourceReference; @@ -119,6 +121,7 @@ class TripLonglineLandingUIHandler extends ContentOpenableUIHandler<LandingLongl @Override protected void onAfterInitAddReferentialFilters(ContentUIReferenceCache referenceCache) { + referenceCache.addReferentialFilter(LandingLonglineDto.PROPERTY_PERSON, (ReferentialReferencesFilter<PersonDto, PersonReference>) PersonReference::filterDataSourceReferences); referenceCache.addReferentialFilter(LandingLonglineDto.PROPERTY_VESSEL, (ReferentialReferencesFilter<VesselDto, VesselReference>) incomingReferences -> incomingReferences.stream().filter(e -> LANDING_VESSEL_TYPE_IDS.contains(e.getVesselTypeId())).collect(Collectors.toList())); } ===================================== dto/src/main/java/fr/ird/observe/dto/referential/common/PersonReference.java ===================================== @@ -46,6 +46,10 @@ public class PersonReference extends GeneratedPersonReference { return incoming.stream().filter(PersonReference::isDataEntryOperator).collect(Collectors.toList()); } +public static List<PersonReference> filterDataSourceReferences(Collection<PersonReference> incoming) { + return incoming.stream().filter(PersonReference::isDataSource).collect(Collectors.toList()); + } + public String getLabel() { return getFirstName() + " " + getLastName(); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/de4d9d6869a1fc57338a18588d1a... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/de4d9d6869a1fc57338a18588d1a... You're receiving this email because of your account on gitlab.com.