diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html index cd2bf8ef3..129953795 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html @@ -30,7 +30,7 @@ -

Loan Details

+

Loan Details

- + + {{"₹"}} {{amtInwords[i]}} Only {{freq.name}} - - + + + {{"₹"}} {{emiAmtInwords[i]}} Only @@ -56,16 +58,18 @@ - + - + {{owner.applicant_name}} - - + + + + @@ -73,17 +77,19 @@ - + - +
+ - + +
@@ -17,6 +18,7 @@ +
{{types.type_name}} @@ -27,17 +29,17 @@ - + - + Yes No - + @@ -54,23 +56,25 @@ - - + + - + Enter Valid Mobile Number. - - - Enter Valid STD Code. - - + + + + +91 + Enter Valid STD Code. + - - + Enter Valid Landline Number. - + @@ -82,17 +86,18 @@ - +

Period of Relationship

- + - + - + + {{"₹"}} {{amtInwords[r]}} Only @@ -102,6 +107,20 @@ + + + + Select + + {{remark.name}} + + + + + + + + @@ -122,7 +141,7 @@
Remarks - +
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 ce94b7288..f6324652d 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 @@ -16,12 +16,16 @@ export class NeighbourHoodComponent implements OnInit { form_id:number; private notifier: NotifierService; check_type:any=[{'id':0,'type_name':'Neighbourhood'},{'id':1,'type_name':'Reference Check'}] - default_reference_details: any= {'reference_name':'','mobile':'','landline':'-','location':'','relationship_with':'','year_relation_applicant':'','months_relation_applicant':'','business_volume_amount':'','business_volume_unit':''}; + default_reference_details: any= {'reference_name':'','mobile':'','landline':'-','location':'','relationship_with':'','year_relation_applicant':'','months_relation_applicant':'','business_volume_amount':'','business_volume_unit':'','reference_final_remarks':'','positive_remark':'','negative_remark':'','insufficient_info_remark':''}; default_neighbourhood_details: any= {'neighbourhood_name':'','do_know':'','how_long_do_know':'','is_applicant_owner':''}; busineesRelationshipList:any=[]; volumeunitList:any=[]; errorMessage:any; + finalRemarksList : any = [{'id': 1,'name': "Positive"}, + {'id': 2,'name': "Negative"}, + {'id': 3,'name': "Insufficient information provided"}]; + amtInwords : any = []; constructor(notifier: NotifierService, private _pd: PdTrigerService ,private _fb: FormBuilder, @Inject(MAT_DIALOG_DATA) public data: any,) { this.pdid = this.data.pdmaster_details.pd_id; this.notifier = notifier; @@ -90,7 +94,8 @@ export class NeighbourHoodComponent implements OnInit { }); } else if(exist_ref_details.length>0 && data.records.check_type==1){ - exist_ref_details.forEach(element => { + exist_ref_details.forEach((element,index) => { + this.amtInwords[index] = this._pd.convertNumberToWords(element.business_volume_amount); referencecheckControl.push(this.createReerenceCheck(element)); }); } @@ -143,6 +148,11 @@ 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], + reference_final_remarks:[elementValue.reference_final_remarks], + specify_final_remark : [elementValue.specify_final_remark], + // positive_remark:[elementValue.positive_remark], + // negative_remark:[elementValue.negative_remark], + // insufficient_info_remark:[elementValue.insufficient_info_remark] }); } @@ -229,6 +239,11 @@ 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, + "reference_final_remarks":element.reference_final_remarks, + "specify_final_remark":element.specify_final_remark + // "positive_remark":element.positive_remark, + // "negative_remark":element.negative_remark, + // "insufficient_info_remark":element.insufficient_info_remark }) }); saveRecords.referencecheck_list=referencecheck_list; @@ -268,7 +283,12 @@ validateAllFormFields(formGroup: any) { this.validateAllFormFields(control); } }); -} +} + + /** Amount InWords */ + inWords(e,i){ + this.amtInwords[i] = this._pd.convertNumberToWords(e.target.value); +} } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html index 14f8677f1..71273a104 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html @@ -31,32 +31,34 @@ -

Income Details

+

Income Details

- + - Rental Income + {{src.name}} + - - + - - + + + {{"₹"}} {{amtInwords[i]}} Only - + {{frq.name}} @@ -64,8 +66,8 @@ - - + @@ -83,7 +85,7 @@
- +
@@ -196,7 +198,7 @@
Remarks - +
@@ -241,7 +243,7 @@ --> - + @@ -261,7 +263,7 @@ - + @@ -289,12 +291,12 @@