@ -421,8 +421,8 @@ public class RecipientDetailValidatorV3 {
/ / TODO RESET Bank dependency here
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 ) ;
validateAll ( ) ;
}
@ -454,8 +454,8 @@ public class RecipientDetailValidatorV3 {
/ / TODO Reset Province dependency here
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 ) ;
recipientInfo . setDistrictId ( null ) ;
@ -551,8 +551,7 @@ public class RecipientDetailValidatorV3 {
if ( isFieldRequired ) {
/ / TODO Update validate flag to true if has data
validationRuleModelMap . put ( FIELD_BANK_NAME , rule ) ;
}
else {
} else {
recipientInfo . setAgent ( null ) ;
}
break ;
@ -565,8 +564,7 @@ public class RecipientDetailValidatorV3 {
if ( isFieldRequired ) {
/ / TODO Update validate flag to true if has data
validationRuleModelMap . put ( FIELD_BRANCH_NAME , rule ) ;
}
else {
} else {
AgentV3Model agentV3Model = recipientInfo . getAgent ( ) ;
if ( agentV3Model ! = null ) {
agentV3Model . setBranch ( null ) ;
@ -583,8 +581,7 @@ public class RecipientDetailValidatorV3 {
if ( isFieldRequired ) {
/ / TODO Update validate flag to true if has data
validationRuleModelMap . put ( FIELD_ACCOUNT_NO , rule ) ;
}
else {
} else {
AgentV3Model agentV3Model = recipientInfo . getAgent ( ) ;
if ( agentV3Model ! = null ) {
agentV3Model . setAccountNo ( null ) ;
@ -600,8 +597,7 @@ public class RecipientDetailValidatorV3 {
if ( isFieldRequired ) {
/ / TODO Update validate flag to true if has data
validationRuleModelMap . put ( FIELD_ID_TYPE , rule ) ;
}
else {
} else {
recipientInfo . setIdType ( null ) ;
}
break ;
@ -614,8 +610,7 @@ public class RecipientDetailValidatorV3 {
if ( isFieldRequired ) {
/ / TODO Update validate flag to true if has data
validationRuleModelMap . put ( FIELD_ID_NUMBER , rule ) ;
}
else {
} else {
recipientInfo . setIdNumber ( null ) ;
}
break ;
@ -628,8 +623,7 @@ public class RecipientDetailValidatorV3 {
if ( isFieldRequired ) {
/ / TODO Update validate flag to true if has data
validationRuleModelMap . put ( FIELD_FIRST_NAME , rule ) ;
}
else {
} else {
recipientInfo . setFirstName ( null ) ;
}
break ;
@ -643,8 +637,7 @@ public class RecipientDetailValidatorV3 {
if ( isFieldRequired ) {
/ / TODO Update validate flag to true if has data
validationRuleModelMap . put ( FIELD_MIDDLE_NAME , rule ) ;
}
else {
} else {
recipientInfo . setMiddleName ( null ) ;
}
break ;
@ -658,8 +651,7 @@ public class RecipientDetailValidatorV3 {
if ( isFieldRequired ) {
/ / TODO Update validate flag to true if has data
validationRuleModelMap . put ( FIELD_LAST_NAME , rule ) ;
}
else {
} else {
recipientInfo . setLastName ( null ) ;
}
break ;
@ -671,12 +663,11 @@ public class RecipientDetailValidatorV3 {
EditTextConfigurationFactory . getKeyboardTypeFromKeyword ( rule . getKeyboardType ( ) , rule . isLocalKeyboardAllowed ( ) ,
rule . getMaxFieldLengthInt ( ) ) ) ;
if ( isFieldRequired ) {
if ( recipientInfo . getFullName ( ) ! = null & & recipientInfo . getFullName ( ) . length ( ) > 0 )
if ( recipientInfo . getFullName ( ) ! = null & & recipientInfo . getFullName ( ) . length ( ) > 0 )
rule . updateValidity ( true ) ;
validationRuleModelMap . put ( FIELD_FULL_NAME , rule ) ;
}
else {
} else {
recipientInfo . setFullName ( null ) ;
}
break ;
@ -689,8 +680,7 @@ public class RecipientDetailValidatorV3 {
if ( isFieldRequired ) {
/ / TODO Update validate flag to true if has data
validationRuleModelMap . put ( FIELD_FIRST_NAME_IN_LOCAL , rule ) ;
}
else {
} else {
recipientInfo . setLocalFirstName ( null ) ;
}
break ;
@ -703,8 +693,7 @@ public class RecipientDetailValidatorV3 {
if ( isFieldRequired ) {
/ / TODO Update validate flag to true if has data
validationRuleModelMap . put ( FIELD_MIDDLE_NAME_IN_LOCAL , rule ) ;
}
else {
} else {
recipientInfo . setLocalMiddleName ( null ) ;
}
break ;
@ -717,8 +706,7 @@ public class RecipientDetailValidatorV3 {
if ( isFieldRequired ) {
/ / TODO Update validate flag to true if has data
validationRuleModelMap . put ( FIELD_LAST_NAME_IN_LOCAL , rule ) ;
}
else {
} else {
recipientInfo . setLocalLastName ( null ) ;
}
break ;
@ -731,8 +719,7 @@ public class RecipientDetailValidatorV3 {
if ( isFieldRequired ) {
/ / TODO Update validate flag to true if has data
validationRuleModelMap . put ( FIELD_LOCAL_NAME , rule ) ;
}
else {
} else {
recipientInfo . setLocalFullName ( null ) ;
}
break ;
@ -745,8 +732,7 @@ public class RecipientDetailValidatorV3 {
if ( isFieldRequired ) {
/ / TODO Update validate flag to true if has data
validationRuleModelMap . put ( FIELD_MOBILE_NUMBER , rule ) ;
}
else {
} else {
recipientInfo . setMobile ( null ) ;
}
break ;
@ -759,8 +745,7 @@ public class RecipientDetailValidatorV3 {
if ( isFieldRequired ) {
/ / TODO Update validate flag to true if has data
validationRuleModelMap . put ( FIELD_PROVINCE , rule ) ;
}
else {
} else {
recipientInfo . setStateId ( null ) ;
recipientInfo . setState ( null ) ;
}
@ -774,8 +759,7 @@ public class RecipientDetailValidatorV3 {
if ( isFieldRequired ) {
/ / TODO Update validate flag to true if has data
validationRuleModelMap . put ( FIELD_DISTRICT , rule ) ;
}
else {
} else {
recipientInfo . setDistrictId ( null ) ;
recipientInfo . setDistrict ( null ) ;
}
@ -789,8 +773,7 @@ public class RecipientDetailValidatorV3 {
if ( isFieldRequired ) {
/ / TODO Update validate flag to true if has data
validationRuleModelMap . put ( FIELD_CITY , rule ) ;
}
else {
} else {
recipientInfo . setCity ( null ) ;
}
break ;
@ -817,9 +800,10 @@ public class RecipientDetailValidatorV3 {
EditTextConfigurationFactory . getKeyboardTypeFromKeyword ( rule . getKeyboardType ( ) , rule . isLocalKeyboardAllowed ( ) ,
rule . getMaxFieldLengthInt ( ) ) ) ;
if ( isFieldRequired ) {
/ / TODO Update validate flag to true if has data
validationRuleModelMap . put ( FIELD_REALATION_GROUP , rule ) ;
}
else {
} else {
recipientInfo . setRelationshipId ( null ) ;
recipientInfo . setRelationship ( null ) ;
}
@ -832,9 +816,11 @@ public class RecipientDetailValidatorV3 {
rule . getMaxFieldLengthInt ( ) ) ) ;
if ( isFieldRequired ) {
/ / TODO Update validate flag to true if has data
if ( checkStringNotEmpty ( recipientInfo . getPurposeOfRemitId ( ) ) )
rule . updateValidity ( true ) ;
validationRuleModelMap . put ( FIELD_TRANSFER_REASON , rule ) ;
}
else {
} else {
recipientInfo . setPurposeOfRemitId ( null ) ;
recipientInfo . setPurposeOfRemit ( null ) ;
}
@ -848,8 +834,7 @@ public class RecipientDetailValidatorV3 {
if ( isFieldRequired ) {
/ / TODO Update validate flag to true if has data
validationRuleModelMap . put ( FIELD_EMAIL , rule ) ;
}
else {
} else {
recipientInfo . setEmail ( null ) ;
}
break ;
@ -865,10 +850,10 @@ public class RecipientDetailValidatorV3 {
boolean areAllFormValid = true ;
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 ( ) ) {
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 ( ) ) {
areAllFormValid = false ;
break ;
@ -878,7 +863,7 @@ public class RecipientDetailValidatorV3 {
}
public void validateAllRequired FieldsExplicitly ( ) {
public void validateEditableData FieldsExplicitly ( ) {
updateSelectedCountryServiceData ( getSelectedCountryServiceFromCountryCode ( recipientInfo . getCountryCode ( ) ) ) ;
Iterator it = validationRuleModelMap . entrySet ( ) . iterator ( ) ;
@ -888,12 +873,12 @@ public class RecipientDetailValidatorV3 {
ValidationRuleModel rule = pair . getValue ( ) ;
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 :
@ -903,9 +888,9 @@ public class RecipientDetailValidatorV3 {
updateAccountNo ( recipientInfo . getAgent ( ) . getAccountNo ( ) ) ;
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 :
updateIdNumber ( recipientInfo . getIdNumber ( ) ) ;
@ -955,13 +940,13 @@ public class RecipientDetailValidatorV3 {
updateMobileNumber ( mobileNumber ) ;
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 :
updateCity ( recipientInfo . getCity ( ) ) ;
@ -971,13 +956,15 @@ public class RecipientDetailValidatorV3 {
updateAddress ( recipientInfo . getAddress ( ) ) ;
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 :
updateEmail ( recipientInfo . getEmail ( ) ) ;
@ -991,5 +978,4 @@ public class RecipientDetailValidatorV3 {
}
}