From 4c4104bf38b7c8fe8d37a104a121e5d5edd87b7b Mon Sep 17 00:00:00 2001 From: Preyea Regmi Date: Thu, 22 Aug 2019 13:13:39 +0900 Subject: [PATCH] Before adding dropdownlist data --- .../ReceiverInfoV3Model.java | 7 ++++-- .../RecipientDetailValidatorV3.java | 25 +++++++++---------- .../add/RecipientAddV3Presenter.java | 2 +- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientlistingV3/ReceiverInfoV3Model.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientlistingV3/ReceiverInfoV3Model.java index 99aef8ef..e3c378fa 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientlistingV3/ReceiverInfoV3Model.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientlistingV3/ReceiverInfoV3Model.java @@ -509,9 +509,12 @@ public class ReceiverInfoV3Model implements Parcelable { }; - public void updateSelectedCountryAndClearOtherData(CountryServiceModel selectedCountry) + + public void updateSelectedCountryAndClearRelatedData(CountryServiceModel selectedCountry) { - clearAllData(); + //TODO clear realted data + this.setPaymentMethod(null); + this.country = selectedCountry.getCountryName(); this.countryId = selectedCountry.getCountryId(); this.countryCode = selectedCountry.getCountryCode(); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java index 842b5355..9c8439e2 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java @@ -42,12 +42,14 @@ public class RecipientDetailValidatorV3 { public RecipientDetailValidatorV3(RecipientAddV3ContractInterface view, ReceiverInfoV3Model receiverInfoV3Model) { - if (receiverInfoV3Model == null) { - receiverInfoV3Model = new ReceiverInfoV3Model(); - } + if (receiverInfoV3Model == null) + this.recipientInfo = new ReceiverInfoV3Model(); + else + this.recipientInfo = receiverInfoV3Model; + this.view = view; - this.recipientInfo = receiverInfoV3Model; validationRuleModelMap = new HashMap<>(); + mockTestinData(); } private void mockTestinData() { @@ -148,12 +150,10 @@ public class RecipientDetailValidatorV3 { case FIELD_FULL_NAME: //TODO Add Respective value when avialable in reciever info - mockTestinData(); if (recipientInfo.getFullName() != null && recipientInfo.getFullName().length() > 0) { rule.updateValidity(true); view.updateValueToWidgetFullName(recipientInfo.getFullName()); - } - else { + } else { rule.updateValidity(false); view.updateValueToWidgetFullName(""); } @@ -298,10 +298,9 @@ public class RecipientDetailValidatorV3 { Iterator it = validationRuleModelMap.entrySet().iterator(); while (it.hasNext()) { - Map.Entry pair = (Map.Entry)it.next(); - if(!pair.getValue().hasValidValue()) - { - areAllFormValid=false; + Map.Entry pair = (Map.Entry) it.next(); + if (!pair.getValue().hasValidValue()) { + areAllFormValid = false; break; } } @@ -536,11 +535,11 @@ public class RecipientDetailValidatorV3 { } public void validateFullName(String text) { - Log.d(RecipientAddEditV3Activity.TAG,"Full name validation called"); + Log.d(RecipientAddEditV3Activity.TAG, "Full name validation called"); ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_FULL_NAME); if (validationRuleModel != null) { String error = validationRuleModel.validateValueAndReturnErrorMessageOnFail(text); - Log.d(RecipientAddEditV3Activity.TAG,"Full name validation result :"+error); + Log.d(RecipientAddEditV3Activity.TAG, "Full name validation result :" + error); if (error == null) { validationRuleModel.updateValidity(true); recipientInfo.setName(text); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/add/RecipientAddV3Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/add/RecipientAddV3Presenter.java index 336163a8..02ff687b 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/add/RecipientAddV3Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/add/RecipientAddV3Presenter.java @@ -145,7 +145,7 @@ public class RecipientAddV3Presenter extends BasePresenter implements RecipientA @Override public void onCountryServiceSelected(CountryServiceModel selectedCountry) { this.selectedCountry=selectedCountry; - validator.getRecipientDetail().updateSelectedCountryAndClearOtherData(selectedCountry); + validator.getRecipientDetail().updateSelectedCountryAndClearRelatedData(selectedCountry); view.updateValueToWidgetSelectedCountry(selectedCountry.getCountryName()); view.showSelectedCountryFlag(CountryFlagMapper.getFlagFromCountryCode(selectedCountry.getCountryCode())); view.updateValueToWidgetSelectedPaymentMethod(null);