Browse Source

Validation rule added for optional

master
Preyea Regmi 5 years ago
parent
commit
06776fdc51
  1. 5
      app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientaddeditV3/dynamicvalidation/ValidationRuleModel.java
  2. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java

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

@ -58,7 +58,10 @@ public class ValidationRuleModel {
}
public Boolean isFieldRequired() {
return "M".equalsIgnoreCase(fieldRequired);
return "M".equalsIgnoreCase(fieldRequired)||isOptional();
}
public Boolean isOptional() {
return "O".equalsIgnoreCase(fieldRequired);
}
public void setFieldRequired(String fieldRequired) {

2
app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java

@ -649,7 +649,7 @@ public class RecipientDetailValidatorV3 {
EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(),
rule.getMaxFieldLengthInt()));
if (isFieldRequired) {
if (checkStringNotEmpty(recipientInfo.getMiddleName()))
if (checkStringNotEmpty(recipientInfo.getMiddleName())||rule.isOptional())
rule.updateValidity(true);
validationRuleModelMap.put(FIELD_MIDDLE_NAME, rule);
} else {

Loading…
Cancel
Save