From a739a8431419ec5d1466178f75fed3ad7b0ffaa8 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 25 Jan 2019 18:22:15 +0530 Subject: [PATCH 1/2] performance issues changes --- ng6-seed/package.json | 2 +- .../manage-pd/list-pd/all-pd/all-pd.component.html | 4 ++-- .../manage-pd/list-pd/all-pd/all-pd.component.ts | 4 ++-- .../list-pd/completed-pd/completed-pd.component.html | 4 ++-- .../manage-pd/list-pd/completed-pd/completed-pd.component.ts | 2 +- .../list-pd/inprogress-pd/inprogress-pd.component.html | 4 ++-- .../list-pd/inprogress-pd/inprogress-pd.component.ts | 2 +- .../list-pd/qc-completed-pd/qc-completed-pd.component.html | 4 ++-- .../list-pd/qc-completed-pd/qc-completed-pd.component.ts | 2 +- .../list-pd/scheduled-pd/scheduled-pd.component.html | 4 ++-- .../manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ng6-seed/package.json b/ng6-seed/package.json index 30b3524cf..e3df6f50e 100755 --- a/ng6-seed/package.json +++ b/ng6-seed/package.json @@ -23,7 +23,7 @@ "@angular/forms": "^6.0.0-rc.5", "@angular/http": "^6.0.0-rc.5", "@angular/material": "^6.0.0-rc.5", - "@angular/material-moment-adapter": "^7.1.1", + "@angular/material-moment-adapter": "^6.0.0-rc.5", "@angular/platform-browser": "^6.0.0-rc.5", "@angular/platform-browser-dynamic": "^6.0.0-rc.5", "@angular/router": "^6.0.0-rc.5", diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html index 66a483b14..c7df44004 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html @@ -1,5 +1,5 @@ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts index 797aaf8e5..956eff2f8 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts @@ -48,7 +48,7 @@ export class AllPdComponent implements OnInit, OnChanges { pageEvent: PageEvent; constructor(private _pd: PdTrigerService,private _fb:FormBuilder) { - + this.searchForm = this._fb.group( { pd_type:[null], @@ -66,7 +66,7 @@ export class AllPdComponent implements OnInit, OnChanges { ngOnInit() { this.recordStatus=false; // this.loadPDDetails(); - this.getcommonDropDown(); + //this.getcommonDropDown(); } ngAfterViewInit() { this.dataSourceTab1.paginator = this.paginator; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html index 636d06a12..e78ff84b5 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html @@ -1,6 +1,6 @@ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts index cdb1fc207..7c2f35772 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts @@ -66,7 +66,7 @@ export class CompletedPdComponent implements OnInit, OnChanges { ngOnInit() { this.recordStatus=false; // this.loadPDDetails(); - this.getcommonDropDown(); + // this.getcommonDropDown(); } ngAfterViewInit() { this.dataSourceTab4.paginator = this.paginator; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html index c5ee76270..11b419a2d 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html @@ -1,5 +1,5 @@ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts index fd001d504..7ddb7474a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts @@ -60,7 +60,7 @@ export class InprogressPdComponent implements OnInit, OnChanges { ngOnInit() { this.recordStatus=false; // this.loadPDDetails(); - this.getcommonDropDown(); + // this.getcommonDropDown(); } ngAfterViewInit() { this.dataSourceTab2.paginator = this.paginator; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html index 869792c14..6b7d3eec3 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html @@ -1,5 +1,5 @@ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts index b2de54cbf..6794173ad 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts @@ -64,7 +64,7 @@ export class QcCompletedPdComponent implements OnInit, OnChanges { ngOnInit() { this.recordStatus = false; // this.loadPDDetails(); - this.getcommonDropDown(); + // this.getcommonDropDown(); } ngAfterViewInit() { this.dataSourceTab5.paginator = this.paginator; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html index 776b9a9c0..ea306cf58 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html @@ -1,5 +1,5 @@ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts index 299a747e5..ddcdbe726 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts @@ -61,7 +61,7 @@ export class ScheduledPdComponent implements OnInit, OnChanges { ngOnInit() { this.recordStatus=false; // this.loadPDDetails(); - this.getcommonDropDown(); + //this.getcommonDropDown(); } ngAfterViewInit() { this.dataSourceTab3.paginator = this.paginator; From 5f7f6733445b1d331ca7dd8bd783b403eff28cf1 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 25 Jan 2019 18:22:58 +0530 Subject: [PATCH 2/2] merge : kms --- .../list-pd/add-pd/add-pd.component.html | 4 +- .../list-pd/add-pd/add-pd.component.scss | 6 +- .../edit-pd-master.component.html | 6 +- .../edit-pd-master.component.scss | 6 +- .../forms/address/address.component.ts | 16 +- .../assets-info/assets-info.component.ts | 24 +-- .../banking-details.component.ts | 26 ++- .../business-assets-info.component.ts | 15 +- .../business-banking-details.component.ts | 8 + .../business-info.component.html | 16 -- .../business-info/business-info.component.ts | 2 +- .../current-loan/current-loan.component.html | 13 +- .../current-loan/current-loan.component.ts | 106 +++++++++-- .../family-details.component.html | 26 ++- .../family-details.component.ts | 172 +++++++++++++----- .../final-remarks.component.html | 16 ++ .../final-remarks/final-remarks.component.ts | 4 +- .../financial-info.component.ts | 18 +- .../loan-details/loan-details.component.html | 31 ++-- .../loan-details/loan-details.component.ts | 100 +++++----- .../other-income/other-income.component.html | 11 +- .../other-income/other-income.component.ts | 14 +- .../start-pd/forms/stock/stock.component.html | 81 ++++----- .../list-pd/view-pd/view-pd.component.html | 2 +- .../pd-service/pd-triger.service.ts | 30 ++- 25 files changed, 505 insertions(+), 248 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html index 04a1deb12..63fa86d57 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html @@ -39,7 +39,7 @@ - + @@ -121,7 +121,7 @@ - {{"₹"}} {{loanAmtInWords}} Only + {{"₹"}} {{loanAmtInWords}} Only Enter valid amount. diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.scss index b559b3c47..aab0f0fad 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.scss @@ -1,3 +1,7 @@ mat-form-field { margin: 0 2%; - } \ No newline at end of file + } +.mat-form-field-appearance-legacy .mat-hint{ + color:rgba(0, 0, 0, 0.8) !important; +} + \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html index 74244878b..b7a2efc1a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html @@ -32,7 +32,7 @@ - + @@ -109,7 +109,7 @@ - {{"₹"}} {{loanAmtInWords}} Only + {{"₹"}} {{loanAmtInWords}} Only Enter valid amount. @@ -123,7 +123,7 @@ Select - {{SL.state_name}} + {{SL.name}} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.scss index d03494e25..e592fb882 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.scss @@ -11,4 +11,8 @@ mat-form-field { } mat-dialog-actions{ border-top: 2px solid #e00201; - } \ No newline at end of file + } + +.mat-form-field-appearance-legacy .mat-hint{ + color:rgba(0, 0, 0, 0.8) !important; +} 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 4c6af9b66..2b7d33f9a 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 @@ -288,10 +288,20 @@ export class AddressComponent implements OnInit { this.localityData.push(val); } else if(type==5 && val.isactive == 1){ - if(this.CustSegAbbr == 'SENP' || this.CustSegAbbr == 'SEP'){ - val.filter(at => at.address_type != 'Residence' && at.address_type != 'Residence cum Office'); - } + this.addressData.push(val); + + console.log('b4val',this.addressData); + if(this.CustSegAbbr == 'SENP' || this.CustSegAbbr == 'SEP'){ + console.log(this.CustSegAbbr); + console.log('inside if',this.addressData); + this.addressData.filter(element =>element.address_type == 'Residence'); + this.addressData.filter(element =>element.address_type == 'Residence cum Office'); + console.log('inside if 2',this.addressData); + } + + console.log('aftrval',this.addressData); + } else if(type==6 && val.isactive == 1){ this.ownerShipData.push(val); 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 ac7fc409e..a68e5175a 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 @@ -107,20 +107,20 @@ export class AssetsInfoComponent implements OnInit { // this.pdTrigerService.getTypeofActivityForSuppliedInfoForm(this.pdid,'').subscribe(data => { // this.businessProfessionName = (data.status == 200) ? data.records.profession_name : '' ; // }); - // this.pdTrigerService.getCompaniesListsForBusiness(this.pdid).subscribe(data=>{ - // if(data.dataStatus){ - // this.existCompanyList = data.records.filter(val =>val.is_active===true && val.is_company_applicant===true); - // } + this.pdTrigerService.getCompaniesListsForBusiness(this.pdid).subscribe(data=>{ + if(data.dataStatus){ + this.existCompanyList = data.records.filter(val =>val.is_active===true && val.is_company_applicant===true); + } - // let modifyCompanyList : any=[]; - // if(this.existCompanyList.length>0){ - // modifyCompanyList = this.existCompanyList.map(element => { - // return {id:element.company_order_id.toString(),name:element.company_name,group_id:1}; - // }); - // this.mergeCompanyApplicant.push({groupName:'COMPANIES',groupValues:modifyCompanyList}) - // } + let modifyCompanyList : any=[]; + if(this.existCompanyList.length>0){ + modifyCompanyList = this.existCompanyList.map(element => { + return {id:element.company_order_id.toString(),name:element.company_name,group_id:1}; + }); + this.mergeCompanyApplicant.push({groupName:'COMPANIES',groupValues:modifyCompanyList}) + } - // }) + }) // get applicant list let modifyApplicantList: any=[]; if(this.applicants.length > 0){ 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 e8721a0d7..10675856c 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 @@ -35,6 +35,7 @@ export class BankingDetailsComponent implements OnInit { private notifier: NotifierService; public pd_cus_segment:string; public applicants: any; + public companies: any; m_accountType= []; m_btLenderList = []; salaryField : boolean; @@ -56,8 +57,8 @@ export class BankingDetailsComponent implements OnInit { this.pd_cus_segment = this.pd_cus_segment.substring(0,3); this.applicants = this.pd_all_details.pdapplicants_detials; this.applicants = this.applicants.filter(val=>val.applicant_type==0 || val.applicant_type==1) - this.applicants.push({'pd_co_applicant_id':'0','applicant_name':'Others'}); + this.companies = this.pd_all_details.pdapplicants_detials.filter(val=>val.applicant_type==2) this.notifier = notifier; } @@ -85,7 +86,22 @@ export class BankingDetailsComponent implements OnInit { ngOnInit() { this.step = 0; this.initBankingForm(); + this._pd.getCompaniesListsForBusiness(this.pdid).subscribe(data=>{ + if(data.dataStatus){ + this.existCompanyList = data.records.filter(val =>val.is_active===true); + } + + let modifyCompanyList : any=[]; + if(this.existCompanyList.length>0){ + modifyCompanyList = this.existCompanyList.map(element => { + return {id:element.company_order_id.toString(),name:element.company_name,group_id:1}; + }); + this.mergeCompanyApplicant.push({groupName:'COMPANIES',groupValues:modifyCompanyList}) + } + + }); let modifyApplicantList: any=[]; + if(this.applicants.length > 0){ modifyApplicantList = this.applicants.map(element => { return {id:element.pd_co_applicant_id,name:element.applicant_name,group_id:2}; @@ -93,6 +109,14 @@ export class BankingDetailsComponent implements OnInit { this.mergeCompanyApplicant.push({groupName:'APPLICANTS',groupValues:modifyApplicantList}) } + // let modifyCompanyList : any=[]; + // if(this.companies.length>0){ + // modifyCompanyList = this.companies.map(element => { + // return {id:element.pd_co_applicant_id,name:element.applicant_name,group_id:1}; + // }); + // this.mergeCompanyApplicant.push({groupName:'COMPANIES',groupValues:modifyCompanyList}) + + // } this.getM_AccountType(); this.getM_BTLenderList(); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts index 247cade65..bf87eb34d 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts @@ -72,6 +72,7 @@ export class BusinessAssetsInfoComponent implements OnInit { @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.applicants = this.pd_all_details.pdapplicants_detials; + this.applicants = this.applicants.filter(appt=>appt.applicant_type != 2) this.applicants.push({'pd_co_applicant_id':'0','applicant_name':'Others'}); this.company_id =this.pd_all_details.company_id; this.notifier = notifier; @@ -95,14 +96,14 @@ export class BusinessAssetsInfoComponent implements OnInit { }); this.mergeCompanyApplicant.push({groupName:'COMPANIES',groupValues:modifyCompanyList}) } - // let modifyApplicantList: any=[]; - // if(this.applicants.length > 0){ - // modifyApplicantList = this.applicants.map(element => { - // return {id:element.pd_co_applicant_id,name:element.applicant_name,group_id:2}; - // }); - // this.mergeCompanyApplicant.push({groupName:'APPLICANTS',groupValues:modifyApplicantList}) + let modifyApplicantList: any=[]; + if(this.applicants.length > 0){ + modifyApplicantList = this.applicants.map(element => { + return {id:element.pd_co_applicant_id,name:element.applicant_name,group_id:2}; + }); + this.mergeCompanyApplicant.push({groupName:'APPLICANTS',groupValues:modifyApplicantList}) - // } + } }) this.getPdSupplierFormDetails(); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.ts index d69fbe2de..41f75395a 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.ts @@ -57,6 +57,7 @@ export class BusinessBankingDetailsComponent implements OnInit { this.pd_cus_segment = this.pd_all_details.pdmaster_details.customer_segment_abbr.toUpperCase(); this.pd_cus_segment = this.pd_cus_segment.substring(0,3); this.applicants = this.pd_all_details.pdapplicants_detials; + this.applicants = this.applicants.filter(appt=>appt.applicant_type != 2) this.applicants.push({'pd_co_applicant_id':'0','applicant_name':'Others'}); this.notifier = notifier; this.company_id = this.pd_all_details.company_id; @@ -99,6 +100,13 @@ export class BusinessBankingDetailsComponent implements OnInit { this.mergeCompanyApplicant.push({groupName:'COMPANIES',groupValues:modifyCompanyList}) } + let modifyApplicantList: any=[]; + if(this.applicants.length > 0){ + modifyApplicantList = this.applicants.map(element => { + return {id:element.pd_co_applicant_id,name:element.applicant_name,group_id:2}; + }); + this.mergeCompanyApplicant.push({groupName:'APPLICANTS',groupValues:modifyApplicantList}) + } }) this.getM_AccountType(); 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 4d181b847..0579547bd 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 @@ -1336,22 +1336,6 @@ - - - Location - - - - - Well Suited. - Fairly Suited - Not Suited - - - - diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts index 56a8e8296..0c4f75f72 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts @@ -584,7 +584,7 @@ export class BusinessInfoComponent implements OnInit { // officer_permanent: ['', Validators.compose([Validators.required])], // officer_temporary: ['', Validators.compose([Validators.required])], //working_capital: ['', Validators.compose([Validators.required])], - is_service_provided: ['', Validators.compose([Validators.required])], + // is_service_provided: ['', Validators.compose([Validators.required])], // ownership_setup: ['', Validators.compose([Validators.required])], // ownership_others: [''], // rent_paid: [''], 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 0342e300a..d775926f5 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 @@ -21,7 +21,7 @@ - Yes No @@ -29,16 +29,15 @@ - -

Loan Details

 - +
+ +

Loan Details : {{details.get('label').value}}

 + - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts index 821aa03d2..da792df83 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts @@ -46,8 +46,9 @@ export class CurrentLoanComponent implements OnInit { IDXval : any; OtherFlag : any = []; amtInwords : any = []; + labelArr : any = []; emiAmtInwords : any = []; - + dataFromAssets : any = []; existCompanyList: any =[]; mergeCompanyApplicant: any=[]; @@ -83,13 +84,87 @@ export class CurrentLoanComponent implements OnInit { } }; ngOnInit() { + console.clear(); this.getMasterDetails('BTLENDERLIST',1); this.getMasterDetails('FREQUENCY',2); this.getMasterDetails('EXISTINGLOANTYPES',3); this.initCurrentloanForm(); + + this._pd.getAssetsWithLoanFromBusiness(this.pdid).subscribe(data=>{ + // console.log(data); + + if(data.dataStatus == true){ + // console.log(data.record); + this.dataFromAssets = data.record; + if(this.dataFromAssets.length > 0){ + let labelarray : any = []; + + this.dataFromAssets.forEach((val,index) => { + + if(val.business_assets_mode == 1){ + let data; + val.business_details.forEach((v,index) => { + + data = v.any_other_assets; + }); + labelarray[index] = val.business_name_of_the_owner +' - '+ data; + } + if(val.business_assets_mode == 2){ + let data; + val.business_details.forEach((v,index) => { + data = v.property_type_name; + }); + labelarray[index] = val.business_name_of_the_owner +' - '+ data; + } + if(val.business_assets_mode == 3){ + let data; + val.business_details.forEach((v,index) => { + data = v.manufacturer_model_vehicle; + }); + labelarray[index] = val.business_name_of_the_owner +' - '+ data; + } + if(val.business_assets_mode == 4){ + let data; + val.business_details.forEach((v,index) => { + data = v.equipment_manufacturing_description; + }); + labelarray[index] = val.business_name_of_the_owner +' - '+ data; + } + + }); + const control = this.currentLoanForm.controls['loan_details']; + this.labelArr = labelarray; + let arr : any = []; + if(this.labelArr.length > 0){ + this.currentLoanForm.controls['existing_loan'].setValue('Yes'); + this.labelArr.forEach((v,index) => { + arr = { + 'label': v, + 'loan_amount': '', + 'frequency':'', + 'other_frequency':'', + 'emi': '', + 'loan_type': '', + 'others_loan_type': '', + 'loan_taken_by':'', + 'others_loan_taken':'', + 'lender': '', + 'others_lender':'', + 'original_tenure': '', + 'current_balance_tenure': '', + 'elapsed_tenure':'' + } + control.push(this.createLoanDetail(arr)); + }); + // this.currentLoanForm.controls['existing_loan'].setValue(arr); + } + } + } + }); + this._pd.getCompaniesListsForBusiness(this.pdid).subscribe(data=>{ if(data.dataStatus){ - this.existCompanyList = data.records.filter(val =>val.is_active===true && val.is_company_applicant===true); + this.existCompanyList = data.records.filter(val =>val.is_active===true); } let modifyCompanyList : any=[]; @@ -131,7 +206,7 @@ export class CurrentLoanComponent implements OnInit { result.forEach((val,index) => { this.amtInwords[index] = this._pd.convertNumberToWords(val.loan_amount); this.emiAmtInwords[index] = this._pd.convertNumberToWords(val.emi); - control.push(this.createLoanDetail()); + control.push(this.createLoanDetail(null)); this.selectedfrequency(val.frequency,index); //this.selectedLoanTakenBy(val.loan_taken_by,index); }); @@ -142,6 +217,7 @@ export class CurrentLoanComponent implements OnInit { } } else { // console.log('overall else'); + // control.push(this.createLoanDetail()); } }) @@ -183,11 +259,12 @@ export class CurrentLoanComponent implements OnInit { selectedLoanChanges(e): void { // console.log(e); - if (e.value == 'Yes') { + if (e == 'Yes') { // console.log('if()'); const control = this.currentLoanForm.controls['loan_details']; - control.push(this.createLoanDetail()); - } else if (e.value == 'No') { + control.push(this.createLoanDetail(null)); + + } else if (e == 'No') { // console.log('else()'); const arr = this.currentLoanForm.controls.loan_details; arr.removeAt(0); @@ -206,18 +283,19 @@ export class CurrentLoanComponent implements OnInit { switch(+e){ case 1: this.placeholderName[i] = 'Instalment Amount'; break; - case 2: this.placeholderName[i] = 'Monthly Instalment Amount'; break; - case 3: this.placeholderName[i] = 'Annual Instalment Amount'; break; - case 4: this.placeholderName[i] = 'Halfyearly Instalment Amount'; break; - case 5: this.placeholderName[i] = 'Fortnightly Instalment Amount'; break; - case 6: this.placeholderName[i] = 'Daily Instalment Amount'; break; - case 7: this.placeholderName[i] = 'Quarterly Instalment Amount'; break; + case 2: this.placeholderName[i] = 'Annual Instalment Amount'; break; + case 3: this.placeholderName[i] = 'Halfyearly Instalment Amount'; break; + case 4: this.placeholderName[i] = 'Fortnightly Instalment Amount'; break; + case 5: this.placeholderName[i] = 'Daily Instalment Amount'; break; + case 6: this.placeholderName[i] = 'Quarterly Instalment Amount'; break; + case 7: this.placeholderName[i] = 'Monthly Instalment Amount'; break; default: this.placeholderName[i] = 'Instalment Amount'; break; } } - createLoanDetail() { + createLoanDetail(data) { return this.fb.group({ + label: data == null ? [''] : [data.label], loan_amount: [''], frequency:[''], other_frequency:[''], @@ -255,7 +333,7 @@ export class CurrentLoanComponent implements OnInit { addLoanDetails() { const control = this.currentLoanForm.controls['loan_details']; - control.push(this.createLoanDetail()); + control.push(this.createLoanDetail(null)); } deleteLoanDetails(index) { const control = this.currentLoanForm.controls['loan_details']; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html index 5f750755a..b4031ceb9 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html @@ -281,12 +281,12 @@
- - + +
@@ -346,16 +346,16 @@
-
+
-
+
@@ -419,6 +419,20 @@
+ +
+ +
+
+ +
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts index 07c0cacc7..6b9701baf 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts @@ -303,6 +303,7 @@ export class FamilyDetailsComponent implements OnInit { private notifier: NotifierService; public familyForm: FormGroup; public selectPerson; + public apiFamilyMembers : any = []; // selectPerson = [{ // name : 'person 1', // id : 111 @@ -353,10 +354,60 @@ export class FamilyDetailsComponent implements OnInit { this.getMasterDetails('STATE', 6); // this.getMasterDetails('CITY', 7); // this.getMasterDetails('PINCODE', 8); + + this._pd.getFamilyDetails(this.pdid).subscribe(data=>{ + console.clear(); + console.log('data',data); + if(data.dataStatus == true){ + + let Temparr : any = []; + + // console.log('from_business_form',data.record.from_business_form); + // console.log('from_general_form',data.record.from_general_form); + + if(data.record.from_general_form.length > 0){ + let familyMembersGeneralForm = Object.keys(data.record.from_general_form).map(function (key) { + return data.record.from_general_form[key]; + }); + + let datas = familyMembersGeneralForm.map(element => { + return {id:element.pd_co_applicant_id.toString(), + name:element.applicant_name, + relationship:element.relationship, + relation_to:element.relation_to, + data_gets_from:'GeneralForm'}; + }); + // console.log('familyMembersGeneralForm',familyMembersGeneralForm); + Temparr.push(datas); + + } + + if(data.record.from_business_form.length > 0){ + let familyMembersBusinessForm = Object.keys(data.record.from_business_form).map(function (key) { + return data.record.from_business_form[key]; + }); + let datas = familyMembersBusinessForm.map(element => { + return {id:element.other_family_relationship_id.toString(), + name:element.family_member_name, + relationship:element.other_family_relationship_id, + relation_to:element.relation_to_id, + data_gets_from:'BusinessForm'}; + }); + // console.log('familyMembersGeneralForm',familyMembersBusinessForm); + Temparr.push(datas); + } + this.apiFamilyMembers = [].concat.apply([],Temparr); + console.log(this.apiFamilyMembers); + } + }) + this.initFamilyFormDetails(); let params: any = {}; params.pd_id = this.pdid; params.pd_form_id = '6'; + + // - { "pd_id":"104"} + this._pd.retriveForm(params).subscribe(data => { const control = this.familyForm.controls['nonEarningMembers']; const value = this.familyForm.controls['earningMembers']; @@ -375,29 +426,7 @@ export class FamilyDetailsComponent implements OnInit { this.familyForm.controls.family_details_form_remark.setValue(data.records.family_details_form_remark); // this.generateFamilyMembersDetailsGetData(data.records.family_members_details); } else { - - this.selectPerson.forEach((val,index) => { - let formData: FormGroup = this.fb.group({ - selected_person: [val.applicant_name], - residence_place: [null], - residence_city: [null], - residence_state: [null], - residence_pin: [null], - residence_No_of_years: [null], - residence_ownership: [null], - ownershipOther: [null], - rent: [null], - total_number_of_family_members: [null], - family_members_details: this.fb.array([]), - }); - const control = this.familyForm.controls['family_details']; - control.push(formData); - }); - - // this.selectPerson.forEach((val,index) => { - // this.initFamilyForm(val.pd_co_applicant_id); - // }); - // this.initFamilyForm(null); + this.initFamilyForm(null); } }); } @@ -525,7 +554,7 @@ export class FamilyDetailsComponent implements OnInit { residence_ownership: ['', Validators.compose([])], ownershipOther: [''], rent: [''], - total_number_of_family_members: ['', Validators.compose([Validators.min(1), Validators.max(20)])], + // total_number_of_family_members: ['', Validators.compose([Validators.min(1), Validators.max(20)])], family_members_details: this.fb.array([]), }); const control = this.familyForm.controls['family_details']; @@ -544,7 +573,7 @@ export class FamilyDetailsComponent implements OnInit { residence_ownership: [val.residence_ownership, Validators.compose([])], ownershipOther: [val.ownershipOther || null], rent: [val.rent || null], - total_number_of_family_members: [val.total_number_of_family_members, Validators.compose([Validators.min(1), Validators.max(20)])], + // total_number_of_family_members: [val.total_number_of_family_members, Validators.compose([Validators.min(1), Validators.max(20)])], family_members_details: this.fb.array([]), }); const control = this.familyForm.controls['family_details']; @@ -587,31 +616,80 @@ export class FamilyDetailsComponent implements OnInit { e.stopPropagation(); this.initFamilyForm('chck'); } + selectedPerson(e,inx){ + // console.log(e); + // console.log(this.apiFamilyMembers); + // return; - getNumberOfFamilyMemberDetails(inx) { - // alert(inx); - let formData = this.familyForm.controls['family_details']['controls'][inx].controls; - // alert(formData['total_number_of_family_members'].value); - // alert(this.familyForm.controls.total_number_of_family_members.valid); - if (formData['total_number_of_family_members'].valid) { - let totalMem = formData['total_number_of_family_members'].value; - const control = this.familyForm.controls['family_details']['controls'][inx].controls.family_members_details; - if (totalMem > control.length) { - let len = totalMem - control.length; - for (let i = 0; i < len; i++) { - control.push(this.generateFamilyMembersDetailsGet()); - } - } else if (totalMem < control.length) { - // control.controls.slice(0, totalMem); - control.controls = []; - for (let i = 0; i < totalMem; i++) { - control.push(this.generateFamilyMembersDetailsGet()); - } + const control = this.familyForm.controls['family_details']['controls'][inx].controls.family_members_details; + + if(this.apiFamilyMembers.length>0){ + let arraydata : any; + let data = this.apiFamilyMembers.filter(item => item.relation_to == e); + if(data.length > 0){ + data.forEach(val => { + arraydata = { + 'family_member_name' : val.name, + 'family_member_relationship' : val.relationship, + 'family_member_age' : '', + 'family_member_earning_status': '', + 'earning_segment': '', + 'earning_gross_income_per_month': '', + 'earning_name_of_the_employer_or_business': '', + 'earning_number_of_years_in_employment_or_business': '', + 'non_earning_occupation': '', + 'non_earning_if_others': '', + 'non_earning_if_retired_from': '', + 'non_earning_if_schoolorcollege': '' + } + + }); + control.push(this.initgenerateFamilyMembersDetailsGet(arraydata)); + } + else{ + control.push(this.generateFamilyMembersDetailsGet()); } - } else { - } - } + else{ + control.push(this.generateFamilyMembersDetailsGet()); + } +} + +addFamilyMembers(inx) { + const control = this.familyForm.controls['family_details']['controls'][inx].controls.family_members_details; + control.push(this.generateFamilyMembersDetailsGet()); +} + +removeFamilyMembers(index) { + const control = this.familyForm.controls['family_details']['controls'][index].controls.family_members_details; + control.removeAt(index); +} + + + // getNumberOfFamilyMemberDetails(inx) { + // // alert(inx); + // let formData = this.familyForm.controls['family_details']['controls'][inx].controls; + // // alert(formData['total_number_of_family_members'].value); + // // alert(this.familyForm.controls.total_number_of_family_members.valid); + // if (formData['total_number_of_family_members'].valid) { + // let totalMem = formData['total_number_of_family_members'].value; + // const control = this.familyForm.controls['family_details']['controls'][inx].controls.family_members_details; + // if (totalMem > control.length) { + // let len = totalMem - control.length; + // for (let i = 0; i < len; i++) { + // control.push(this.generateFamilyMembersDetailsGet()); + // } + // } else if (totalMem < control.length) { + // // control.controls.slice(0, totalMem); + // control.controls = []; + // for (let i = 0; i < totalMem; i++) { + // control.push(this.generateFamilyMembersDetailsGet()); + // } + // } + // } else { + + // } + // } generateFamilyMembersDetailsGet(): FormGroup { return this.fb.group({ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html index 1adb8ff8b..4bcdc8fd2 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html @@ -15,6 +15,22 @@ + + + Location + + + + + Well Suited. + Fairly Suited + Not Suited + + + +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts index 457a884c8..3fdbe4f16 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts @@ -56,6 +56,7 @@ export class FinalRemarksComponent implements OnInit { pdid: [this.pdid], formid: ['20'], final_custormer_remark_type : [], + is_service_provided: ['', Validators.required], final_form_remarks: ['',Validators.required] }); this.getM_Type(); @@ -85,6 +86,7 @@ export class FinalRemarksComponent implements OnInit { this.pdTrigerService.getPDFormDetailsWithID(this.pdid, '20').subscribe(data=>{ if(data.dataStatus){ this._finalRemarkForm.controls.final_custormer_remark_type.setValue(data.records.final_custormer_remark_type); + this._finalRemarkForm.controls.is_service_provided.setValue(data.records.is_service_provided); this._finalRemarkForm.controls.final_form_remarks.setValue(data.records.final_form_remarks); this.noRecordsFound = true; } else { @@ -108,7 +110,7 @@ export class FinalRemarksComponent implements OnInit { } - // ================== + // ================== /** To Save/Edited Popup Data */ onSubmit() { 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 219d5f36b..a4a03cf83 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 @@ -141,13 +141,13 @@ export class FinancialInfoComponent implements OnInit { if (result_val.length > 0) { result_val.forEach((val,index) => { - console.log(val); - console.log('val.estimate_sales_average',val.estimate_sales_average); - if(isNaN(val.estimate_sales_average)){ - alert(val.estimate_sales_average + " is not a number
"); - }else{ - alert(val.estimate_sales_average + " is a number
"); - } + // console.log(val); + // console.log('val.estimate_sales_average',val.estimate_sales_average); + // if(isNaN(val.estimate_sales_average)){ + // alert(val.estimate_sales_average + " is not a number
"); + // }else{ + // alert(val.estimate_sales_average + " is a number
"); + // } //console.log('dedrf',val.estimate_annual_sale); // this.AV_annualSalesInwords[index] = this._pd.convertNumberToWords(val.estimate_annual_sale); // this.AV_netProfitAmtInwords[index] = this._pd.convertNumberToWords(val.estimate_net_profit); @@ -493,12 +493,12 @@ export class FinancialInfoComponent implements OnInit { control.removeAt(0); } - alert((new Date()).getFullYear()); + // alert((new Date()).getFullYear()); let year1 = (new Date()).getFullYear(); let year2 = ((new Date()).getFullYear() - 1); let Year = year2 +'-'+ year1; - alert(Year); + // alert(Year); control.push(this.createValue(Year)); } 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 afccb1b77..439542d43 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 @@ -5,7 +5,6 @@
-
@@ -45,13 +44,13 @@ {{"₹"}} {{balTxrfAmtInWords}} Only - + @@ -68,9 +67,9 @@ {{"₹"}} {{topUpAmtInWords}} Only - + @@ -117,16 +116,26 @@ - + + + {{val.name}} + + + + + + - + - + - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts index 9b5a0522f..4064169bb 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts @@ -60,7 +60,9 @@ export class LoanDetailsComponent implements OnInit { CompanyApplicantGroupList: any=[]; CompanyApplicantGroupList2: any=[]; - + mergeCompanyApplicant:any=[]; + existCompanyList:any=[]; + companies:any=[]; loanAmtInWords : any; balTxrfAmtInWords : any; valAsPerAgmtInWords : any; @@ -84,52 +86,31 @@ export class LoanDetailsComponent implements OnInit { @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { this.applicants = this.pd_all_details.pdapplicants_detials; + this.applicants = this.applicants.filter(appt=>appt.applicant_type != 2) + this.companies = this.pd_all_details.pdapplicants_detials.filter(appt=>appt.applicant_type == 2 ) - // console.log(this.applicants); - let CompanyList : any=[]; - let ApplicantList : any=[]; + let modifyApplicantList: any=[]; + if(this.applicants.length > 0){ + modifyApplicantList = this.applicants.map(element => { + return {id:element.pd_co_applicant_id,name:element.applicant_name,group_id:2}; + }); + this.mergeCompanyApplicant.push({groupName:'APPLICANTS',groupValues:modifyApplicantList}) + } - // this.applicants.forEach(val => { - // if(val.applicant_type == 0){ - // this.CompanyApplicantGroupList.push({groupName:'APPLICANTS',groupValues:{id:val.pd_co_applicant_id,name:val.applicant_name,group_id:2}}) - // } - // if(val.applicant_type == 1){ - // this.CompanyApplicantGroupList.push({groupName:'APPLICANTS',groupValues:{id:val.pd_co_applicant_id,name:val.applicant_name,group_id:2}}) - // } - // if(val.applicant_type == 2){ - // this.CompanyApplicantGroupList.push({groupName:'COMPANIES',groupValues:{id:val.pd_co_applicant_id.toString(),name:val.applicant_name,group_id:1}}) - // } - // }); - - // console.log(this.CompanyApplicantGroupList); - - - - this.applicants.forEach(val => { - if(val.applicant_type == 0){ - ApplicantList = {id:val.pd_co_applicant_id,name:val.applicant_name,group_id:2}; - this.CompanyApplicantGroupList2.push({groupName:'APPLICANTS',groupValues:ApplicantList}) - } - if(val.applicant_type == 1){ - ApplicantList = {id:val.pd_co_applicant_id,name:val.applicant_name,group_id:2}; - this.CompanyApplicantGroupList2.push({groupName:'APPLICANTS',groupValues:ApplicantList}) - } + this._pd.getCompaniesListsForBusiness(this.pdid).subscribe(data=>{ + if(data.dataStatus){ + this.existCompanyList = data.records.filter(val =>val.is_active===true); + } + + let modifyCompanyList : any=[]; + if(this.existCompanyList.length>0){ + modifyCompanyList = this.existCompanyList.map(element => { + return {id:element.company_order_id.toString(),name:element.company_name,group_id:1}; + }); + this.mergeCompanyApplicant.push({groupName:'COMPANIES',groupValues:modifyCompanyList}) + } + }); - this.applicants.forEach(val => { - if(val.applicant_type == 2){ - CompanyList = {id:val.pd_co_applicant_id,name:val.applicant_name,group_id:2}; - this.CompanyApplicantGroupList2.push({groupName:'COMPANIES',groupValues:CompanyList}); - } - }); - - // console.log(this.CompanyApplicantGroupList2); - - // let cal = Object.keys(this.CompanyApplicantGroupList2).map(function(key) { - // return this.CompanyApplicantGroupList2[key]; - // }); - - // console.log(cal); - this.productAbbr = this.pd_all_details.pdmaster_details.product_abbr; this.productID = this.pd_all_details.pdmaster_details.fk_product_id; @@ -160,7 +141,8 @@ export class LoanDetailsComponent implements OnInit { } }; ngOnInit() { - // console.clear(); + console.clear(); + console.log('this.applicants',this.applicants); this.initloanDetailsForm(); this.getM_EndUseofLoad(); this.getM_EndUseForLoan(this.pdid); @@ -240,7 +222,7 @@ export class LoanDetailsComponent implements OnInit { this.loanDetailsForm.controls['end_use_other'].setValue(value.records.end_use_other); } this.loanDetailsForm.controls['is_transfer'].setValue(value.records.is_transfer); - this.loanDetailsForm.controls['is_topup'].setValue(value.records.is_topup); + // this.loanDetailsForm.controls['is_topup'].setValue(value.records.is_topup); if (value.records.balance_transfer_amount) { this.loanDetailsForm.controls['balance_transfer_amount'].setValue(value.records.balance_transfer_amount); this.balTxrfAmtInWords = this._pd.convertNumberToWords(value.records.balance_transfer_amount); @@ -250,7 +232,7 @@ export class LoanDetailsComponent implements OnInit { this.topUpAmtInWords = this._pd.convertNumberToWords(value.records.topup_amount); } - this.loanDetailsForm.controls['end_use_topup'].setValue(value.records.end_use_topup); + // this.loanDetailsForm.controls['end_use_topup'].setValue(value.records.end_use_topup); if (value.records.lender) { this.loanDetailsForm.controls['lender'].setValue(value.records.lender); @@ -478,10 +460,9 @@ getM_sourceofamount() { end_use_other: [''], is_transfer: [''], //is_topup: [''], - is_topup: [''], balance_transfer_amount: [''], topup_amount: [''], - end_use_topup:[''], + // end_use_topup:[''], lender: [''], other_bt_lender : [''], own_contribution: [''], @@ -590,7 +571,7 @@ getM_sourceofamount() { }else{ records.end_use_other = null ;} records.is_transfer = this.loanDetailsForm.controls['is_transfer'].value; - records.is_topup = this.loanDetailsForm.controls['is_topup'].value; + // records.is_topup = this.loanDetailsForm.controls['is_topup'].value; if (this.loanDetailsForm.controls['is_transfer'].value == 'yes') { records.balance_transfer_amount = this.loanDetailsForm.controls['balance_transfer_amount'].value; @@ -616,14 +597,15 @@ getM_sourceofamount() { // if (this.loanDetailsForm.controls['is_topup'].value == 'yes') { records.topup_amount = this.loanDetailsForm.controls['topup_amount'].value; // } - records.end_use_topup = this.loanDetailsForm.controls['end_use_topup'].value; + // records.end_use_topup = this.loanDetailsForm.controls['end_use_topup'].value; - if (this.loanDetailsForm.controls['is_topup'].value == 'yes' || this.loanDetailsForm.controls['is_transfer'].value == 'yes') { + if (this.loanDetailsForm.controls['is_transfer'].value == 'yes') { //this.loanDetailsForm.controls['is_topup'].value == 'yes' || records.lender = this.loanDetailsForm.controls['lender'].value; + if(this.loanDetailsForm.controls['lender'].value == 1){ + records.other_bt_lender = this.loanDetailsForm.controls['other_bt_lender'].value; + } } - if(this.loanDetailsForm.controls['lender'].value == 3){ - records.other_bt_lender = this.loanDetailsForm.controls['other_bt_lender'].value; - } + records.emi_level = this.loanDetailsForm.controls['emi_level'].value; if(this.mortageCardAccess == true){ @@ -693,8 +675,8 @@ getM_sourceofamount() { // console.log('First Time',event); // console.log('First Time Value',event.value); if(event.value == 'no') { - this.loanDetailsForm.controls['is_topup'].clearValidators(); - this.loanDetailsForm.controls['is_topup'].updateValueAndValidity(); + // this.loanDetailsForm.controls['is_topup'].clearValidators(); + // this.loanDetailsForm.controls['is_topup'].updateValueAndValidity(); // console.log('no',event.value); this.loanDetailsForm.controls['source'].setValidators([Validators.required]); this.loanDetailsForm.controls['source'].updateValueAndValidity(); @@ -703,8 +685,8 @@ getM_sourceofamount() { this.loanDetailsForm.controls['own_contribution'].updateValueAndValidity(); } else if(event.value == 'yes'){ - this.loanDetailsForm.controls['is_topup'].setValidators([Validators.required]); - this.loanDetailsForm.controls['is_topup'].updateValueAndValidity(); + // this.loanDetailsForm.controls['is_topup'].setValidators([Validators.required]); + // this.loanDetailsForm.controls['is_topup'].updateValueAndValidity(); this.loanDetailsForm.controls['source'].clearValidators(); this.loanDetailsForm.controls['source'].updateValueAndValidity(); 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 f020154a8..ef0521e21 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 @@ -56,11 +56,16 @@ - - {{person.applicant_name}} + + {{person}} + Others - + + + + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts index 24288ded8..d7e421085 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts @@ -46,6 +46,8 @@ export class OtherIncomeComponent implements OnInit { sourceData : any = []; amtInwords : any = []; applicants : any = []; + incomeEarnedBy : any = []; + // stringArr = []; constructor(notifier: NotifierService, private fb: FormBuilder, @@ -59,7 +61,8 @@ export class OtherIncomeComponent implements OnInit { this.applicants = this.pd_all_details.pdapplicants_detials; this.form_id = 9; this.notifier = notifier; - } + } + public viewerOptions: any = { navbar: false, toolbar: { @@ -84,6 +87,14 @@ public viewerOptions: any = { this.getFrequency(); this.getSourceOtherIncome(); this.initOtherincomeForm(); + this._pd.getAllPersonsName(this.pdid).subscribe(data => { + // console.log(data); + + if(data.dataStatus == true){ + this.incomeEarnedBy = data.record; + } + // console.log(this.incomeEarnedBy); + }); let params: any = {}; params.pd_id = this.pdid; params.pd_form_id = this.form_id; @@ -136,6 +147,7 @@ public viewerOptions: any = { source: [''], others_source : [''], income_earned_by:[''], + others_income_earned_by:[''], amount: [''], frequency: [''], others_frequency : [''] diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html index 4e8de11ac..c253d9559 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html @@ -71,16 +71,16 @@ - + - - + +
@@ -219,15 +219,15 @@ --> - + - +
@@ -303,16 +303,16 @@ delete --> - + - - + +
@@ -375,16 +375,16 @@ --> - + - - + + @@ -461,17 +461,16 @@ --> - + - + - @@ -534,15 +533,15 @@ --> - + - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html index e99dc07ec..66a036cf2 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html @@ -95,7 +95,7 @@
- +
{{master.addressline1}},
{{master.city_name}},
{{master.state_name}}-{{master.pincode}} diff --git a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts index 0f4cca269..202f6ff90 100755 --- a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts +++ b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts @@ -99,7 +99,7 @@ export class PdTrigerService { // get state and city details getStateCityDetails(): Observable { - return this._http.get(this.apiUrl + 'getListOfStatesAndCities') + return this._http.post(this.apiUrl + 'getListOfStatesCities','') .pipe( catchError(this.handleError('role', [])) ) @@ -498,6 +498,34 @@ export class PdTrigerService { ) } + /** To get Family Member Name For + * 1) Family Form + */ + getFamilyDetails(pdid:any): Observable { + return this._http.post(this.apiUrl + "getFamilyDetails", { "pd_id" : pdid}) + .pipe( + catchError(this.handleError('operation', [])) + ) + } + + /** To get Family Member Name For + * 1) other income form - (income earned field) + */ + getAllPersonsName(pdid:any): Observable { + return this._http.post(this.apiUrl + "getAllPersonsName", { "pd_id" : pdid}) + .pipe( + catchError(this.handleError('operation', [])) + ) + } + + /** To get Business Asset For + * 1) Current Loan Form(where Business Asset loan Details is 'Yes' means name is displayed) + */ + getAssetsWithLoanFromBusiness(pdid:any): Observable { + return this._http.post(this.apiUrl + "getAssetsWithLoanFromBusiness",{ "pd_id" : pdid}) + .pipe(catchError(this.handleError('operation', []))) + } + getEndUseForLoan(pdid: any): Observable { return this._http.post(this.apiUrl + "getEndUseOfLoan",{ "records":{ "pd_id" : pdid}}) .pipe(