From 4a79b6c1bf63f719d116377fe6f9a4540d3489c7 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Wed, 21 Feb 2024 10:05:28 +0100 Subject: [PATCH] =?UTF-8?q?Fix=20su=20logica=20di=20richiesta=20lotto=20in?= =?UTF-8?q?=20Spedizione=20nel=20caso=20di=20pi=C3=B9=20lotti=20presenti?= =?UTF-8?q?=20in=20una=20UL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/utility/UtilityBarcode.java | 2 +- .../gest/spedizione/SpedizioneViewModel.java | 20 +++--- .../DialogAskLineaProdViewModel.java | 2 +- .../DialogChooseBatchLotView.java | 35 ++++++---- .../res/layout/dialog_choose_batch_lot.xml | 69 ++++++------------- 5 files changed, 52 insertions(+), 76 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java index 2d8437da..2d8bec0e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java @@ -25,7 +25,7 @@ public class UtilityBarcode { int currentYear = calendar.get(Calendar.YEAR); String fullYear = "20" + UtilityBarcode.getAnnoColloFromULAnonima(barcode); - return fullYear.equalsIgnoreCase("" + currentYear); + return fullYear.equalsIgnoreCase(String.valueOf(currentYear)); } public static boolean isEtichetta128(BarcodeScanDTO barcodeScanDTO) { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java index e9e5703f..0e1af15c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java @@ -838,16 +838,16 @@ public class SpedizioneViewModel { .toList(); //Controllo se una delle partite combacia con quella che voglio evadere - if (refMtbColr != null && refMtbColr.getMtbPartitaMag() != null) { - MtbPartitaMag refMtbPartitaMag = refMtbColr.getMtbPartitaMag(); - - Optional matchPartitaMag = Stream.of(availableBatchLots).filter(availableBatchLot -> refMtbPartitaMag.getPartitaMag().equalsIgnoreCase(availableBatchLot.getPartitaMag())).findFirst(); - - if (matchPartitaMag.isPresent()) { - availableBatchLots.clear(); - availableBatchLots.add(refMtbPartitaMag); - } - } +// if (refMtbColr != null && refMtbColr.getMtbPartitaMag() != null) { +// MtbPartitaMag refMtbPartitaMag = refMtbColr.getMtbPartitaMag(); +// +// Optional matchPartitaMag = Stream.of(availableBatchLots).filter(availableBatchLot -> refMtbPartitaMag.getPartitaMag().equalsIgnoreCase(availableBatchLot.getPartitaMag())).findFirst(); +// +// if (matchPartitaMag.isPresent()) { +// availableBatchLots.clear(); +// availableBatchLots.add(refMtbPartitaMag); +// } +// } if (availableBatchLots.size() > 1) { this.sendOnLoadingStarted(); diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_linea_prod/DialogAskLineaProdViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_linea_prod/DialogAskLineaProdViewModel.java index d19bf5b0..c7510621 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_linea_prod/DialogAskLineaProdViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_linea_prod/DialogAskLineaProdViewModel.java @@ -17,7 +17,7 @@ public class DialogAskLineaProdViewModel { MtbDepoPosizione foundPosizione = UtilityPosizione.getFromCache(data.getStringValue()); - if (!foundPosizione.isFlagLineaProduzione()) { + if (foundPosizione == null || !foundPosizione.isFlagLineaProduzione()) { this.sendError(new InvalidLineaProdBarcodeException(data.getStringValue())); onComplete.run(); return; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_batch_lot/DialogChooseBatchLotView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_batch_lot/DialogChooseBatchLotView.java index 005653d7..0f6efd32 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_batch_lot/DialogChooseBatchLotView.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_batch_lot/DialogChooseBatchLotView.java @@ -1,20 +1,18 @@ package it.integry.integrywmsnative.view.dialogs.choose_batch_lot; +import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; -import android.graphics.Color; -import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import androidx.databinding.DataBindingUtil; import androidx.recyclerview.widget.LinearLayoutManager; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; + import java.util.List; import javax.inject.Inject; @@ -52,30 +50,37 @@ public class DialogChooseBatchLotView extends BaseDialogFragment { this.mOnItemSelected = onItemSelected; } - @Nullable + @NonNull @Override - public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - this.mContext = getActivity(); + public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { + this.mContext = requireContext(); - mBindings = DataBindingUtil.inflate(inflater, R.layout.dialog_choose_batch_lot, container, false); + mBindings = DialogChooseBatchLotBinding.inflate(LayoutInflater.from(this.mContext), null, false); + mBindings.setLifecycleOwner(this); MainApplication.appComponent .dialogChooseBatchLotComponent() .create() .inject(this); - mBindings.setView(this); mBindings.setViewmodel(this.mViewModel); - getDialog().setCanceledOnTouchOutside(false); - getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); + setCancelable(false); - return mBindings.getRoot(); + var alertDialog = new MaterialAlertDialogBuilder(this.mContext) + .setView(mBindings.getRoot()) + .setCancelable(isCancelable()) + .create(); + + alertDialog.setCanceledOnTouchOutside(isCancelable()); + alertDialog.setOnShowListener(this); + alertDialog.setOnDismissListener(this); + return alertDialog; } @Override - public void onStart() { - super.onStart(); + public void onShow(DialogInterface dialogInterface) { + super.onShow(dialogInterface); this.initRecyclerView(); } diff --git a/app/src/main/res/layout/dialog_choose_batch_lot.xml b/app/src/main/res/layout/dialog_choose_batch_lot.xml index ce2f81ab..2c98b991 100644 --- a/app/src/main/res/layout/dialog_choose_batch_lot.xml +++ b/app/src/main/res/layout/dialog_choose_batch_lot.xml @@ -5,21 +5,10 @@ - - - - - - - - - @@ -28,55 +17,37 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:orientation="vertical" - app:cardCornerRadius="12dp" + app:cardCornerRadius="16dp" app:cardElevation="0dp"> + android:orientation="vertical" + android:paddingHorizontal="16dp" + android:paddingVertical="16dp"> - + + + android:layout_marginBottom="16dp" + android:gravity="center_horizontal" + android:text="@string/select_batch_lot" /> - - - - - - - - - - - - - - + android:layout_marginTop="16dp" />