diff --git a/app/src/main/assets/mockeddynamicvalidationfullresponse.json b/app/src/main/assets/mockeddynamicvalidationfullresponse.json index 018b84aa..6af0c4e1 100644 --- a/app/src/main/assets/mockeddynamicvalidationfullresponse.json +++ b/app/src/main/assets/mockeddynamicvalidationfullresponse.json @@ -32,7 +32,7 @@ "Field": "Full Name", "FieldRequired": "M", "MinLength": 1, - "MaxLength": 50, + "MaxLength": 10, "Keyboard": "ANS" }, { diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/gateway/recipientaddeditV3/RecipientAddV3Gateway.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/gateway/recipientaddeditV3/RecipientAddV3Gateway.java index 1ad87f62..53854689 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/gateway/recipientaddeditV3/RecipientAddV3Gateway.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/gateway/recipientaddeditV3/RecipientAddV3Gateway.java @@ -4,6 +4,7 @@ import android.content.Context; import com.gmeremit.online.gmeremittance_native.base.PrivilegedGateway; import com.gmeremit.online.gmeremittance_native.recipientV3.model.recipientaddeditV3.countryservice.CountryServiceModel; +import com.gmeremit.online.gmeremittance_native.recipientV3.model.recipientaddeditV3.dynamicvalidation.DynamicValidationModel; import com.gmeremit.online.gmeremittance_native.recipientV3.model.recipientaddeditV3.dynamicvalidation.ValidationRuleModel; import com.gmeremit.online.gmeremittance_native.utils.https.HttpClientV2; import com.google.gson.reflect.TypeToken; @@ -36,4 +37,10 @@ public class RecipientAddV3Gateway extends PrivilegedGateway implements Recipien String mockedCountryList =loadJSONFromAsset(context, "mockeddynamicvalidationsinglecase.json"); return HttpClientV2.getDeserializer().fromJson(mockedCountryList, TypeToken.getParameterized(List.class, ValidationRuleModel.class).getType()); } + + @Override + public DynamicValidationModel getMockedAllValidationRuleList(Context context) { + String mockedCountryList =loadJSONFromAsset(context, "mockeddynamicvalidationfullresponse.json"); + return HttpClientV2.getDeserializer().fromJson(mockedCountryList, TypeToken.getParameterized( DynamicValidationModel.class).getType()); + } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/gateway/recipientaddeditV3/RecipientAddV3GatewayInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/gateway/recipientaddeditV3/RecipientAddV3GatewayInterface.java index a6b95c4f..f8bb5333 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/gateway/recipientaddeditV3/RecipientAddV3GatewayInterface.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/gateway/recipientaddeditV3/RecipientAddV3GatewayInterface.java @@ -4,6 +4,7 @@ import android.content.Context; import com.gmeremit.online.gmeremittance_native.base.PrivilegedGatewayInterface; import com.gmeremit.online.gmeremittance_native.recipientV3.model.recipientaddeditV3.countryservice.CountryServiceModel; +import com.gmeremit.online.gmeremittance_native.recipientV3.model.recipientaddeditV3.dynamicvalidation.DynamicValidationModel; import com.gmeremit.online.gmeremittance_native.recipientV3.model.recipientaddeditV3.dynamicvalidation.ValidationRuleModel; import java.util.List; @@ -20,4 +21,6 @@ public interface RecipientAddV3GatewayInterface extends PrivilegedGatewayInterfa List getMockedCountryServiceDetail(Context context); List getMockedValidationRuleList(Context context); + + DynamicValidationModel getMockedAllValidationRuleList(Context context); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientaddeditV3/dynamicvalidation/DropDownDTO.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientaddeditV3/dynamicvalidation/DropDownDTO.java index 78993ae1..0c044833 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientaddeditV3/dynamicvalidation/DropDownDTO.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientaddeditV3/dynamicvalidation/DropDownDTO.java @@ -1,8 +1,30 @@ package com.gmeremit.online.gmeremittance_native.recipientV3.model.recipientaddeditV3.dynamicvalidation; -public class DropDownDTO { +import com.google.gson.annotations.Expose; +import com.google.gson.annotations.SerializedName; +public class DropDownDTO { + @SerializedName("id") + @Expose String id; + @SerializedName("text") + @Expose String text; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getText() { + return text; + } + + public void setText(String text) { + this.text = text; + } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientaddeditV3/dynamicvalidation/DynamicValidationModel.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientaddeditV3/dynamicvalidation/DynamicValidationModel.java index fb36359b..8acf6afa 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientaddeditV3/dynamicvalidation/DynamicValidationModel.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientaddeditV3/dynamicvalidation/DynamicValidationModel.java @@ -32,4 +32,51 @@ public class DynamicValidationModel { @Expose List proviences; + public List getValidationRuleList() { + return validationRuleList; + } + + public void setValidationRuleList(List validationRuleList) { + this.validationRuleList = validationRuleList; + } + + public List getTransferReasonList() { + return transferReasonList; + } + + public void setTransferReasonList(List transferReasonList) { + this.transferReasonList = transferReasonList; + } + + public List getRelationsList() { + return relationsList; + } + + public void setRelationsList(List relationsList) { + this.relationsList = relationsList; + } + + public List getReceiverIdTypeList() { + return receiverIdTypeList; + } + + public void setReceiverIdTypeList(List receiverIdTypeList) { + this.receiverIdTypeList = receiverIdTypeList; + } + + public List getPaymentBankList() { + return paymentBankList; + } + + public void setPaymentBankList(List paymentBankList) { + this.paymentBankList = paymentBankList; + } + + public List getProviences() { + return proviences; + } + + public void setProviences(List proviences) { + this.proviences = proviences; + } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientaddeditV3/dynamicvalidation/ValidationRuleModel.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientaddeditV3/dynamicvalidation/ValidationRuleModel.java index 60ffbedc..18286f0b 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientaddeditV3/dynamicvalidation/ValidationRuleModel.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientaddeditV3/dynamicvalidation/ValidationRuleModel.java @@ -17,10 +17,10 @@ public class ValidationRuleModel { private String fieldRequired; @SerializedName("MaxLength") @Expose - private String maxFieldLength; + private int maxFieldLength; @SerializedName("MinLength") @Expose - private String minFieldLength; + private int minFieldLength; @SerializedName("Keyboard") @Expose private String keyboardType; @@ -28,7 +28,7 @@ public class ValidationRuleModel { private boolean hasValidValue; - public ValidationRuleModel( String field, String fieldRequired, String maxFieldLength, String minFieldLength, String keyboardType) { + public ValidationRuleModel( String field, String fieldRequired, int maxFieldLength, int minFieldLength, String keyboardType) { this.field = field; this.fieldRequired = fieldRequired; this.maxFieldLength = maxFieldLength; @@ -69,35 +69,37 @@ public class ValidationRuleModel { } - public String getMaxFieldLength() { + public int getMaxFieldLength() { return maxFieldLength; } public Integer getMaxFieldLengthInt() { - if(maxFieldLength!=null&&maxFieldLength.length()>0) - return Integer.parseInt(maxFieldLength); - else - return 50; +// if(maxFieldLength!=null&&maxFieldLength.length()>0) +// return Integer.parseInt(maxFieldLength); +// else +// return 50; + return getMaxFieldLength(); } - public void setMaxFieldLength(String maxFieldLength) { + public void setMaxFieldLength(int maxFieldLength) { this.maxFieldLength = maxFieldLength; } - public String getMinFieldLength() { + public int getMinFieldLength() { return minFieldLength; } public Integer getMinFieldLengthInt() { - if(minFieldLength!=null&&minFieldLength.length()>0) - return Integer.parseInt(minFieldLength); - else - return 0; +// if(minFieldLength!=null&&minFieldLength.length()>0) +// return Integer.parseInt(minFieldLength); +// else +// return 0; + return getMinFieldLength(); } - public void setMinFieldLength(String minFieldLength) { + public void setMinFieldLength(int minFieldLength) { this.minFieldLength = minFieldLength; } 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 02ff687b..487ad151 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 @@ -7,6 +7,7 @@ import com.gmeremit.online.gmeremittance_native.customwidgets.exchangecountrylis import com.gmeremit.online.gmeremittance_native.recipientV3.gateway.recipientaddeditV3.RecipientAddV3GatewayInterface; import com.gmeremit.online.gmeremittance_native.recipientV3.model.recipientaddeditV3.countryservice.CountryServiceModel; import com.gmeremit.online.gmeremittance_native.recipientV3.model.recipientaddeditV3.countryservice.ServiceTypeModel; +import com.gmeremit.online.gmeremittance_native.recipientV3.model.recipientaddeditV3.dynamicvalidation.DynamicValidationModel; import com.gmeremit.online.gmeremittance_native.recipientV3.model.recipientaddeditV3.dynamicvalidation.ValidationRuleModel; import com.gmeremit.online.gmeremittance_native.recipientV3.presenter.recipientaddeditV3.RecipientAddV3ContractInterface; import com.gmeremit.online.gmeremittance_native.recipientV3.presenter.recipientaddeditV3.RecipientDetailValidatorV3; @@ -81,8 +82,11 @@ public class RecipientAddV3Presenter extends BasePresenter implements RecipientA } private void mockDynamicValidaitonList() { - List validationRuleList=this.gateway.getMockedValidationRuleList(view.getContext()); - applyValidationRulesToView(validationRuleList); +// List validationRuleList=this.gateway.getMockedValidationRuleList(view.getContext()); +// applyValidationRulesToView(validationRuleList); + + DynamicValidationModel validationModel=this.gateway.getMockedAllValidationRuleList(view.getContext()); + applyValidationRulesToView(validationModel.getValidationRuleList()); }