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

Validation rule fixed for edit

master
Preyea Regmi 5 years ago
parent
06fafe673e
commit
eba1b8f145
5 changed files with 65 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/recipientadd/RecipientAddV2Presenter.java
  2. 6
      app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientaddeditV3/dynamicvalidation/DropDownDTO.java
  3. 12
      app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientaddeditV3/dynamicvalidation/DynamicValidationModel.java
  4. 28
      app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientAddEditBaseV3Presenter.java
  5. 64
      app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java

2
app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/recipientadd/RecipientAddV2Presenter.java
View File

@ -103,7 +103,7 @@ public class RecipientAddV2Presenter extends BasePresenter implements RecipientA
isValid = false;
// if (!validateIdType(idType))
// isValid = false;
// if (!validateIdNumber(idNumber))
// if (!updateIdNumber(idNumber))
// isValid = false;
return isValid;

6
app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientaddeditV3/dynamicvalidation/DropDownDTO.java
View File

@ -12,6 +12,12 @@ public class DropDownDTO {
@Expose
String text;
public DropDownDTO(String id, String text) {
this.id = id;
this.text = text;
}
public String getId() {
return id;
}

12
app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientaddeditV3/dynamicvalidation/DynamicValidationModel.java
View File

@ -113,4 +113,16 @@ public class DynamicValidationModel {
}
return null;
}
public DropDownDTO getTransferReasonFromId(String purposeOfRemitId) {
if(purposeOfRemitId==null||purposeOfRemitId.length()<1||transferReasonList==null)
return null;
for(DropDownDTO transferReason:transferReasonList)
{
if(purposeOfRemitId.equalsIgnoreCase(transferReason.getId()))
return transferReason;
}
return null;
}
}

28
app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientAddEditBaseV3Presenter.java
View File

@ -138,76 +138,76 @@ public abstract class RecipientAddEditBaseV3Presenter extends BasePresenter impl
@Override
public void onRecipientAccountNoChanged(String text) {
validator.validateAccountNo(text);
validator.updateAccountNo(text);
}
@Override
public void onRecipientFirstNameChanged(String text) {
validator.validateFirstName(text);
validator.updateFirstName(text);
}
@Override
public void onRecipientMiddleNameChanged(String text) {
validator.validateMiddleName(text);
validator.updateMiddleName(text);
}
@Override
public void onRecipientLastNameChanged(String text) {
validator.validateLastName(text);
validator.updateLastName(text);
}
@Override
public void onRecipientLocalFullNameChanged(String recipientName) {
validator.validateLocalFullName(recipientName);
validator.updateLocalFullName(recipientName);
}
@Override
public void onRecipientCityChanged(String text) {
validator.validateCity(text);
validator.updateCity(text);
}
@Override
public void onRecipientAddressChanged(String text) {
validator.validateAddress(text);
validator.updateAddress(text);
}
@Override
public void onRecipientMobileNumberChanged(String text) {
validator.validateMobileNumber(text);
validator.updateMobileNumber(text);
}
@Override
public void onRecipientEmailChanged(String text) {
validator.validateEmail(text);
validator.updateEmail(text);
}
@Override
public void onRecipientIdNumberChanged(String text) {
validator.validateIdNumber(text);
validator.updateIdNumber(text);
}
@Override
public void onRecipientLocalFirstNameChanged(String text) {
validator.validateFirstNameLocal(text);
validator.updateFirstNameLocal(text);
}
@Override
public void onRecipientLocalMiddleNameChanged(String text) {
validator.validateMiddleNameLocal(text);
validator.updateMiddleNameLocal(text);
}
@Override
public void onRecipientLocalLastNameChanged(String text) {
validator.validateLastNameLocal(text);
validator.updateLastNameLocal(text);
}
@Override
public void onRecipientFullNameChanged(String text) {
validator.validateFullName(text);
validator.updateFullName(text);
}

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

@ -341,7 +341,6 @@ public class RecipientDetailValidatorV3 {
}
public void validateAllRequiredFieldsExplicitly() {
boolean areAllFormValid = true;
Iterator it = validationRuleModelMap.entrySet().iterator();
while (it.hasNext()) {
@ -361,9 +360,9 @@ public class RecipientDetailValidatorV3 {
case FIELD_ACCOUNT_NO:
if (recipientInfo.getAgent() == null)
validateAccountNo(null);
updateAccountNo(null);
else
validateAccountNo(recipientInfo.getAgent().getAccountNo());
updateAccountNo(recipientInfo.getAgent().getAccountNo());
break;
case FIELD_ID_TYPE:
@ -371,46 +370,46 @@ public class RecipientDetailValidatorV3 {
break;
case FIELD_ID_NUMBER:
validateIdNumber(recipientInfo.getIdNumber());
updateIdNumber(recipientInfo.getIdNumber());
break;
case FIELD_FIRST_NAME:
validateFirstName(recipientInfo.getFirstName());
updateFirstName(recipientInfo.getFirstName());
break;
case FIELD_MIDDLE_NAME:
validateMiddleName(recipientInfo.getMiddleName());
updateMiddleName(recipientInfo.getMiddleName());
break;
case FIELD_LAST_NAME:
validateLastName(recipientInfo.getLastName());
updateLastName(recipientInfo.getLastName());
break;
case FIELD_FULL_NAME:
validateFullName(recipientInfo.getFullName());
updateFullName(recipientInfo.getFullName());
break;
case FIELD_FIRST_NAME_IN_LOCAL:
validateFirstNameLocal(recipientInfo.getLocalFirstName());
updateFirstNameLocal(recipientInfo.getLocalFirstName());
break;
case FIELD_MIDDLE_NAME_IN_LOCAL:
validateMiddleNameLocal(recipientInfo.getLocalMiddleName());
updateMiddleNameLocal(recipientInfo.getLocalMiddleName());
break;
case FIELD_LAST_NAME_IN_LOCAL:
validateLastName(recipientInfo.getLocalLastName());
updateLastName(recipientInfo.getLocalLastName());
break;
case FIELD_LOCAL_NAME:
validateLocalFullName(recipientInfo.getLocalFullName());
updateLocalFullName(recipientInfo.getLocalFullName());
break;
case FIELD_MOBILE_NUMBER:
validateMobileNumber(recipientInfo.getMobile());
updateMobileNumber(recipientInfo.getMobile());
break;
case FIELD_PROVINCE:
@ -422,30 +421,29 @@ public class RecipientDetailValidatorV3 {
break;
case FIELD_CITY:
validateCity(recipientInfo.getCity());
updateCity(recipientInfo.getCity());
break;
case FIELD_ADDRESS:
validateAddress(recipientInfo.getAddress());
updateAddress(recipientInfo.getAddress());
break;
case FIELD_REALATION_GROUP:
break;
case FIELD_TRANSFER_REASON:
updateTransfer(getAvailableDynamicValidationModel().getTransferReasonFromId(recipientInfo.getPurposeOfRemitId()));
break;
case FIELD_EMAIL:
validateEmail(recipientInfo.getEmail());
updateEmail(recipientInfo.getEmail());
break;
}
}
}
public void validateAccountNo(String text) {
public void updateAccountNo(String text) {
ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_ACCOUNT_NO);
if (validationRuleModel != null) {
String error = validationRuleModel.validateValueAndReturnErrorMessageOnFail(text);
@ -461,7 +459,7 @@ public class RecipientDetailValidatorV3 {
}
}
public void validateFirstName(String text) {
public void updateFirstName(String text) {
ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_FIRST_NAME);
if (validationRuleModel != null) {
@ -480,7 +478,7 @@ public class RecipientDetailValidatorV3 {
}
}
public void validateMiddleName(String text) {
public void updateMiddleName(String text) {
ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_MIDDLE_NAME);
if (validationRuleModel != null) {
String error = validationRuleModel.validateValueAndReturnErrorMessageOnFail(text);
@ -498,7 +496,7 @@ public class RecipientDetailValidatorV3 {
}
}
public void validateLastName(String text) {
public void updateLastName(String text) {
ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_LAST_NAME);
if (validationRuleModel != null) {
String error = validationRuleModel.validateValueAndReturnErrorMessageOnFail(text);
@ -516,7 +514,7 @@ public class RecipientDetailValidatorV3 {
}
}
public void validateFullName(String text) {
public void updateFullName(String text) {
ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_FULL_NAME);
@ -536,7 +534,7 @@ public class RecipientDetailValidatorV3 {
}
}
public void validateCity(String text) {
public void updateCity(String text) {
ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_CITY);
if (validationRuleModel != null) {
@ -555,7 +553,7 @@ public class RecipientDetailValidatorV3 {
}
}
public void validateAddress(String text) {
public void updateAddress(String text) {
ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_ADDRESS);
if (validationRuleModel != null) {
@ -574,7 +572,7 @@ public class RecipientDetailValidatorV3 {
}
}
public void validateMobileNumber(String text) {
public void updateMobileNumber(String text) {
ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_MOBILE_NUMBER);
if (validationRuleModel != null) {
@ -593,7 +591,7 @@ public class RecipientDetailValidatorV3 {
}
}
public void validateEmail(String text) {
public void updateEmail(String text) {
ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_EMAIL);
if (validationRuleModel != null) {
@ -611,7 +609,7 @@ public class RecipientDetailValidatorV3 {
}
}
public void validateIdNumber(String text) {
public void updateIdNumber(String text) {
ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_ID_NUMBER);
if (validationRuleModel != null) {
@ -630,7 +628,7 @@ public class RecipientDetailValidatorV3 {
}
}
public void validateFirstNameLocal(String text) {
public void updateFirstNameLocal(String text) {
ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_FIRST_NAME_IN_LOCAL);
if (validationRuleModel != null) {
@ -649,7 +647,7 @@ public class RecipientDetailValidatorV3 {
}
}
public void validateMiddleNameLocal(String text) {
public void updateMiddleNameLocal(String text) {
ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_MIDDLE_NAME_IN_LOCAL);
if (validationRuleModel != null) {
@ -668,7 +666,7 @@ public class RecipientDetailValidatorV3 {
}
}
public void validateLastNameLocal(String text) {
public void updateLastNameLocal(String text) {
ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_LAST_NAME_IN_LOCAL);
if (validationRuleModel != null) {
@ -687,7 +685,7 @@ public class RecipientDetailValidatorV3 {
}
}
public void validateLocalFullName(String fullName) {
public void updateLocalFullName(String fullName) {
ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_LOCAL_NAME);
if (validationRuleModel != null) {
String error = validationRuleModel.validateValueAndReturnErrorMessageOnFail(fullName);
@ -757,6 +755,8 @@ public class RecipientDetailValidatorV3 {
}
public void updateTransfer(DropDownDTO selectedTransferReason) {
if (selectedTransferReason == null)
return;
ValidationRuleModel validationRuleModel = validationRuleModelMap.get(FIELD_TRANSFER_REASON);
if (validationRuleModel != null) {
recipientInfo.updateTransferReason(selectedTransferReason);

Write Preview
Loading…
Cancel
Save