Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

2 changed files:

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
    32 32 
     import fr.ird.observe.dto.data.ll.landing.LandingLonglineDto;
    33 33 
     import fr.ird.observe.dto.data.ll.landing.LandingLonglineReference;
    34 34 
     import fr.ird.observe.dto.form.Form;
    35 
    +import fr.ird.observe.dto.referential.common.PersonDto;
    36 
    +import fr.ird.observe.dto.referential.common.PersonReference;
    35 37 
     import fr.ird.observe.dto.referential.common.VesselDto;
    36 38 
     import fr.ird.observe.dto.referential.common.VesselReference;
    37 39 
     import fr.ird.observe.dto.referential.ll.landing.DataSourceReference;
    ... ... @@ -119,6 +121,7 @@ class TripLonglineLandingUIHandler extends ContentOpenableUIHandler<LandingLongl
    119 121
    120 122 
         @Override
    121 123 
         protected void onAfterInitAddReferentialFilters(ContentUIReferenceCache referenceCache) {
    124 
    +        referenceCache.addReferentialFilter(LandingLonglineDto.PROPERTY_PERSON, (ReferentialReferencesFilter<PersonDto, PersonReference>) PersonReference::filterDataSourceReferences);
    122 125 
             referenceCache.addReferentialFilter(LandingLonglineDto.PROPERTY_VESSEL, (ReferentialReferencesFilter<VesselDto, VesselReference>) incomingReferences -> incomingReferences.stream().filter(e -> LANDING_VESSEL_TYPE_IDS.contains(e.getVesselTypeId())).collect(Collectors.toList()));
    123 126 
         }
    124 127

  • dto/src/main/java/fr/ird/observe/dto/referential/common/PersonReference.java
    ... ... @@ -46,6 +46,10 @@ public class PersonReference extends GeneratedPersonReference {
    46 46 
             return incoming.stream().filter(PersonReference::isDataEntryOperator).collect(Collectors.toList());
    47 47 
         }
    48 48
    49 
    +public static List<PersonReference> filterDataSourceReferences(Collection<PersonReference> incoming) {
    50 
    +        return incoming.stream().filter(PersonReference::isDataSource).collect(Collectors.toList());
    51 
    +    }
    52 
    +
    49 53 
         public String getLabel() {
    50 54 
             return getFirstName() + " " + getLastName();
    51 55 
         }

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.