diff --git a/src/pages/pd-question/pd-question-assests/pd-question-assests.html b/src/pages/pd-question/pd-question-assests/pd-question-assests.html index 95f11d3c..69f6bbec 100755 --- a/src/pages/pd-question/pd-question-assests/pd-question-assests.html +++ b/src/pages/pd-question/pd-question-assests/pd-question-assests.html @@ -223,6 +223,7 @@
+
diff --git a/src/pages/pd-question/pd-question-banking/pd-question-banking.ts b/src/pages/pd-question/pd-question-banking/pd-question-banking.ts index 64a1b6bb..0e30cccd 100755 --- a/src/pages/pd-question/pd-question-banking/pd-question-banking.ts +++ b/src/pages/pd-question/pd-question-banking/pd-question-banking.ts @@ -82,7 +82,7 @@ export class PdQuestionBankingPage { this.qustCat.getcommondrop('BTLENDERLIST').subscribe( data => { if(data['dataStatus']==true){ - this.m_btLenderList = data['records'].filter(data => data.isactive == 1); + this.m_btLenderList = data['records'].filter(data => data.isactive == 1 && data.lender_type == 1); } }); this.qustCat.getCompaniesListsForBusiness(this.pdid).subscribe(data=>{ diff --git a/src/pages/pd-question/pd-question-general-info/pd-question-general-info.html b/src/pages/pd-question/pd-question-general-info/pd-question-general-info.html index d39e8add..526714c4 100755 --- a/src/pages/pd-question/pd-question-general-info/pd-question-general-info.html +++ b/src/pages/pd-question/pd-question-general-info/pd-question-general-info.html @@ -313,7 +313,7 @@
- +
Relationship of Individuals to Company / Firm diff --git a/src/pages/pd-question/pd-question-general-info/pd-question-general-info.ts b/src/pages/pd-question/pd-question-general-info/pd-question-general-info.ts index 1a410c5d..83e93176 100755 --- a/src/pages/pd-question/pd-question-general-info/pd-question-general-info.ts +++ b/src/pages/pd-question/pd-question-general-info/pd-question-general-info.ts @@ -81,6 +81,7 @@ export class PdQuestionGeneralInfoPage { //this.maxDate=new Date(get_max_date) this.FormId = this.navParams.get('FormId'); this.customer_segment_abbr = this.pdDetails.customer_segment_abbr; + console.log('this.customer_segment_abbr',this.customer_segment_abbr) this.users = this.aws.getlocale(); this.getdropdown(); @@ -877,19 +878,29 @@ console.log('1)',this.temp); } } - saveRecords.individuals=valuesData_indi; - saveRecords.companies=valuesData - saveRecords.pdid=answerData.pdid; - saveRecords.formid=answerData.formid; - saveRecords.fk_createdby=this.users; - - - saveRecords.persons_with_relationships=answerData.persons_with_relationships; + if (this.customer_segment_abbr != 'SE-RI') { + saveRecords.companies=valuesData saveRecords.company_with_relationships=answerData.company_with_relationships - saveRecords.general_remark=answerData.general_remark; - - - + saveRecords.rental_income_rcv_in_years = null; + saveRecords.rental_income_rcv_in_month = null; + //saveRecords.applicant_relation=answerData.applicant_relation; + } + else if (this.customer_segment_abbr == 'SE-RI') { + saveRecords.companies = []; + saveRecords.company_with_relationships = []; + saveRecords.rental_income_rcv_in_years = answerData.rental_income_rcv_in_years; + saveRecords.rental_income_rcv_in_month = answerData.rental_income_rcv_in_month; + //saveRecords.applicant_relation=answerData.applicant_relation; + } + + saveRecords.individuals=valuesData_indi; + // saveRecords.companies=valuesData + saveRecords.pdid=answerData.pdid; + saveRecords.formid=answerData.formid; + saveRecords.fk_createdby=this.users; + saveRecords.persons_with_relationships=answerData.persons_with_relationships; + // saveRecords.company_with_relationships=answerData.company_with_relationships + saveRecords.general_remark=answerData.general_remark; this.qustCat.saveForm(saveRecords).subscribe(dataResult=>{ if(dataResult['dataStatus']==true){