From eadd513906375464ada92b9d45c9b196d2e69bd4 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 10 Jan 2019 10:50:30 +0530 Subject: [PATCH] merge : kms --- .../forms/assets-info/assets-info.component.ts | 8 ++++---- .../forms/banking-details/banking-details.component.ts | 10 +++++----- .../forms/business-info/business-info.component.html | 4 ++-- .../forms/business-info/business-info.component.ts | 10 +++++----- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts index 914044d14..6a788532c 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts @@ -694,8 +694,8 @@ public m_investmentType = []; }); result.forEach((datas,index) => { - this.OtherAppxMarketAmtInwords[index] = this.pdTrigerService.convertNumberToWords(datas.approximate_market_value); - this.OtherEmiAmtInwords[index] = this.pdTrigerService.convertNumberToWords(datas.emi_paid); + this.OtherAppxMarketAmtInwords[index] = this.pdTrigerService.convertNumberToWords(+datas.approximate_market_value); + this.OtherEmiAmtInwords[index] = this.pdTrigerService.convertNumberToWords(+datas.emi_paid); }); if (result.length > 0) { @@ -730,8 +730,8 @@ public m_investmentType = []; if (result.length > 0) { result.forEach((datas,index) => { - this.appxMarketAmtInwords[index] = this.pdTrigerService.convertNumberToWords(datas.business_approximate_market_value); - this.emiAmtInwords[index] = this.pdTrigerService.convertNumberToWords(datas.business_emi_paid); + this.appxMarketAmtInwords[index] = this.pdTrigerService.convertNumberToWords(+datas.business_approximate_market_value); + this.emiAmtInwords[index] = this.pdTrigerService.convertNumberToWords(+datas.business_emi_paid); }); for (let val of result) { 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 3238505df..94b6b7488 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 @@ -104,9 +104,9 @@ export class BankingDetailsComponent implements OnInit { control.push(this.createBankarray()); } else { result.forEach((datas,index) => { - this.amtInwords[index] = this._pd.convertNumberToWords(datas.limit); + this.amtInwords[index] = this._pd.convertNumberToWords(+datas.limit); this.selectedBorrower(datas.applicant_name,index); - this.selectedAccTypeChanges(datas.account_type,index) + this.selectedAccTypeChanges(+datas.account_type,index) // this.emiAmtInwords[index] = this._pd.convertNumberToWords(val.emi); control.push(this.createBankarray()); @@ -230,10 +230,10 @@ export class BankingDetailsComponent implements OnInit { if(event == 2 || event == 1) { this.limitCaseFlag[i] = false; - const control = this.bankingForm.controls['itemRows']; + // const control = this.bankingForm.controls['itemRows']; - control.controls[0].get('limit').clearValidators(); - control.controls[0].get('limit').updateValueAndValidity(); + // control.controls[0].get('limit').clearValidators(); + // control.controls[0].get('limit').updateValueAndValidity(); } else{ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html index 2ccadebb9..da3344fdf 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html @@ -1207,8 +1207,8 @@ - - {{"₹"}} {{InvestedAmountInWords}} Only + +