From 46f7cba39f6ada5b38ce74498ba8cfcdff947504 Mon Sep 17 00:00:00 2001 From: venbaSriram Date: Tue, 1 Jan 2019 15:46:32 +0530 Subject: [PATCH] Changes : ps --- .../forms/address/address.component.html | 4 +- .../forms/address/address.component.ts | 9 +++ .../banking-details.component.html | 73 ++++++++++--------- .../banking-details.component.ts | 70 +++++++++++++----- .../neighbour-hood.component.html | 20 ++--- .../neighbour-hood.component.ts | 16 ++++ 6 files changed, 128 insertions(+), 64 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html index 494caa4a8..264e07082 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html @@ -113,10 +113,10 @@
- + - +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts index 3800fb290..b622d1efd 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts @@ -507,4 +507,13 @@ export class AddressComponent implements OnInit { this.addressForm.controls.business_month.setValue(Math.floor(converted_month)); } + /** On Key Press Event For Numbers */ + keyPress(event: any) { + const pattern = /[0-9]/; + + let inputChar = String.fromCharCode(event.charCode); + if (event.keyCode != 8 && !pattern.test(inputChar)) { + event.preventDefault(); + } + } } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html index 7da90f6ca..5f49171f5 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html @@ -95,25 +95,22 @@ - - + {{owner.applicant_name}} - - - + + + + --> + + --> @@ -121,13 +118,13 @@ - - + {{ prop.name }} - - - - Yes - No - NA - - - - - - + - - Yes - No - + + Yes + No + + +
+ + + Yes + No + NA + + + + + + {{"₹"}} {{amtInwords[i]}} Only + +
+ -->

- + - +
-
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts index d80b9fcfd..186ecba17 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts @@ -38,6 +38,10 @@ export class BankingDetailsComponent implements OnInit { m_accountType= []; m_btLenderList = []; salaryField : boolean; + OtherFlag : any = []; + limitCaseFlag : any = []; + amtInwords : any = []; + emiAmtInwords : any = []; constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute, private router: Router, @@ -99,7 +103,12 @@ export class BankingDetailsComponent implements OnInit { if (result.length == 0) { control.push(this.createBankarray()); } else { - result.forEach(datas => { + result.forEach((datas,index) => { + this.amtInwords[index] = this._pd.convertNumberToWords(datas.limit); + this. selectedBorrower(datas.applicant_name,index); + this.selectedAccTypeChanges(datas.account_type,index) + + // this.emiAmtInwords[index] = this._pd.convertNumberToWords(val.emi); control.push(this.createBankarray()); }); this.bankingForm.controls.itemRows.setValue(result); @@ -210,31 +219,58 @@ export class BankingDetailsComponent implements OnInit { }); } - selectedAccTypeChanges(event: any){ - // console.log('First Time',event); - // console.log('First Time Value',event.value); - if(event.value == 2) { + selectedBorrower(e,i){ + if(e == 0){ + this.OtherFlag[i] = true; + } + else{ + this.OtherFlag[i] = false; + } + } + + selectedAccTypeChanges(event: any,i){ + + if(event == 2 || event == 1) { + this.limitCaseFlag[i] = false; + const control = this.bankingForm.controls['itemRows']; - // console.log('Inside If Condition'); - // console.log(control); - // console.log(control.controls); - + control.controls[0].get('limit').clearValidators(); control.controls[0].get('limit').updateValueAndValidity(); - - //this.loanDetailsForm.controls['is_topup'].setValidators([Validators.required]); - // this.bankingForm.controls['itemRows']. - // this.bankingForm.controls.get('limit').clearValidators(); - // this.bankingForm.controls.itemRows['controls'].get('limit').updateValueAndValidity(); - // const control = this.bankingForm.controls['itemRows']; - // console.log(control.controls['limit'].value); } else{ - //alert('sd'); + this.limitCaseFlag[i] = true; } } + /** To Convert Month into Year */ + ConvertMonthintoYear(itemrow,e){ + //console.log(itemrow); + + let year = itemrow.controls.vintage_year.value; + + let converted_month : number = e%12; + let converted_year : number = e/12; + + itemrow.controls.vintage_year.setValue(+year + +Math.floor(converted_year)); + itemrow.controls.vintage_month.setValue(Math.floor(converted_month)); + + } + + /** Amount InWords */ + inWords(e,i,flag){ + switch(flag){ + case 1 : + this.amtInwords[i] = this._pd.convertNumberToWords(e.target.value); + break; + case 2 : + this.emiAmtInwords[i] = this._pd.convertNumberToWords(e.target.value); + break; + default: + break; + } + } /** On Key Press Event For Numbers */ keyPress(event: any) { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html index afd68848a..9b8fbcc65 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html @@ -56,16 +56,15 @@ - + Enter Valid Mobile Number. - - + +91 Enter Valid STD Code. - @@ -86,14 +85,14 @@ - +

Period of Relationship

- - + + - + @@ -107,8 +106,11 @@ + + + - + Select @@ -116,7 +118,7 @@ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts index f6324652d..80a3a679a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts @@ -148,6 +148,7 @@ export class NeighbourHoodComponent implements OnInit { months_relation_applicant:[elementValue.months_relation_applicant,Validators.required], business_volume_amount:[elementValue.business_volume_amount,Validators.required], business_volume_unit:[elementValue.business_volume_unit, Validators.required], + others_unit : [elementValue.others_unit], reference_final_remarks:[elementValue.reference_final_remarks], specify_final_remark : [elementValue.specify_final_remark], // positive_remark:[elementValue.positive_remark], @@ -239,6 +240,7 @@ export class NeighbourHoodComponent implements OnInit { "months_relation_applicant":element.months_relation_applicant, "business_volume_amount":element.business_volume_amount, "business_volume_unit":element.business_volume_unit, + "others_unit":element.others_unit, "reference_final_remarks":element.reference_final_remarks, "specify_final_remark":element.specify_final_remark // "positive_remark":element.positive_remark, @@ -283,6 +285,20 @@ validateAllFormFields(formGroup: any) { this.validateAllFormFields(control); } }); +} + + /** To Convert Month into Year */ + ConvertMonthintoYear(itemrow,e){ + console.log(itemrow); + console.log(e); + let year = itemrow.controls.year_relation_applicant.value; + + let converted_month : number = e%12; + let converted_year : number = e/12; + + itemrow.controls.year_relation_applicant.setValue(+year + +Math.floor(converted_year)); + itemrow.controls.months_relation_applicant.setValue(Math.floor(converted_month)); + } /** Amount InWords */