From 08627271768b63c8752167f20fb6b311a74ba89b Mon Sep 17 00:00:00 2001 From: MarcoE Date: Mon, 18 Mar 2024 12:06:58 +0100 Subject: [PATCH 1/2] Fix nessun selezionato filtro gruppo merceologico --- .../ProdFabbisognoLineeProdFragment.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java index 4a3cb0af..45eb774c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java @@ -243,7 +243,7 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi filterChipDTO.getFilterChipText(), v -> initBottomSheetDialogFilter(filterChipDTO)); - switch (filterChipDTO.getID()){ + switch (filterChipDTO.getID()) { case ProdFabbisognoLineeProdBindings.NUM_ORD_FILTER_ID -> { mFilterViewModel.getCurrentNumOrdsPredicate().addOnPropertyChangedCallback(new OnGeneralChangedCallback() { @Override @@ -421,9 +421,13 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi .map(x -> ((ProdFabbisognoLineeItemModelDto) x).getOrdineLavorazioneDTO().getNumOrd().toString()) .toList()); - List sitArtOrdDTOS = Stream.of(fabbisognoList) - .filter(x -> Stream.of(listMtbGrup).anyMatch(y -> y.getCodMgrp().equalsIgnoreCase(x.getCodMgrp()))) - .map(x -> { + Stream streamSitArtOrd = Stream.of(fabbisognoList); + + streamSitArtOrd = listMtbGrup != null && !listMtbGrup.isEmpty() ? + streamSitArtOrd.filter(x -> Stream.of(listMtbGrup).anyMatch(y -> y.getCodMgrp().equalsIgnoreCase(x.getCodMgrp()))) : + streamSitArtOrd; + + List sitArtOrdDTOS = streamSitArtOrd.map(x -> { SitArtOrdDTO sitArtOrdDTO = new SitArtOrdDTO() .setCodMart(x.getCodMart()) .setCodMdep(codMdep) From 75e0a13f10075496df34e30c36228a87e90fd81f Mon Sep 17 00:00:00 2001 From: MarcoE Date: Mon, 18 Mar 2024 12:09:07 +0100 Subject: [PATCH 2/2] -> v1.40.06 (423) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 730dc95a..cfe7e51d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 422 - def appVersionName = '1.40.05' + def appVersionCode = 423 + def appVersionName = '1.40.06' signingConfigs { release {