From 185288b2211516c97118a5a706fe20f3224c0d87 Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Fri, 24 Nov 2023 16:02:46 +0100
Subject: [PATCH] Fix sul bottone annulla del DialogAskMagazzinoProssimita

---
 .../ProdFabbisognoLineeProdFragment.java              |  2 ++
 .../DialogAskMagazzinoProssimitaView.java             | 11 +++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java
index b334be87..d4eb9a27 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java
@@ -93,6 +93,8 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi
                         //Load fabbisogno
                         this.mViewModel.loadFabbisogno(startDate, endDate, codMdep, this::startPickingActivity);
 //                    }
+                }, () -> {
+                    popMe();
                 })
                 .show(getActivity().getSupportFragmentManager(), "tag");
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dialog_ask_mag_prossimita/DialogAskMagazzinoProssimitaView.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dialog_ask_mag_prossimita/DialogAskMagazzinoProssimitaView.java
index 62b8d83b..2c5bfda7 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dialog_ask_mag_prossimita/DialogAskMagazzinoProssimitaView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dialog_ask_mag_prossimita/DialogAskMagazzinoProssimitaView.java
@@ -36,20 +36,22 @@ public class DialogAskMagazzinoProssimitaView extends BaseDialogFragment impleme
     DialogAskMagazzinoProssimitaViewModel mViewModel;
 
     private final RunnableArgsss<JtbFasi, Date, Date> mOnItemSelected;
+    private final Runnable mOnAbort;
 
     private Context mContext;
     private DialogAskMagazzinoProssimitaBinding mBindings;
 
 //    private JtbFasi mSelectedItem;
 
-    public static DialogAskMagazzinoProssimitaView newInstance(RunnableArgsss<JtbFasi, Date, Date> onItemSelected) {
-        return new DialogAskMagazzinoProssimitaView(onItemSelected);
+    public static DialogAskMagazzinoProssimitaView newInstance(RunnableArgsss<JtbFasi, Date, Date> onItemSelected, Runnable onAbort) {
+        return new DialogAskMagazzinoProssimitaView(onItemSelected, onAbort);
     }
 
 
-    private DialogAskMagazzinoProssimitaView(RunnableArgsss<JtbFasi, Date, Date> onItemSelected) {
+    private DialogAskMagazzinoProssimitaView(RunnableArgsss<JtbFasi, Date, Date> onItemSelected, Runnable onAbort) {
         super();
         this.mOnItemSelected = onItemSelected;
+        this.mOnAbort = onAbort;
     }
 
     @Nullable
@@ -79,6 +81,7 @@ public class DialogAskMagazzinoProssimitaView extends BaseDialogFragment impleme
 //                } else {
 //                    FBToast.warningToast(mContext, getResources().getString(R.string.please_select_an_item), Toast.LENGTH_LONG);
 //                }
+                mOnItemSelected.run(null, mViewModel.startDate, mViewModel.endDate);
             }
         });
 
@@ -86,6 +89,7 @@ public class DialogAskMagazzinoProssimitaView extends BaseDialogFragment impleme
             @Override
             public void onSingleClick(View v) {
                 getDialog().dismiss();
+                mOnAbort.run();
             }
         });
 
@@ -111,7 +115,6 @@ public class DialogAskMagazzinoProssimitaView extends BaseDialogFragment impleme
     @Override
     public void onDismiss(@NonNull DialogInterface dialog) {
         super.onDismiss(dialog);
-        mOnItemSelected.run(null, mViewModel.startDate, mViewModel.endDate);
     }
 
     private final View.OnClickListener onStartDateClickListener = new OnSingleClickListener() {