diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java index a06313bc..22b501d8 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java @@ -697,34 +697,34 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF }; private void refreshList(List filteredList) { - this.onLoadingStarted(); - //new Thread(() -> { +// new Thread(() -> { - requireActivity().runOnUiThread(() -> { - List tmpList; +// requireActivity().runOnUiThread(() -> { +// this.onLoadingStarted(); + List tmpList; - if (filteredList != null) { - tmpList = filteredList; - } else if (mAppliedFilterViewModel != null) { - mAppliedFilterViewModel.applyAllTests(); - tmpList = mAppliedFilterViewModel.getMutableFilteredOrderList().getValue(); - } else { - tmpList = mViewModel.getOrderList().getValue(); - } + if (filteredList != null) { + tmpList = filteredList; + } else if (mAppliedFilterViewModel != null) { + mAppliedFilterViewModel.applyAllTests(); + tmpList = mAppliedFilterViewModel.getMutableFilteredOrderList().getValue(); + } else { + tmpList = mViewModel.getOrderList().getValue(); + } - var list = convertDataModelToListModel(tmpList); + var list = convertDataModelToListModel(tmpList); - this.mOrdiniInevasiMutableData.clear(); - this.mOrdiniInevasiMutableData.addAll(list); + this.mOrdiniInevasiMutableData.clear(); + this.mOrdiniInevasiMutableData.addAll(list); - fabVisible.set(Stream.of(mOrdiniInevasiMutableData) - .anyMatch(y -> y.getSelectedObservable().get())); + fabVisible.set(Stream.of(mOrdiniInevasiMutableData) + .anyMatch(y -> y.getSelectedObservable().get())); - this.onLoadingEnded(); - }); +// this.onLoadingEnded(); +// }); - //}).start(); +// }).start(); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoViewModel.java index 6e1de52a..41386842 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoViewModel.java @@ -104,7 +104,7 @@ public class OrdiniUscitaElencoViewModel { .distinct() .toList(); - if (foundGestioni != null && foundGestioni.size() > 1) { + if (foundGestioni.size() > 1) { this.sendError(new InvalidLUMultiGestioneException()); return; } @@ -116,7 +116,7 @@ public class OrdiniUscitaElencoViewModel { .distinct() .toList(); - if (foundCodMdep != null && foundCodMdep.size() > 1) { + if (foundCodMdep.size() > 1) { this.sendError(new InvalidLUMultiCodMdepException()); return; } @@ -130,7 +130,7 @@ public class OrdiniUscitaElencoViewModel { this.mOrdiniRESTConsumer.retrieveListaArticoliFromOrdiniUscita(mCurrentCodMdep, selectedOrdersBase, sitArts -> { - if(mtbGrupToFilter != null && !mtbGrupToFilter.isEmpty()) { + if (mtbGrupToFilter != null && !mtbGrupToFilter.isEmpty()) { sitArts = Stream.of(sitArts) .filter(x -> Stream.of(mtbGrupToFilter).map(MtbGrup::getCodMgrp).anyMatch(y -> y.equalsIgnoreCase(x.getCodMgrp()))) .toList();