From 0f7bfefaa669c78a6bafd6382c41c7d98b7ac592 Mon Sep 17 00:00:00 2001 From: ValerioC Date: Tue, 12 Nov 2019 15:18:32 +0100 Subject: [PATCH] [SAPORI VERI] implementazioni grafiche e di sicurezza --- .../dialog/EditArticoloDialog.java | 8 +++++--- .../PVOrdiniAcquistoGrigliaFragment.java | 12 +++++++----- .../pv_ordini_acquisto/dialogs/DialogScanLisA.java | 10 +++------- app/src/main/res/layout/dialog_pv_edit_articolo.xml | 4 +--- 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/dialog/EditArticoloDialog.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/dialog/EditArticoloDialog.java index 5c13fdd6..c16d6fc3 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/dialog/EditArticoloDialog.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/dialog/EditArticoloDialog.java @@ -19,6 +19,7 @@ import it.integry.integrywmsnative.core.expansion.BaseDialog; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.utility.UtilityDialog; import it.integry.integrywmsnative.core.utility.UtilityExceptions; +import it.integry.integrywmsnative.core.utility.UtilityFocus; import it.integry.integrywmsnative.core.utility.UtilityProgress; import it.integry.integrywmsnative.databinding.DialogPvEditArticoloBinding; import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.helper.PVEditOrderHelper; @@ -35,7 +36,6 @@ public class EditArticoloDialog { private PVEditOrderHelper mHelper; private ArticoloOrdine mArticolo; - private ArticoloOrdine mSavedArt; private boolean mLockedInput = false; @@ -55,10 +55,12 @@ public class EditArticoloDialog { UtilityDialog.setTo90PercentSize(mContext, mDialog); mDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); - mBinding.qtaTot.setText(String.valueOf(mArticolo.getQtaOrd())); int qtaCnf = (int)Math.ceil(mArticolo.getQtaOrd() / mArticolo.getQtaCnf()); + mBinding.qtaTot.setText(String.valueOf(mArticolo.getQtaOrd())); mBinding.qtaCnf.setText(String.valueOf(qtaCnf)); - mBinding.addButton.requestFocus(); + mDialog.setOnShowListener(dialog -> { + UtilityFocus.focusTextBox(mContext,mBinding.qtaTot); + }); mDialog.setOnDismissListener(dialog -> { onDialogDismiss.run(mSavedArt); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/PVOrdiniAcquistoGrigliaFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/PVOrdiniAcquistoGrigliaFragment.java index 65243360..9cce5f01 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/PVOrdiniAcquistoGrigliaFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/PVOrdiniAcquistoGrigliaFragment.java @@ -52,6 +52,7 @@ public class PVOrdiniAcquistoGrigliaFragment extends Fragment implements ITitled private Griglia mGriglia; private OrdineAcquistoPvOpenListAdapter mAdapter; private List mRenderedOrderList = new ArrayList<>(); + private boolean mRedirectToNewOrder = true; public PVOrdiniAcquistoGrigliaFragment() { @@ -122,12 +123,13 @@ public class PVOrdiniAcquistoGrigliaFragment extends Fragment implements ITitled private void setOrdini(List ordini) { mBinding.ordiniAApertiMainList.setVisibility(ordini != null && ordini.size() > 0 ? View.VISIBLE : View.GONE); mBinding.ordiniAEmptyView.setVisibility(ordini == null || ordini.size() <= 0 ? View.VISIBLE : View.GONE); - - if (mRenderedOrderList.size() <= 0) { - mAdapter.updateItems(mRenderedOrderList); - } refreshRenderedOrdini(ordini); mAdapter.updateItems(mRenderedOrderList); + if (mRenderedOrderList.size() <= 0 && mRedirectToNewOrder) { + createNewOrder(); + }else{ + mRedirectToNewOrder = false; + } } public Griglia getGriglia() { @@ -157,7 +159,7 @@ public class PVOrdiniAcquistoGrigliaFragment extends Fragment implements ITitled } - ; + private void selectAction(Ordine ordine) { getActivity().runOnUiThread(() -> DialogAskAction.make(getActivity(), diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/dialogs/DialogScanLisA.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/dialogs/DialogScanLisA.java index 6cd28d4b..691e1b73 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/dialogs/DialogScanLisA.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/dialogs/DialogScanLisA.java @@ -82,7 +82,7 @@ public class DialogScanLisA { }); }; - RunnableArgs onGrigliaAvaialable = griglia->{ + RunnableArgs onGrigliaAvailable = griglia->{ mContext.runOnUiThread(()->{ progressDialog.dismiss(); mGriglia = griglia; @@ -95,13 +95,9 @@ public class DialogScanLisA { repository.findByCodAlis(data.getStringValue(),griglia->{ if (griglia != null){ griglia.getGriglia().setCountArticoli(griglia.getCountArticoli()); - if (griglia.getCountArticoli() >0){ - onGrigliaAvaialable.run(griglia.getGriglia()); - }else{ - mHelper.updateGriglia(griglia.getGriglia(), onGrigliaAvaialable,mOnError); - } + mHelper.updateGriglia(griglia.getGriglia(), onGrigliaAvailable,mOnError); }else{ - mHelper.downloadAndSaveLisA(data.getStringValue(), onGrigliaAvaialable,mOnError); + mHelper.downloadAndSaveLisA(data.getStringValue(), onGrigliaAvailable,mOnError); } },mOnError); diff --git a/app/src/main/res/layout/dialog_pv_edit_articolo.xml b/app/src/main/res/layout/dialog_pv_edit_articolo.xml index ab4a4f6b..c897933e 100644 --- a/app/src/main/res/layout/dialog_pv_edit_articolo.xml +++ b/app/src/main/res/layout/dialog_pv_edit_articolo.xml @@ -42,9 +42,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingLeft="24dp" - android:paddingTop="24dp" - android:paddingRight="24dp"> + android:padding="24dp">