Browse Source

Validation rule fixes for local name

master
Preyea Regmi 5 years ago
parent
commit
fd26318cef
  1. 8
      app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientaddeditV3/dynamicvalidation/ValidationRuleModel.java
  2. 29
      app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientDetailValidaitorV3.java

8
app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientaddeditV3/dynamicvalidation/ValidationRuleModel.java

@ -96,7 +96,7 @@ public class ValidationRuleModel {
public String getFieldIsRequiredErrorMessage() {
return "";
return "Value cannot be empty";
}
@ -122,18 +122,18 @@ public class ValidationRuleModel {
}
private String validateMinLengthAndReturnErrorMessageOnFail(String value) {
if (value.length() > getMinFieldLengthInt())
if (value.length() >= getMinFieldLengthInt())
return null;
else
return getFieldLengthIsLessThanLowerBoundDefinedErrorMessage();
}
public String getFieldLengthIsLessThanLowerBoundDefinedErrorMessage() {
return null;
return "Value must be greater than "+getMinFieldLength()+" digits";
}
public String getFieldLengthIsGreaterThanUpperBoundDefinedErrorMessage() {
return null;
return "Value must be less or equal to "+getMaxFieldLength()+" digits";
}

29
app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientDetailValidaitorV3.java

@ -34,10 +34,10 @@ public class RecipientDetailValidaitorV3 {
throw new IllegalArgumentException("Validation rule cannot be null");
switch (rule.getField()) {
case FIELD_FULL_NAME:
case FIELD_FULL_NAME_LOCAL:
view.updateValueToWidgetFullName(recipientInfo.getName());
view.updateValidationRuleToWidgetFullName(rule.isFieldRequired(), rule.getKeyboardType().equalsIgnoreCase("ANS"), rule.getMaxFieldLengthInt());
validationRuleModelMap.put(FIELD_FULL_NAME,rule);
validationRuleModelMap.put(FIELD_FULL_NAME_LOCAL,rule);
break;
}
}
@ -45,17 +45,21 @@ public class RecipientDetailValidaitorV3 {
public void validateLocalName(String fullName)
{
ValidationRuleModel validationRuleModel=validationRuleModelMap.get(FIELD_FULL_NAME);
if(validationRuleModel!=null&&validationRuleModel.validateValueAndReturnErrorMessageOnFail(fullName)==null) {
recipientInfo.setName(fullName);
view.setErrorOnWidgetFullName(null);
validateAll();
}
else {
//Current implmentation will override existing information data
recipientInfo.setName("");
view.setErrorOnWidgetFullName("Field is required");
ValidationRuleModel validationRuleModel=validationRuleModelMap.get(FIELD_FULL_NAME_LOCAL);
if(validationRuleModel!=null) {
String error=validationRuleModel.validateValueAndReturnErrorMessageOnFail(fullName);
if(error==null) {
recipientInfo.setName(fullName);
view.setErrorOnWidgetFullName(null);
validateAll();
}
else {
//Current implmentation will override existing information data
recipientInfo.setName("");
view.setErrorOnWidgetFullName(error);
}
}
}
private void validateAll() {
@ -67,6 +71,7 @@ public class RecipientDetailValidaitorV3 {
}
public static final String FIELD_FULL_NAME="Full Name";
public static final String FIELD_FULL_NAME_LOCAL="Local Name";
public void validateAccountNo(String text) {

Loading…
Cancel
Save