From 883a2f82ee11a1323c172193e942c1a720e4b204 Mon Sep 17 00:00:00 2001 From: gayathri1990 Date: Thu, 11 Mar 2021 16:27:23 +0530 Subject: [PATCH] point 6 done --- .../financial-info.component.html | 32 +++++++++++++++++-- .../financial-info.component.ts | 30 ++++++++++++++--- .../loan-details/loan-details.component.html | 8 ++--- .../loan-details/loan-details.component.ts | 16 +++++----- 4 files changed, 67 insertions(+), 19 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html index 2421dc04d..8508d49b7 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html @@ -16,7 +16,7 @@
-
+
@@ -241,7 +241,7 @@
-
+
@@ -824,7 +824,33 @@ -->
- +
+ +

Financial Data

+
+ + + + + + + + + + + + + + + + + +

Working Capital Facilities availed

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts index 3c7a29e1c..36efeac6d 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts @@ -101,6 +101,7 @@ export class FinancialInfoComponent implements OnInit { }, ] fk_pd_type: any; + financial: string; constructor(notifier: NotifierService, private fb: FormBuilder, @@ -119,6 +120,10 @@ export class FinancialInfoComponent implements OnInit { this.main_applicant = this.pd_all_details.pdmaster_details.main_applicant; this.lender_applicant_id = this.pd_all_details.pdmaster_details.lender_applicant_id; this.lender_short_name = this.pd_all_details.pdmaster_details.lender_short_name; + if(this.lender_short_name=='CFPL') + { + this.financial='no'; + } this.product_abbr = this.pd_all_details.pdmaster_details.product_abbr; this.prod_catagory = this.pd_all_details.pdmaster_details.prod_catagory; this.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; @@ -154,7 +159,7 @@ export class FinancialInfoComponent implements OnInit { ngOnInit() { - console.log(this.av); + this.initstockForm(); if(this.lender_short_name == "IIB"){ this.financialForm.addControl('tot_business_FY',new FormControl()) @@ -163,13 +168,22 @@ export class FinancialInfoComponent implements OnInit { } if(this.lender_short_name == 'CFPL') { - + /* for check box view based on cfpl */ this.av.push({id:8,name:'Name of Lender'}); this.av.push({id:9,name:'Loan amount'}); this.av.push({id:10,name:'Loan Type'}); this.av.push({id:11,name:'Loan Tenor'}); this.av.push({id:12,name:'Loan start date'}); this.av.push({id:13,name:'Monthly obligation-Interest/EMI'}); + /*--------------------------*/ + + /*for financial data */ + this.financialForm.addControl('turnover_lastcomplete_year',new FormControl()) + this.financialForm.addControl('ytd_turnover',new FormControl()) + this.financialForm.addControl('deptor_collection_period',new FormControl()) + this.financialForm.addControl('inventory_holding_period',new FormControl()) + this.financialForm.addControl('creditor_payment_period',new FormControl()) + /*--------------------------*/ } if(this.customer_segment_abbr == "SE-DI"){ this.financialForm.addControl('kuccha_records_shown',new FormControl()) @@ -2104,7 +2118,7 @@ export class FinancialInfoComponent implements OnInit { if(records.od_limit) delete records.od_limit; if(records.other_reason_for_working_capital_facilities_availed) delete records.other_reason_for_working_capital_facilities_availed ; if(records.reason_for_working_capital_facilities_availed) delete records.reason_for_working_capital_facilities_availed ; - if(this.lender_short_name='CFPL') + if(this.lender_short_name=='CFPL') { if(records.lender_name) delete records.lender_name ; if(records.loan_amount) delete records.loan_amount; @@ -2112,7 +2126,15 @@ export class FinancialInfoComponent implements OnInit { if(records.loan_tenor) delete records.loan_tenor; if(records.loan_start_date) delete records.loan_start_date; if(records.monthly_emi) delete records.monthly_emi; - } + /* for remove control */ + if(records.turnover_lastcomplete_year) delete records.turnover_lastcomplete_year; + if(records.ytd_turnover) delete records.ytd_turnover; + if(records.deptor_collection_period) delete records.deptor_collection_period; + if(records.inventory_holding_period) delete records.inventory_holding_period; + if(records.creditor_payment_period) delete records.creditor_payment_period; + /*-----------------------*/ + + } } this._pd.saveForm(records).subscribe(data => { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html index 103bc9fe4..829d2c01e 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html @@ -406,7 +406,7 @@ + formControlName="sales_low_months" required> January February March @@ -421,14 +421,14 @@ December - In Which Period Is Maximum Sale / Service Done Required + In Which Period Is Maximum Sale / Service Done Required
- - Comments Required + Comments Required