From 88f00fa19584164261ea7541e5dca253e00cb795 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 11 Nov 2019 15:42:20 +0100 Subject: [PATCH] Implementata empty view su ultimi arrivi e ultime consegne --- .../UltimeConsegneClienteViewModel.java | 22 ++++---- .../UltimiArriviFornitoreFragment.java | 10 ++-- .../fragment_main_ultime_consegne_cliente.xml | 51 ++++++++++++++++++ .../fragment_ultimi_arrivi_fornitore.xml | 53 +++++++++++++++++++ app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 6 files changed, 119 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java index ff306b46..265e86ce 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java @@ -3,6 +3,7 @@ package it.integry.integrywmsnative.gest.ultime_consegne_cliente.viewmodel; import android.app.Dialog; import android.app.ProgressDialog; import android.content.Context; +import android.view.View; import androidx.recyclerview.widget.LinearLayoutManager; @@ -56,13 +57,6 @@ public class UltimeConsegneClienteViewModel { }).show(); } - - public void refreshItems(List items){ - mRenderedItems.clear(); - mRenderedItems.addAll(items); - mAdapter.updateItems(mRenderedItems); - } - private void initList() { Dialog progressDialog = UtilityProgress.createDefaultProgressDialog(mContext); @@ -75,7 +69,7 @@ public class UltimeConsegneClienteViewModel { this.mItems = consegne; this.initDataAdapter(consegne); - refreshRenderedOrdini(consegne); + refreshItems(consegne); progressDialog.dismiss(); }, ex -> { @@ -83,11 +77,6 @@ public class UltimeConsegneClienteViewModel { }); } - private void refreshRenderedOrdini(List items) { - mRenderedItems.clear(); - if(items != null) mRenderedItems.addAll(items); - } - private void initDataAdapter(ArrayList dataset) { mAdapter = new UltimeConsegneMainListAdapter(mContext, dataset); mAdapter.setOnSelectionChanged(this::onSingleSelectionChanged); @@ -99,6 +88,13 @@ public class UltimeConsegneClienteViewModel { } + private void refreshItems(List items){ + mBinding.emptyView.setVisibility((items != null && items.size() > 0) ? View.GONE : View.VISIBLE); + + mRenderedItems.clear(); + if(items != null) mRenderedItems.addAll(items); + mAdapter.updateItems(mRenderedItems); + } private void onSingleSelectionChanged(DocumentoResoDTO dto) { List selectedOrders = getSelectedItems(); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/UltimiArriviFornitoreFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/UltimiArriviFornitoreFragment.java index efa4f595..edcb109c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/UltimiArriviFornitoreFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/UltimiArriviFornitoreFragment.java @@ -125,7 +125,7 @@ public class UltimiArriviFornitoreFragment extends Fragment implements ITitledFr this.mItems = consegne; this.initDataAdapter(consegne); - refreshRenderedOrdini(consegne); + refreshItems(consegne); progressDialog.dismiss(); }, ex -> { @@ -134,10 +134,6 @@ public class UltimiArriviFornitoreFragment extends Fragment implements ITitledFr } - private void refreshRenderedOrdini(List items) { - mRenderedItems.clear(); - if(items != null) mRenderedItems.addAll(items); - } private void initDataAdapter(ArrayList dataset) { mAdapter = new UltimiArriviFornitoreListAdapter(getActivity(), dataset); @@ -196,8 +192,10 @@ public class UltimiArriviFornitoreFragment extends Fragment implements ITitledFr private void refreshItems(List items){ + mBinding.emptyView.setVisibility((items != null && items.size() > 0) ? View.GONE : View.VISIBLE); + mRenderedItems.clear(); - mRenderedItems.addAll(items); + if(items != null) mRenderedItems.addAll(items); mAdapter.updateItems(mRenderedItems); } } diff --git a/app/src/main/res/layout/fragment_main_ultime_consegne_cliente.xml b/app/src/main/res/layout/fragment_main_ultime_consegne_cliente.xml index e4dc99ea..12a55f0e 100644 --- a/app/src/main/res/layout/fragment_main_ultime_consegne_cliente.xml +++ b/app/src/main/res/layout/fragment_main_ultime_consegne_cliente.xml @@ -36,7 +36,58 @@ android:layout_height="match_parent" android:layout_alignParentEnd="true"/> + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_ultimi_arrivi_fornitore.xml b/app/src/main/res/layout/fragment_ultimi_arrivi_fornitore.xml index fe089dc4..e99b9c24 100644 --- a/app/src/main/res/layout/fragment_ultimi_arrivi_fornitore.xml +++ b/app/src/main/res/layout/fragment_ultimi_arrivi_fornitore.xml @@ -37,6 +37,59 @@ android:layout_alignParentEnd="true"/> + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 999fc9ca..facad139 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -156,6 +156,7 @@ Nessuna UL registrata a magazzino Nessun articolo da prelevare + Nessun documento da mostrare Nessun ordine da evadere Nessun articolo diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a3bf5f2d..f62bfd82 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -157,6 +157,7 @@ No LU already registered No items to pick + No documents to show No orders to dispatch No items