From f4b7b44a81528fa580ccb7c65f2c27d3b758488e Mon Sep 17 00:00:00 2001 From: malinowskikam Date: Fri, 8 Oct 2021 13:07:47 +0200 Subject: [PATCH] OP-436: Added support for TotalAmount value M --- app/src/main/assets/pages/Premium.js | 2 +- .../openimis/imispolicies/NotEnrolledPoliciesOverview.java | 5 ++--- .../java/org/openimis/imispolicies/OverViewPolicies.java | 6 ++---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/app/src/main/assets/pages/Premium.js b/app/src/main/assets/pages/Premium.js index 46eb8160..e277c053 100644 --- a/app/src/main/assets/pages/Premium.js +++ b/app/src/main/assets/pages/Premium.js @@ -3,7 +3,7 @@ $(document).ready(function () { document.title = Android.getString('AddEditPremium'); var adj = Android.getSpecificControlHtml("TotalAmount"); - if (adj == "R") { + if (adj == "M" || adj == "R") { $('#txtAmount').attr('readonly', 'readonly'); } diff --git a/app/src/main/java/org/openimis/imispolicies/NotEnrolledPoliciesOverview.java b/app/src/main/java/org/openimis/imispolicies/NotEnrolledPoliciesOverview.java index 8c62e50e..b4eca735 100644 --- a/app/src/main/java/org/openimis/imispolicies/NotEnrolledPoliciesOverview.java +++ b/app/src/main/java/org/openimis/imispolicies/NotEnrolledPoliciesOverview.java @@ -309,9 +309,8 @@ public void trackBox(final JSONObject policies, String Number) { addListenerOnSpinnerItemSelection(paymentType); finalAmount.setText(Number); - if (clientAndroidInterface.getSpecificControl("TotalAmount").equals("R")) { - finalAmount.setEnabled(false); - } + String totalAmountControl = clientAndroidInterface.getSpecificControl("TotalAmount"); + finalAmount.setEnabled(!"M".equals(totalAmountControl) && !"R".equals(totalAmountControl)); // set dialog message alertDialogBuilder diff --git a/app/src/main/java/org/openimis/imispolicies/OverViewPolicies.java b/app/src/main/java/org/openimis/imispolicies/OverViewPolicies.java index 7ce7c2c4..9b6fe7f3 100644 --- a/app/src/main/java/org/openimis/imispolicies/OverViewPolicies.java +++ b/app/src/main/java/org/openimis/imispolicies/OverViewPolicies.java @@ -301,10 +301,8 @@ public void trackBox(final JSONObject policies, String Number) { addItemsOnSpinner2(payment_type); addListenerOnSpinnerItemSelection(payment_type); - amount.setText(Number); - if (clientAndroidInterface.getSpecificControl("TotalAmount").equals("R")) { - amount.setEnabled(false); - } + String totalAmountControl = clientAndroidInterface.getSpecificControl("TotalAmount"); + amount.setEnabled(!"M".equals(totalAmountControl) && !"R".equals(totalAmountControl)); // set dialog message alertDialogBuilder