IME-LONDON
/
Android_London
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Validation fixes

master
Preyea Regmi 5 years ago
parent
13b232dbdb
commit
fe7d1a0dc0
2 changed files with 58 additions and 72 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 126
      app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java
  2. 4
      app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/edit/RecipientEditV3Presenter.java

126
app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java
View File

@ -421,8 +421,8 @@ public class RecipientDetailValidatorV3 {
//TODO RESET Bank dependency here //TODO RESET Bank dependency here
view.updateValueToWidgetAccountNo(recipientInfo.getAgent().getAccountNo()); view.updateValueToWidgetAccountNo(recipientInfo.getAgent().getAccountNo());
ValidationRuleModel branchValidationRule= validationRuleModelMap.get(FIELD_BRANCH_NAME);
if(branchValidationRule!=null&&branchValidationRule.isFieldRequired())
ValidationRuleModel branchValidationRule = validationRuleModelMap.get(FIELD_BRANCH_NAME);
if (branchValidationRule != null && branchValidationRule.isFieldRequired())
branchValidationRule.updateValidity(false); branchValidationRule.updateValidity(false);
validateAll(); validateAll();
} }
@ -454,8 +454,8 @@ public class RecipientDetailValidatorV3 {
//TODO Reset Province dependency here //TODO Reset Province dependency here
view.updateValueToWidgetDistrict(null); view.updateValueToWidgetDistrict(null);
ValidationRuleModel districtValidationRule= validationRuleModelMap.get(FIELD_DISTRICT);
if(districtValidationRule!=null&&districtValidationRule.isFieldRequired()) {
ValidationRuleModel districtValidationRule = validationRuleModelMap.get(FIELD_DISTRICT);
if (districtValidationRule != null && districtValidationRule.isFieldRequired()) {
districtValidationRule.updateValidity(false); districtValidationRule.updateValidity(false);
recipientInfo.setDistrictId(null); recipientInfo.setDistrictId(null);
@ -551,8 +551,7 @@ public class RecipientDetailValidatorV3 {
if (isFieldRequired) { if (isFieldRequired) {
//TODO Update validate flag to true if has data //TODO Update validate flag to true if has data
validationRuleModelMap.put(FIELD_BANK_NAME, rule); validationRuleModelMap.put(FIELD_BANK_NAME, rule);
}
else {
} else {
recipientInfo.setAgent(null); recipientInfo.setAgent(null);
} }
break; break;
@ -565,8 +564,7 @@ public class RecipientDetailValidatorV3 {
if (isFieldRequired) { if (isFieldRequired) {
//TODO Update validate flag to true if has data //TODO Update validate flag to true if has data
validationRuleModelMap.put(FIELD_BRANCH_NAME, rule); validationRuleModelMap.put(FIELD_BRANCH_NAME, rule);
}
else {
} else {
AgentV3Model agentV3Model = recipientInfo.getAgent(); AgentV3Model agentV3Model = recipientInfo.getAgent();
if (agentV3Model != null) { if (agentV3Model != null) {
agentV3Model.setBranch(null); agentV3Model.setBranch(null);
@ -583,8 +581,7 @@ public class RecipientDetailValidatorV3 {
if (isFieldRequired) { if (isFieldRequired) {
//TODO Update validate flag to true if has data //TODO Update validate flag to true if has data
validationRuleModelMap.put(FIELD_ACCOUNT_NO, rule); validationRuleModelMap.put(FIELD_ACCOUNT_NO, rule);
}
else {
} else {
AgentV3Model agentV3Model = recipientInfo.getAgent(); AgentV3Model agentV3Model = recipientInfo.getAgent();
if (agentV3Model != null) { if (agentV3Model != null) {
agentV3Model.setAccountNo(null); agentV3Model.setAccountNo(null);
@ -600,8 +597,7 @@ public class RecipientDetailValidatorV3 {
if (isFieldRequired) { if (isFieldRequired) {
//TODO Update validate flag to true if has data //TODO Update validate flag to true if has data
validationRuleModelMap.put(FIELD_ID_TYPE, rule); validationRuleModelMap.put(FIELD_ID_TYPE, rule);
}
else {
} else {
recipientInfo.setIdType(null); recipientInfo.setIdType(null);
} }
break; break;
@ -614,8 +610,7 @@ public class RecipientDetailValidatorV3 {
if (isFieldRequired) { if (isFieldRequired) {
//TODO Update validate flag to true if has data //TODO Update validate flag to true if has data
validationRuleModelMap.put(FIELD_ID_NUMBER, rule); validationRuleModelMap.put(FIELD_ID_NUMBER, rule);
}
else {
} else {
recipientInfo.setIdNumber(null); recipientInfo.setIdNumber(null);
} }
break; break;
@ -628,8 +623,7 @@ public class RecipientDetailValidatorV3 {
if (isFieldRequired) { if (isFieldRequired) {
//TODO Update validate flag to true if has data //TODO Update validate flag to true if has data
validationRuleModelMap.put(FIELD_FIRST_NAME, rule); validationRuleModelMap.put(FIELD_FIRST_NAME, rule);
}
else {
} else {
recipientInfo.setFirstName(null); recipientInfo.setFirstName(null);
} }
break; break;
@ -643,8 +637,7 @@ public class RecipientDetailValidatorV3 {
if (isFieldRequired) { if (isFieldRequired) {
//TODO Update validate flag to true if has data //TODO Update validate flag to true if has data
validationRuleModelMap.put(FIELD_MIDDLE_NAME, rule); validationRuleModelMap.put(FIELD_MIDDLE_NAME, rule);
}
else {
} else {
recipientInfo.setMiddleName(null); recipientInfo.setMiddleName(null);
} }
break; break;
@ -658,8 +651,7 @@ public class RecipientDetailValidatorV3 {
if (isFieldRequired) { if (isFieldRequired) {
//TODO Update validate flag to true if has data //TODO Update validate flag to true if has data
validationRuleModelMap.put(FIELD_LAST_NAME, rule); validationRuleModelMap.put(FIELD_LAST_NAME, rule);
}
else {
} else {
recipientInfo.setLastName(null); recipientInfo.setLastName(null);
} }
break; break;
@ -671,12 +663,11 @@ public class RecipientDetailValidatorV3 {
EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(),
rule.getMaxFieldLengthInt())); rule.getMaxFieldLengthInt()));
if (isFieldRequired) { if (isFieldRequired) {
if(recipientInfo.getFullName()!=null&&recipientInfo.getFullName().length()>0)
if (recipientInfo.getFullName() != null && recipientInfo.getFullName().length() > 0)
rule.updateValidity(true); rule.updateValidity(true);
validationRuleModelMap.put(FIELD_FULL_NAME, rule); validationRuleModelMap.put(FIELD_FULL_NAME, rule);
}
else {
} else {
recipientInfo.setFullName(null); recipientInfo.setFullName(null);
} }
break; break;
@ -689,8 +680,7 @@ public class RecipientDetailValidatorV3 {
if (isFieldRequired) { if (isFieldRequired) {
//TODO Update validate flag to true if has data //TODO Update validate flag to true if has data
validationRuleModelMap.put(FIELD_FIRST_NAME_IN_LOCAL, rule); validationRuleModelMap.put(FIELD_FIRST_NAME_IN_LOCAL, rule);
}
else {
} else {
recipientInfo.setLocalFirstName(null); recipientInfo.setLocalFirstName(null);
} }
break; break;
@ -703,8 +693,7 @@ public class RecipientDetailValidatorV3 {
if (isFieldRequired) { if (isFieldRequired) {
//TODO Update validate flag to true if has data //TODO Update validate flag to true if has data
validationRuleModelMap.put(FIELD_MIDDLE_NAME_IN_LOCAL, rule); validationRuleModelMap.put(FIELD_MIDDLE_NAME_IN_LOCAL, rule);
}
else {
} else {
recipientInfo.setLocalMiddleName(null); recipientInfo.setLocalMiddleName(null);
} }
break; break;
@ -717,8 +706,7 @@ public class RecipientDetailValidatorV3 {
if (isFieldRequired) { if (isFieldRequired) {
//TODO Update validate flag to true if has data //TODO Update validate flag to true if has data
validationRuleModelMap.put(FIELD_LAST_NAME_IN_LOCAL, rule); validationRuleModelMap.put(FIELD_LAST_NAME_IN_LOCAL, rule);
}
else {
} else {
recipientInfo.setLocalLastName(null); recipientInfo.setLocalLastName(null);
} }
break; break;
@ -731,8 +719,7 @@ public class RecipientDetailValidatorV3 {
if (isFieldRequired) { if (isFieldRequired) {
//TODO Update validate flag to true if has data //TODO Update validate flag to true if has data
validationRuleModelMap.put(FIELD_LOCAL_NAME, rule); validationRuleModelMap.put(FIELD_LOCAL_NAME, rule);
}
else {
} else {
recipientInfo.setLocalFullName(null); recipientInfo.setLocalFullName(null);
} }
break; break;
@ -745,8 +732,7 @@ public class RecipientDetailValidatorV3 {
if (isFieldRequired) { if (isFieldRequired) {
//TODO Update validate flag to true if has data //TODO Update validate flag to true if has data
validationRuleModelMap.put(FIELD_MOBILE_NUMBER, rule); validationRuleModelMap.put(FIELD_MOBILE_NUMBER, rule);
}
else {
} else {
recipientInfo.setMobile(null); recipientInfo.setMobile(null);
} }
break; break;
@ -759,8 +745,7 @@ public class RecipientDetailValidatorV3 {
if (isFieldRequired) { if (isFieldRequired) {
//TODO Update validate flag to true if has data //TODO Update validate flag to true if has data
validationRuleModelMap.put(FIELD_PROVINCE, rule); validationRuleModelMap.put(FIELD_PROVINCE, rule);
}
else {
} else {
recipientInfo.setStateId(null); recipientInfo.setStateId(null);
recipientInfo.setState(null); recipientInfo.setState(null);
} }
@ -774,8 +759,7 @@ public class RecipientDetailValidatorV3 {
if (isFieldRequired) { if (isFieldRequired) {
//TODO Update validate flag to true if has data //TODO Update validate flag to true if has data
validationRuleModelMap.put(FIELD_DISTRICT, rule); validationRuleModelMap.put(FIELD_DISTRICT, rule);
}
else {
} else {
recipientInfo.setDistrictId(null); recipientInfo.setDistrictId(null);
recipientInfo.setDistrict(null); recipientInfo.setDistrict(null);
} }
@ -789,8 +773,7 @@ public class RecipientDetailValidatorV3 {
if (isFieldRequired) { if (isFieldRequired) {
//TODO Update validate flag to true if has data //TODO Update validate flag to true if has data
validationRuleModelMap.put(FIELD_CITY, rule); validationRuleModelMap.put(FIELD_CITY, rule);
}
else {
} else {
recipientInfo.setCity(null); recipientInfo.setCity(null);
} }
break; break;
@ -817,9 +800,10 @@ public class RecipientDetailValidatorV3 {
EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(), EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(),
rule.getMaxFieldLengthInt())); rule.getMaxFieldLengthInt()));
if (isFieldRequired) { if (isFieldRequired) {
//TODO Update validate flag to true if has data
validationRuleModelMap.put(FIELD_REALATION_GROUP, rule); validationRuleModelMap.put(FIELD_REALATION_GROUP, rule);
}
else {
} else {
recipientInfo.setRelationshipId(null); recipientInfo.setRelationshipId(null);
recipientInfo.setRelationship(null); recipientInfo.setRelationship(null);
} }
@ -832,9 +816,11 @@ public class RecipientDetailValidatorV3 {
rule.getMaxFieldLengthInt())); rule.getMaxFieldLengthInt()));
if (isFieldRequired) { if (isFieldRequired) {
//TODO Update validate flag to true if has data //TODO Update validate flag to true if has data
if (checkStringNotEmpty(recipientInfo.getPurposeOfRemitId()))
rule.updateValidity(true);
validationRuleModelMap.put(FIELD_TRANSFER_REASON, rule); validationRuleModelMap.put(FIELD_TRANSFER_REASON, rule);
}
else {
} else {
recipientInfo.setPurposeOfRemitId(null); recipientInfo.setPurposeOfRemitId(null);
recipientInfo.setPurposeOfRemit(null); recipientInfo.setPurposeOfRemit(null);
} }
@ -848,8 +834,7 @@ public class RecipientDetailValidatorV3 {
if (isFieldRequired) { if (isFieldRequired) {
//TODO Update validate flag to true if has data //TODO Update validate flag to true if has data
validationRuleModelMap.put(FIELD_EMAIL, rule); validationRuleModelMap.put(FIELD_EMAIL, rule);
}
else {
} else {
recipientInfo.setEmail(null); recipientInfo.setEmail(null);
} }
break; break;
@ -865,10 +850,10 @@ public class RecipientDetailValidatorV3 {
boolean areAllFormValid = true; boolean areAllFormValid = true;
Iterator it = validationRuleModelMap.entrySet().iterator(); Iterator it = validationRuleModelMap.entrySet().iterator();
Log.d(ValidationRuleModel.class.getSimpleName().toString(), "Validation rule size is : "+validationRuleModelMap.size());
Log.d(ValidationRuleModel.class.getSimpleName().toString(), "Validation rule size is : " + validationRuleModelMap.size());
while (it.hasNext()) { while (it.hasNext()) {
Map.Entry<String, ValidationRuleModel> pair = (Map.Entry) it.next(); Map.Entry<String, ValidationRuleModel> pair = (Map.Entry) it.next();
Log.d(ValidationRuleModel.class.getSimpleName().toString(), "Validation status for " + pair.getValue().getField()+" is : "+pair.getValue().hasValidValue());
Log.d(ValidationRuleModel.class.getSimpleName().toString(), "Validation status for " + pair.getValue().getField() + " is : " + pair.getValue().hasValidValue());
if (!pair.getValue().hasValidValue()) { if (!pair.getValue().hasValidValue()) {
areAllFormValid = false; areAllFormValid = false;
break; break;
@ -878,7 +863,7 @@ public class RecipientDetailValidatorV3 {
} }
public void validateAllRequiredFieldsExplicitly() {
public void validateEditableDataFieldsExplicitly() {
updateSelectedCountryServiceData(getSelectedCountryServiceFromCountryCode(recipientInfo.getCountryCode())); updateSelectedCountryServiceData(getSelectedCountryServiceFromCountryCode(recipientInfo.getCountryCode()));
Iterator it = validationRuleModelMap.entrySet().iterator(); Iterator it = validationRuleModelMap.entrySet().iterator();
@ -888,12 +873,12 @@ public class RecipientDetailValidatorV3 {
ValidationRuleModel rule = pair.getValue(); ValidationRuleModel rule = pair.getValue();
switch (rule.getField()) { switch (rule.getField()) {
case FIELD_BANK_NAME:
break;
case FIELD_BRANCH_NAME:
break;
// case FIELD_BANK_NAME:
// break;
//
// case FIELD_BRANCH_NAME:
//
// break;
case FIELD_ACCOUNT_NO: case FIELD_ACCOUNT_NO:
@ -903,9 +888,9 @@ public class RecipientDetailValidatorV3 {
updateAccountNo(recipientInfo.getAgent().getAccountNo()); updateAccountNo(recipientInfo.getAgent().getAccountNo());
break; break;
case FIELD_ID_TYPE:
updateIdType(getAvailableDynamicValidationModel().getIDTypeFromId(recipientInfo.getIdType()));
break;
// case FIELD_ID_TYPE:
// updateIdType(getAvailableDynamicValidationModel().getIDTypeFromId(recipientInfo.getIdType()));
// break;
case FIELD_ID_NUMBER: case FIELD_ID_NUMBER:
updateIdNumber(recipientInfo.getIdNumber()); updateIdNumber(recipientInfo.getIdNumber());
@ -955,13 +940,13 @@ public class RecipientDetailValidatorV3 {
updateMobileNumber(mobileNumber); updateMobileNumber(mobileNumber);
break; break;
case FIELD_PROVINCE:
updateProvince(getAvailableDynamicValidationModel().getProvinceFromId(recipientInfo.getStateId()));
break;
// case FIELD_PROVINCE:
// updateProvince(getAvailableDynamicValidationModel().getProvinceFromId(recipientInfo.getStateId()));
// break;
case FIELD_DISTRICT:
updateDistrict(getAvailableDynamicValidationModel().getDistrictFromId(recipientInfo.getStateId(), recipientInfo.getDistrictId()));
break;
// case FIELD_DISTRICT:
// updateDistrict(getAvailableDynamicValidationModel().getDistrictFromId(recipientInfo.getStateId(), recipientInfo.getDistrictId()));
// break;
case FIELD_CITY: case FIELD_CITY:
updateCity(recipientInfo.getCity()); updateCity(recipientInfo.getCity());
@ -971,13 +956,15 @@ public class RecipientDetailValidatorV3 {
updateAddress(recipientInfo.getAddress()); updateAddress(recipientInfo.getAddress());
break; break;
case FIELD_REALATION_GROUP:
updateRelation(getAvailableDynamicValidationModel().getRelationFromId(recipientInfo.getRelationshipId()));
break;
case FIELD_TRANSFER_REASON:
updateTransfer(getAvailableDynamicValidationModel().getTransferReasonFromId(recipientInfo.getPurposeOfRemitId()));
break;
// case FIELD_REALATION_GROUP:
// updateRelation(getAvailableDynamicValidationModel().getRelationFromId(recipientInfo.getRelationshipId()));
// break;
//
// case FIELD_TRANSFER_REASON:
// updateTransfer(getAvailableDynamicValidationModel().getTransferReasonFromId(recipientInfo.getPurposeOfRemitId()));
// break;
case FIELD_EMAIL: case FIELD_EMAIL:
updateEmail(recipientInfo.getEmail()); updateEmail(recipientInfo.getEmail());
@ -991,5 +978,4 @@ public class RecipientDetailValidatorV3 {
} }
} }

4
app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/edit/RecipientEditV3Presenter.java
View File

@ -171,7 +171,7 @@ public class RecipientEditV3Presenter extends RecipientAddEditBaseV3Presenter im
mockDynamicValidationList(); mockDynamicValidationList();
validator.validateAllRequiredFieldsExplicitly();
validator.validateEditableDataFieldsExplicitly();
} }
@ -330,7 +330,7 @@ public class RecipientEditV3Presenter extends RecipientAddEditBaseV3Presenter im
//Map existing data to view and validator //Map existing data to view and validator
applyValidationRulesToView(data.getData().getValidationRuleList()); applyValidationRulesToView(data.getData().getValidationRuleList());
// validator.validateAllRequiredFieldsExplicitly();
validator.validateEditableDataFieldsExplicitly();
} else { } else {
view.showPopUpMessage(data.getMsg(), CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView()); view.showPopUpMessage(data.getMsg(), CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView());

Write Preview
Loading…
Cancel
Save