From 9967b7a3ef8eadacde184b64b44b07de96f61d99 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Sat, 4 Apr 2020 01:34:55 +0200 Subject: [PATCH] =?UTF-8?q?Gestite=20le=20eccezioni=20riguardo=20le=20quan?= =?UTF-8?q?tit=C3=A0=20errate=20in=20fase=20di=20inserimento?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gest/main/MainFragment.java | 1 - .../input_quantity/DialogInputQuantity.java | 2 +- .../DialogInputQuantityV2ViewModel.java | 31 ++++++++++++++++--- .../InvalidQtaCnfQuantityException.java | 12 +++++++ ...rflowNumCnfAvailableQuantityException.java | 12 +++++++ ...verflowNumCnfOrderedQuantityException.java | 10 ++++++ ...rflowQtaTotAvailableQuantityException.java | 12 +++++++ ...verflowQtaTotOrderedQuantityException.java | 12 +++++++ .../exception/OverflowQuantityException.java | 10 ------ app/src/main/res/values-it/strings.xml | 6 +++- app/src/main/res/values/strings.xml | 6 +++- 11 files changed, 96 insertions(+), 18 deletions(-) create mode 100644 app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/exception/InvalidQtaCnfQuantityException.java create mode 100644 app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/exception/OverflowNumCnfAvailableQuantityException.java create mode 100644 app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/exception/OverflowNumCnfOrderedQuantityException.java create mode 100644 app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/exception/OverflowQtaTotAvailableQuantityException.java create mode 100644 app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/exception/OverflowQtaTotOrderedQuantityException.java delete mode 100644 app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/exception/OverflowQuantityException.java diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java index 9e60c5bb..37221bd8 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java @@ -233,7 +233,6 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab List menuGroups = menuConfiguration.getGroups(); for (MenuConfiguration.MenuGroup menuGroup : menuGroups) { - FragmentMainMenuGroupLayoutBinding groupBinding = DataBindingUtil.inflate(mLayoutInflater, R.layout.fragment_main_menu_group_layout, null, false); String title = this.getResources().getString(menuGroup.getGroupText()); diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java index f4012194..e9210524 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java @@ -731,7 +731,7 @@ public class DialogInputQuantity { private void showQuantityOverflowErrorPrompt(Context mContext){ - String errorMessage = mContext.getText(R.string.quantity_overflow_error_message).toString(); + String errorMessage = mContext.getText(R.string.available_quantity_overflow_error_message).toString(); DialogSimpleMessageHelper.makeErrorDialog(mContext, new SpannableString(Html.fromHtml(errorMessage)), null, null).show(); } 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 ef214022..b9bbe3ae 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 @@ -7,12 +7,15 @@ import java.util.Date; import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.core.utility.UtilityBigDecimal; -import it.integry.integrywmsnative.core.utility.UtilityObservable; import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.exception.InvalidBatchLotException; import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.exception.InvalidExpireDateException; +import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.exception.InvalidQtaCnfQuantityException; import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.exception.InvalidQuantityException; -import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.exception.OverflowQuantityException; +import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.exception.OverflowNumCnfAvailableQuantityException; +import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.exception.OverflowNumCnfOrderedQuantityException; +import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.exception.OverflowQtaTotAvailableQuantityException; +import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.exception.OverflowQtaTotOrderedQuantityException; public class DialogInputQuantityV2ViewModel { @@ -213,7 +216,12 @@ public class DialogInputQuantityV2ViewModel { } public boolean validate() { - if (mtbAart.get().isFlagTracciabilitaBoolean() && UtilityString.isNullOrEmpty(internalPartitaMag)) { + if(this.internalQtaCnf == null || UtilityBigDecimal.equalsTo(this.internalQtaCnf, BigDecimal.ZERO)) { + + this.mListener.onError(new InvalidQtaCnfQuantityException()); + return false; + + } else if (mtbAart.get().isFlagTracciabilitaBoolean() && UtilityString.isNullOrEmpty(internalPartitaMag)) { this.mListener.onError(new InvalidBatchLotException()); return false; @@ -230,7 +238,22 @@ public class DialogInputQuantityV2ViewModel { } else if (!this.canOverflowOrderQuantity && UtilityBigDecimal.greaterThan(this.internalQtaTot, this.totalQtaOrd)) { - this.mListener.onError(new OverflowQuantityException()); + this.mListener.onError(new OverflowQtaTotOrderedQuantityException()); + return false; + + } else if (!this.canOverflowOrderQuantity && UtilityBigDecimal.greaterThan(this.internalNumCnf, this.totalNumCnfOrd)) { + + this.mListener.onError(new OverflowNumCnfOrderedQuantityException()); + return false; + + } else if (UtilityBigDecimal.greaterThan(this.internalQtaTot, this.totalQtaAvailable)) { + + this.mListener.onError(new OverflowQtaTotAvailableQuantityException()); + return false; + + } else if (UtilityBigDecimal.greaterThan(this.internalNumCnf, this.totalNumCnfAvailable)) { + + this.mListener.onError(new OverflowNumCnfAvailableQuantityException()); return false; } else if (UtilityBigDecimal.lowerThan(this.internalQtaCnf, BigDecimal.ZERO) || UtilityBigDecimal.lowerThan(this.internalNumCnf, BigDecimal.ZERO) || UtilityBigDecimal.lowerThan(this.internalQtaTot, BigDecimal.ZERO)) { diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/exception/InvalidQtaCnfQuantityException.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/exception/InvalidQtaCnfQuantityException.java new file mode 100644 index 00000000..bed7165e --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/exception/InvalidQtaCnfQuantityException.java @@ -0,0 +1,12 @@ +package it.integry.integrywmsnative.view.dialogs.input_quantity_v2.exception; + +import it.integry.integrywmsnative.R; +import it.integry.integrywmsnative.core.utility.UtilityResources; + +public class InvalidQtaCnfQuantityException extends Exception { + + public InvalidQtaCnfQuantityException() { + super(UtilityResources.getString(R.string.invalid_quantity_x_package_error_message)); + } + +} diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/exception/OverflowNumCnfAvailableQuantityException.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/exception/OverflowNumCnfAvailableQuantityException.java new file mode 100644 index 00000000..be7bbf04 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/exception/OverflowNumCnfAvailableQuantityException.java @@ -0,0 +1,12 @@ +package it.integry.integrywmsnative.view.dialogs.input_quantity_v2.exception; + +import it.integry.integrywmsnative.R; +import it.integry.integrywmsnative.core.utility.UtilityResources; + +public class OverflowNumCnfAvailableQuantityException extends Exception { + + public OverflowNumCnfAvailableQuantityException() { + super(UtilityResources.getString(R.string.available_num_cnf_overflow_error_message)); + } + +} diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/exception/OverflowNumCnfOrderedQuantityException.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/exception/OverflowNumCnfOrderedQuantityException.java new file mode 100644 index 00000000..e42cd9ca --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/exception/OverflowNumCnfOrderedQuantityException.java @@ -0,0 +1,10 @@ +package it.integry.integrywmsnative.view.dialogs.input_quantity_v2.exception; + +import it.integry.integrywmsnative.R; +import it.integry.integrywmsnative.core.utility.UtilityResources; + +public class OverflowNumCnfOrderedQuantityException extends Exception { + public OverflowNumCnfOrderedQuantityException() { + super(UtilityResources.getString(R.string.ordered_num_cnf_overflow_error_message)); + } +} diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/exception/OverflowQtaTotAvailableQuantityException.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/exception/OverflowQtaTotAvailableQuantityException.java new file mode 100644 index 00000000..822d7ed8 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/exception/OverflowQtaTotAvailableQuantityException.java @@ -0,0 +1,12 @@ +package it.integry.integrywmsnative.view.dialogs.input_quantity_v2.exception; + +import it.integry.integrywmsnative.R; +import it.integry.integrywmsnative.core.utility.UtilityResources; + +public class OverflowQtaTotAvailableQuantityException extends Exception { + + public OverflowQtaTotAvailableQuantityException() { + super(UtilityResources.getString(R.string.available_quantity_overflow_error_message)); + } + +} diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/exception/OverflowQtaTotOrderedQuantityException.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/exception/OverflowQtaTotOrderedQuantityException.java new file mode 100644 index 00000000..bb5289e2 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/exception/OverflowQtaTotOrderedQuantityException.java @@ -0,0 +1,12 @@ +package it.integry.integrywmsnative.view.dialogs.input_quantity_v2.exception; + +import it.integry.integrywmsnative.R; +import it.integry.integrywmsnative.core.utility.UtilityResources; + +public class OverflowQtaTotOrderedQuantityException extends Exception { + + public OverflowQtaTotOrderedQuantityException() { + super(UtilityResources.getString(R.string.ordered_quantity_overflow_error_message)); + } + +} diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/exception/OverflowQuantityException.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/exception/OverflowQuantityException.java deleted file mode 100644 index 4ec5aa0a..00000000 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/exception/OverflowQuantityException.java +++ /dev/null @@ -1,10 +0,0 @@ -package it.integry.integrywmsnative.view.dialogs.input_quantity_v2.exception; - -import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.utility.UtilityResources; - -public class OverflowQuantityException extends Exception { - public OverflowQuantityException() { - super(UtilityResources.getString(R.string.quantity_overflow_error_message)); - } -} diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index bb224ae6..81389a48 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -148,7 +148,11 @@ Stampa completata - quantità inserita supera la quantità massima disponibile]]> + quantità inserita supera la quantità massima disponibile]]> + quantità per confezioni inserita non è valida]]> + numero di confezioni inserito supera la quantità massima disponibile]]> + quantità inserita supera la quantità ordinata]]> + numero di confezioni inserito supera la quantità ordinata]]> data di scadenza inserita non è valida]]> lotto inserito non è valido]]> Impostazioni diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e670aa47..f0dd36d8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -147,7 +147,11 @@ Printing job completed amount is not valid, please check it]]> - amount exceeds the maximum amount available, please check it]]> + package\'s quantity is not valid, please check it]]> + amount exceeds the maximum amount available, please check it]]> + package\'s amount exceeds the maximum amount available, please check it]]> + amount exceeds the total ordered amount, please check it]]> + package\'s amount exceeds the total ordered amount, please check it]]> expire date is not valid, please check it.]]> batch lot is not valid, please check it.]]> Settings