diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/HistoryULsListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/HistoryULsListAdapter.java index d9555e37..3dd6da5f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/HistoryULsListAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/HistoryULsListAdapter.java @@ -2,6 +2,7 @@ package it.integry.integrywmsnative.gest.prod_recupero_materiale.core; import android.content.Context; import android.view.LayoutInflater; +import android.view.View; import android.view.ViewGroup; import androidx.databinding.DataBindingUtil; @@ -27,6 +28,7 @@ public class HistoryULsListAdapter extends SectionedRecyclerViewAdapter mOriginalDataset; private List mDataset; + private View mEmptyView; private RunnableArgs mOnItemClicked; @@ -54,9 +56,10 @@ public class HistoryULsListAdapter extends SectionedRecyclerViewAdapter myDataset) { + public HistoryULsListAdapter(Context context, List myDataset, View emptyView) { mContext = context; mOriginalDataset = myDataset; + mEmptyView = emptyView; mDataset = orderItems(myDataset); } @@ -68,6 +71,8 @@ public class HistoryULsListAdapter extends SectionedRecyclerViewAdapter 0 ? View.GONE : View.VISIBLE); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/ProdRecuperoMaterialeHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/ProdRecuperoMaterialeHelper.java index c60b5700..2455b828 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/ProdRecuperoMaterialeHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/ProdRecuperoMaterialeHelper.java @@ -61,6 +61,7 @@ public class ProdRecuperoMaterialeHelper { "LEFT OUTER JOIN jtb_fasi ON mtb_colt.cod_jfas = jtb_fasi.cod_jfas " + "WHERE jtb_fasi.cod_jfas IS NOT NULL " + "AND segno = -1 " + + "AND mtb_colr.data_collo > DATEADD(DAY, -1, GETDATE()) " + "GROUP BY jtb_fasi.cod_jfas, " + "jtb_fasi.descrizione, " + "mtb_colr.gestione, " + diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java index a25821ee..c3a4a8b2 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java @@ -87,7 +87,7 @@ public class ProdRecuperoMaterialeViewModel { private void initRecyclerView() { - mAdapter = new HistoryULsListAdapter(mContext, new ArrayList<>()); + mAdapter = new HistoryULsListAdapter(mContext, new ArrayList<>(), mBinding.emptyView); mAdapter.setOnItemClicked(data -> this.dispatchItem(data, null, null)); mBinding.prodRecuperoMaterialeMainList.setLayoutManager(new LinearLayoutManager(mContext)); diff --git a/app/src/main/res/layout/dialog_scan_or_create_lu.xml b/app/src/main/res/layout/dialog_scan_or_create_lu.xml index 58177df7..5e09ce58 100644 --- a/app/src/main/res/layout/dialog_scan_or_create_lu.xml +++ b/app/src/main/res/layout/dialog_scan_or_create_lu.xml @@ -1,9 +1,9 @@ - - + - - - - - - - - - - - + android:background="@color/light_blue_300" + android:gravity="center_horizontal"> + + + + + + + + + + android:paddingStart="16dp" + android:paddingEnd="16dp"> + + + android:layout_marginTop="16dp"> - + + + + + + android:layout_marginTop="8dp"> - + android:orientation="vertical" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent"> - - - - - + android:gravity="center_horizontal" + android:layout_marginTop="12dp" + android:layout_marginBottom="12dp" + android:textSize="16sp" + android:textStyle="bold" + android:layout_gravity="center_horizontal" + style="@style/TextViewMaterial" + android:text="OPPURE" /> + + + + - - - + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_prod_recupero_materiale.xml b/app/src/main/res/layout/fragment_prod_recupero_materiale.xml index b0589ff2..0795ad18 100644 --- a/app/src/main/res/layout/fragment_prod_recupero_materiale.xml +++ b/app/src/main/res/layout/fragment_prod_recupero_materiale.xml @@ -3,9 +3,11 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:fab="http://schemas.android.com/apk/res-auto"> + + + android:layout_height="match_parent" /> + - + + + + + + + + + + + + + diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 6d7f1962..73fc969c 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -165,6 +165,7 @@ Nessun documento da mostrare Nessun ordine da evadere Nessun articolo + Nessuna UL versata in produzione Il barcode scansionato non ha fornito alcun risultato diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index dc2cdbba..815c14cb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -166,6 +166,7 @@ No documents to show No orders to dispatch No items + No LU poured into production The scanned label has already been used The scanned barcode did not produce any results