From 1f94c14634426fa7d137e55a61cc31fd16c330fc Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Wed, 9 Mar 2022 16:14:12 +0100 Subject: [PATCH] Ripristinato click per modificare righe in ordine di acquisto --- .../PVOrdineAcquistoEditActivity.java | 37 +++++-------------- 1 file changed, 9 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java index 24a065d6..83b928fa 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java @@ -13,11 +13,8 @@ import androidx.databinding.DataBindingUtil; import androidx.databinding.ObservableArrayList; import androidx.recyclerview.widget.LinearLayoutManager; -import com.annimon.stream.Stream; import com.ravikoradiya.liveadapter.LiveAdapter; - -import java.math.BigDecimal; -import java.util.List; +import com.ravikoradiya.liveadapter.Type; import javax.inject.Inject; @@ -35,6 +32,7 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.databinding.ActivityPvOrdineAcquistoEditBinding; +import it.integry.integrywmsnative.databinding.FragmentPvArticoliOrdineAcquistoListSingleItemBinding; import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.dialog.DialogEditArticoloView; import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.ui.OrdineAcquistoArtListModel; import it.integry.integrywmsnative.ui.FabMenuCustomAnimations; @@ -134,20 +132,17 @@ public class PVOrdineAcquistoEditActivity extends BaseActivity implements PVOrdi } private void initRecyclerView() { -// this.mViewModel.getArticoli().observe(this, updatedData -> { -// this.mArticoliMutableData.clear(); -// this.mArticoliMutableData.addAll(convertDataModelToListModel(updatedData)); -//// this.noItemsToPick.set(!isThereAnyItemToPick(updatedData)); -// }); -// var mAdapter = new OrdineAcquistoArtListAdapter(this, mArticoliMutableData) -// .setOnItemClicked(this::selectAction); + var itemType = new Type(R.layout.fragment_pv_articoli_ordine_acquisto__list_single_item, BR.articolo); + itemType.onClick(x -> { + this.selectAction(x.getBinding().getArticolo()); + return null; + }); - var liveAdapter = new LiveAdapter(this.mViewModel.getArticoli(), this, BR.articolo) - .map(ArticoloOrdine.class, R.layout.fragment_pv_articoli_ordine_acquisto__list_single_item) + new LiveAdapter(this.mViewModel.getArticoli(), this) + .map(ArticoloOrdine.class, itemType) .into(mBinding.articoliOrdineList); -// mBinding.articoliOrdineList.setAdapter(mAdapter); mBinding.articoliOrdineList.setHasFixedSize(true); mBinding.articoliOrdineList.setLayoutManager(new LinearLayoutManager(this)); @@ -156,20 +151,6 @@ public class PVOrdineAcquistoEditActivity extends BaseActivity implements PVOrdi mBinding.articoliOrdineList.addItemDecoration(itemDecorator); } - private List convertDataModelToListModel - (List dataList) { - return Stream.of(dataList) - .distinctBy(ArticoloOrdine::getArticoloOrdineId) - .sortBy(x -> x.getDataIns().getTime()) - .map(x -> new OrdineAcquistoArtListModel() - .setBadge1(x.getCodMart()) - .setDescription(x.getDescrizione()) - .setQuantity(BigDecimal.valueOf(x.getQtaOrd())) - .setUntMis(x.getUntMis()) - .setOriginalModel(x)) - .toList(); - } - private void selectAction(ArticoloOrdine articoloOrdine) { mBinding.closeActivityFab.close(false);