From 56d509b07b871594d07b6f272d26aa5a7a7e98ab Mon Sep 17 00:00:00 2001 From: MarcoE Date: Mon, 10 Feb 2025 17:24:30 +0100 Subject: [PATCH] =?UTF-8?q?In=20inputQuantity=20l'avviso=20partita=20inatt?= =?UTF-8?q?iva=20non=20=C3=A8=20pi=C3=B9=20bloccante=20ma=20chiede=20di=20?= =?UTF-8?q?continuare?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DialogInputQuantityV2ViewModel.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java index 340945da..a348c09f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java @@ -1,5 +1,7 @@ package it.integry.integrywmsnative.view.dialogs.input_quantity_v2; +import android.text.SpannableString; + import androidx.databinding.ObservableField; import java.math.BigDecimal; @@ -29,6 +31,7 @@ import it.integry.integrywmsnative.core.utility.UtilityBigDecimal; import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.core.utility.UtilityResources; import it.integry.integrywmsnative.core.utility.UtilityString; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView; import it.integry.integrywmsnative.view.dialogs.exception.InactiveBatchLotException; import it.integry.integrywmsnative.view.dialogs.exception.InvalidBatchLotException; import it.integry.integrywmsnative.view.dialogs.exception.InvalidExpireDateException; @@ -390,12 +393,12 @@ public class DialogInputQuantityV2ViewModel { public void setNewPartitaMag(String internalPartitaMag) { this.internalPartitaMag = internalPartitaMag; - if (mPartitaMagList != null && SettingsManager.iDB().isSuggestDataScad()){ + if (mPartitaMagList != null && SettingsManager.iDB().isSuggestDataScad()) { Optional partitaMag = mPartitaMagList.stream() .filter(x -> x.getPartitaMag().equalsIgnoreCase(internalPartitaMag)) .findFirst(); - if (partitaMag.isPresent()){ + if (partitaMag.isPresent()) { setNewDataScad(partitaMag.get().getDataScad()); } else { MtbAart localMtbAart = mtbAart.get(); @@ -569,9 +572,11 @@ public class DialogInputQuantityV2ViewModel { } if (this.statoArt == StatoPartitaMag.DISATTIVO) { - this.sendError(new InactiveBatchLotException(internalPartitaMag)); - onValidated.run(false); - return; + boolean result = runWarningDialogSyncronized(String.format(UtilityResources.getString(R.string.batch_lot_not_enabled), internalPartitaMag)); + if (!result) { + onValidated.run(false); + return; + } } if (this.shouldAskDataScad && UtilityString.isNullOrEmpty(internalPartitaMag)) {