diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html index cf582b8f4..fe2a1a427 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html @@ -3,7 +3,8 @@

- {{pageTitle}} + {{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}}
+ {{pageTitle}}
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 8fc2f03dd..826b81cb2 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 @@ -30,7 +30,11 @@ import {ActivatedRoute, Router} from "@angular/router"; }) export class AddressComponent implements OnInit { - + customer_segment_abbr: any; + subproduct_abbr: any; + lender_applicant_id: any; + main_applicant: any; + pageTitle: string ="PD Address Details"; //@Input() pdid: number; @@ -91,9 +95,14 @@ export class AddressComponent implements OnInit { private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { - console.log(this.pd_all_details); + // console.log(this.pd_all_details); this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.form_id = 5; + //commented + 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.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; + this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; // console.log(this.pd_all_details.template_forms.form_id); // console.log(this.pd_all_details.pdmaster_details.customer_segment_abbr); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html index 90286cb5a..bf89d1114 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html @@ -1,5 +1,6 @@

+ {{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}}
{{pageTitle}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.ts index 29ef95b94..1659b3031 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.ts @@ -15,6 +15,10 @@ import { ActivatedRoute, Router } from "@angular/router"; styleUrls: ['./assessed-income.component.scss'] }) export class AssessedIncomeComponent implements OnInit { + customer_segment_abbr: any; + subproduct_abbr: any; + lender_applicant_id: any; + main_applicant: any; private notifier: NotifierService; pageTitle: string ="Assessed Income Details"; // @Input() pdid: number; @@ -58,6 +62,10 @@ public getCustomValues:any = { UOMList: this.UOMList,frequencyList: this.frequen this.getAIMaster('BUSINESSEXPENSES',3); this.getAIMaster('BUSINESSINCOME',4); this.getCustomValues.pdid = this.pd_all_details.pdmaster_details.pd_id; + 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.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; + this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; } public viewerOptions: any = { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html index 3ec76ed1b..fef4bd971 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html @@ -2,7 +2,8 @@

- {{pageTitle}} + {{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}}
+ {{pageTitle}}
@@ -281,7 +282,7 @@
- + Yes No 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 11d255889..c4b88bb54 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 @@ -29,7 +29,11 @@ import { element } from '@angular/core/src/render3/instructions'; styleUrls: ['./assets-info.component.scss'] }) export class AssetsInfoComponent implements OnInit { - pageTitle: string ="Other Assets Details"; + customer_segment_abbr: any; + subproduct_abbr: any; + lender_applicant_id: any; + main_applicant: any; + pageTitle: string = "Other Assets Details"; //@Input() pdid: number; pdid:string; //businessProfessionName :string; @@ -80,6 +84,10 @@ export class AssetsInfoComponent implements OnInit { 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.notifier = notifier; + 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.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; + this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; } public viewerOptions: any = { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html index bbf1a9622..05affa635 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html @@ -70,7 +70,8 @@

- {{pageTitle}} + {{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}}
+ {{pageTitle}}
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 3ffe3e868..3b9948db1 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 @@ -28,7 +28,11 @@ import {ActivatedRoute, Router} from "@angular/router"; styleUrls: ['./banking-details.component.scss'] }) export class BankingDetailsComponent implements OnInit { - pdid: number; + customer_segment_abbr: any; + subproduct_abbr: any; + lender_applicant_id: any; + main_applicant: any; + pdid: number; pageTitle: string ="Banking Details of Individuals"; public bankingForm: FormGroup; step: number; @@ -60,6 +64,10 @@ export class BankingDetailsComponent implements OnInit { 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; + 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.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; + this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html index 3b0febd23..6c4d7ae1a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html @@ -2,7 +2,8 @@

- {{pageTitle}} + {{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}}
+ {{pageTitle}}
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 5fa3a6b26..f4d380596 100755 --- 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 @@ -15,6 +15,10 @@ import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; styleUrls: ['./business-assets-info.component.scss'] }) export class BusinessAssetsInfoComponent implements OnInit { + customer_segment_abbr: any; + subproduct_abbr: any; + lender_applicant_id: any; + main_applicant: any; pageTitle: string ="Assets used for Business"; pdid:string; @@ -78,6 +82,10 @@ export class BusinessAssetsInfoComponent implements OnInit { this.company_id =this.pd_all_details.company_id; this.notifier = notifier; this.pageTitle = this.pd_all_details.company_name + ' - ' +this.pageTitle ; + 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.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; + this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html index e321a90e9..73cb07419 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html @@ -1,7 +1,8 @@

- {{pageTitle}} + {{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}}
+ {{pageTitle}}
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 404f4f28e..afd12302d 100755 --- 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 @@ -29,6 +29,10 @@ import {ActivatedRoute, Router} from "@angular/router"; styleUrls: ['./business-banking-details.component.scss'] }) export class BusinessBankingDetailsComponent implements OnInit { + customer_segment_abbr: any; + subproduct_abbr: any; + lender_applicant_id: any; + main_applicant: any; pdid: number; pageTitle: string ="Banking Information"; @@ -62,7 +66,10 @@ export class BusinessBankingDetailsComponent implements OnInit { this.notifier = notifier; this.company_id = this.pd_all_details.company_id; this.pageTitle = this.pd_all_details.company_name + ' - ' +this.pageTitle ; - + 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.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; + this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; } public viewerOptions: any = { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.html index f21585e0b..6160f7880 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.html @@ -1,5 +1,7 @@

-
{{pageTitle}}
+
+ {{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}}
+ {{pageTitle}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.ts index 7080d93b6..6c55c00c3 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.ts @@ -17,7 +17,11 @@ import { BusinessBankingDetailsComponent } from './../../forms/business-banking- styleUrls: ['./business-info-group.component.scss'] }) export class BusinessInfoGroupComponent implements OnInit { - pageTitle: string ="Business Related Information"; + customer_segment_abbr: any; + subproduct_abbr: any; + lender_applicant_id: any; + main_applicant: any; + pageTitle: string = "Business Related Information"; existCompanyList: any = []; pdid: number; form_id: number; @@ -30,6 +34,10 @@ export class BusinessInfoGroupComponent implements OnInit { this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.form_id = 13; // this.waitLoading=false; + 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.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; + this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; } ngOnInit() { @@ -60,8 +68,11 @@ export class BusinessInfoGroupComponent implements OnInit { if(details.form_id==1){ const dialogRef = this.dialog.open(SupplierInfoComponent, { data: this.pd_all_details, - position: { right: '0'}, - width:'80%', + // position: { right: '0'}, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', disableClose: true }); dialogRef.afterClosed() @@ -72,8 +83,11 @@ export class BusinessInfoGroupComponent implements OnInit { else if(details.form_id==2){ const dialogRef = this.dialog.open(ClientInfoComponent, { data: this.pd_all_details, - position: { right: '0'}, - width:'80%', + // position: { right: '0'}, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', disableClose: true }); dialogRef.afterClosed() @@ -84,8 +98,11 @@ export class BusinessInfoGroupComponent implements OnInit { else if(details.form_id==11){ const dialogRef = this.dialog.open(StockComponent, { data: this.pd_all_details, - position: { right: '0'}, - width:'80%', + // position: { right: '0'}, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', disableClose: true }); dialogRef.afterClosed() @@ -96,8 +113,11 @@ export class BusinessInfoGroupComponent implements OnInit { else if(details.form_id==13){ const dialogRef = this.dialog.open(BusinessInfoComponent, { data: this.pd_all_details, - position: { right: '0'}, - width:'80%', + // position: { right: '0'}, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', disableClose: true }); dialogRef.afterClosed() @@ -108,8 +128,11 @@ export class BusinessInfoGroupComponent implements OnInit { else if(details.form_id==14){ const dialogRef = this.dialog.open(FinancialInfoComponent, { data: this.pd_all_details, - position: { right: '0'}, - width:'80%', + // position: { right: '0'}, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', disableClose: true }); dialogRef.afterClosed() @@ -120,8 +143,11 @@ export class BusinessInfoGroupComponent implements OnInit { else if(details.form_id==22){ const dialogRef = this.dialog.open(BusinessAssetsInfoComponent, { data: this.pd_all_details, - position: { right: '0'}, - width:'80%', + // position: { right: '0'}, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', disableClose: true }); dialogRef.afterClosed() @@ -132,8 +158,11 @@ export class BusinessInfoGroupComponent implements OnInit { else if(details.form_id==21) { const dialogRef = this.dialog.open(BusinessBankingDetailsComponent, { data: this.pd_all_details, - position: { right: '0'}, - width:'80%', + // position: { right: '0'}, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', disableClose: true }); dialogRef.afterClosed() 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 8268600a8..181afd4fd 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 @@ -2,7 +2,8 @@

- {{pageTitle}} + {{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}}
+ {{pageTitle}}
@@ -30,7 +31,13 @@
- {{app_par.applicant_name | titlecase}} + + + {{app_par.applicant_name | titlecase}} Others 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 98eec7056..23418fc2a 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 @@ -30,6 +30,10 @@ import {DatePipe } from '@angular/common'; styleUrls: ['./business-info.component.scss'] }) export class BusinessInfoComponent implements OnInit { + customer_segment_abbr: any; + subproduct_abbr: any; + lender_applicant_id: any; + main_applicant: any; pipe = new DatePipe('en-US'); pdid: number; company_id: String; @@ -38,6 +42,7 @@ export class BusinessInfoComponent implements OnInit { pageTitle: string ="About Business"; relationData: any = []; titleData: any = []; + personsList: any = []; companyRelationShipList: any =[]; //industryData: any = []; activityData: any = []; @@ -93,6 +98,10 @@ export class BusinessInfoComponent implements OnInit { this.generalExistEntityType_other = this.pd_all_details.business_entity_type_other; this.generalExistBusinessYear = this.pd_all_details.business_years; this.generalExistBusinessMonth = this.pd_all_details.business_month; + 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.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; + this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; } public viewerOptions: any = { navbar: false, @@ -125,6 +134,7 @@ export class BusinessInfoComponent implements OnInit { this.initBusinessForm(); this.getCompanyRelation(); this.getTitle(); + this.getAllPersons(); // const Desgn = this.businessForm.controls['designation']; // const Partnr = this.businessForm.controls['partners']; // const otherDoc = this.businessForm.controls['documents']; @@ -1061,6 +1071,26 @@ export class BusinessInfoComponent implements OnInit { }); } + // get title master + getAllPersons() { + this._pd.getAllPersonsName(this.pdid).subscribe(data => { + if(data.dataStatus){ + this.personsList = data.record; + // if(data.record.applicant_type == 1){ + // this.personsList.push({groupName:'APPLICANTS',groupValues:{name:data.record.applicant_name,group_id:data.record.applicant_type}}); + // } + // if(data.record.applicant_type == 2){ + // this.personsList.push({groupName:'COMPANIES',groupValues:{name:data.record.applicant_name,group_id:data.record.applicant_type}}); + // } + // if(data.record.applicant_type == 3){ + // this.personsList.push({groupName:'OTHER FAMILY MEMBER',groupValues:{name:data.record.applicant_name,group_id:data.record.applicant_type}}); + // } + // this.personsList.push({groupName:'COMMON',groupValues:{name:'Others',group_id:4}}); + } + + }); + } + getCompanyRelation() { let master_name = 'COMPANYRELATIONSHIPS'; this._pd.getAllMasterDatas(master_name).subscribe(data => { @@ -1400,7 +1430,7 @@ export class BusinessInfoComponent implements OnInit { let validationFlag : number = 0; // let shareHoldValidationFlag : number = 0; // console.log(records.partners.length); - console.log(records.partners); + // console.log(records.partners); if(records.partners.length > 0){ let total = records.partners.map(shares => shares.shareholding).reduce((a, b) => a + +b, 0); @@ -1666,8 +1696,8 @@ export class BusinessInfoComponent implements OnInit { // } CheckExport(e,val){ - console.log(e); - console.log(val); + // console.log(e); + // console.log(val); let flag: number = 0; if(val == 1){ e != "Within India" ? diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html index 77c53f89d..a35908c9c 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html @@ -1,5 +1,8 @@

-
{{pageTitle}}
+
+ {{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}}
+ {{pageTitle}} +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts index e3b5abf35..3eb58b505 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts @@ -29,6 +29,10 @@ import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; styleUrls: ['./client-info.component.scss'] }) export class ClientInfoComponent implements OnInit { + main_applicant: any; + customer_segment_abbr: any; + subproduct_abbr: any; + lender_applicant_id: any; pageTitle: string = "Client Details"; @@ -82,6 +86,10 @@ export class ClientInfoComponent implements OnInit { this.company_id = this.pd_all_details.company_id; this.notifier = notifier; this.pageTitle = this.pd_all_details.company_name + ' - ' +this.pageTitle ; + 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.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; + this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; } public viewerOptions: any = { navbar: false, 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 b6aacf511..c0e5be59f 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 @@ -1,7 +1,10 @@

-
{{pageTitle}}
+
+ {{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}}
+ {{pageTitle}} +
@@ -34,7 +37,7 @@
-

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

 +

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 b94a14eb4..62bc1edac 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 @@ -29,6 +29,10 @@ import { ActivatedRoute, Router } from "@angular/router"; styleUrls: ['./current-loan.component.scss'] }) export class CurrentLoanComponent implements OnInit { + customer_segment_abbr: any; + subproduct_abbr: any; + lender_applicant_id: any; + main_applicant: any; public currentLoanForm: FormGroup; private notifier: NotifierService; pageTitle: string ="Existing Loan Obligations"; @@ -41,6 +45,7 @@ export class CurrentLoanComponent implements OnInit { lenderData: any = []; frequencyData: any = []; loanTypeData: any = []; + investmentTypeData: any = []; applicants: any; placeholderName : any = []; IDXval : any; @@ -63,6 +68,10 @@ export class CurrentLoanComponent implements OnInit { this.applicants = this.pd_all_details.pdapplicants_detials; this.applicants.push({'pd_co_applicant_id':'0','applicant_name':'Others'}); //this.OtherFlag[0] = false; + 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.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; + this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; } public viewerOptions: any = { navbar: false, @@ -88,6 +97,8 @@ export class CurrentLoanComponent implements OnInit { this.getMasterDetails('BTLENDERLIST',1); this.getMasterDetails('FREQUENCY',2); this.getMasterDetails('EXISTINGLOANTYPES',3); + this.getMasterDetails('INVESTMENTTYPE',4); + this.initCurrentloanForm(); this._pd.getCompaniesListsForBusiness(this.pdid).subscribe(data=>{ if(data.dataStatus){ @@ -143,48 +154,96 @@ export class CurrentLoanComponent implements OnInit { } } } else { - console.log('else part',value.status); + // console.log('else part',value.status); 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 AssetData = data.record; + + // console.log(AssetData.business_assets); + // console.log(AssetData.other_assests); + + if(AssetData.business_assets.length>0){ + AssetData.business_assets.map(element => { + this.dataFromAssets.push({mode:element.business_assets_mode, + mode_name:element.business_assets_mode_name, + details:element.business_details, + owner_name:element.business_name_of_the_owner}) + }); + } + + if(AssetData.other_assests.length > 0){ + AssetData.other_assests.map(element => { + this.dataFromAssets.push({mode:element.assets_mode, + mode_name:element.assets_mode_name, + details:element.details, + owner_name:element.name_of_the_owner + }) + }); + + + // id: "4", name: "Equipments and machinaries", isactive: "1", flag: "1", is_others: "0" + // id: "7", name: "Investments", isactive: "1", flag: "0", is_others: "0" + // id: "6", name: "Life Insurance Policy", isactive: "1", flag: "0", is_others: "0" + // id: "2", name: "Property", isactive: "1", flag: "1", is_others: "0" + // id: "3", name: "Vehicle", isactsive: "1", flag: "1", is_others: "0" + // id: "1", name: "Others", isactive: "1", flag: "1", is_others: "1"} + + if(this.dataFromAssets.length > 0){ let labelarray : any = []; this.dataFromAssets.forEach((val,index) => { - if(val.business_assets_mode == 1){ + if(val.mode == 1){ let data; - val.business_details.forEach((v,index) => { - + val.details.forEach((v,index) => { data = v.any_other_assets; }); - labelarray[index] = val.business_name_of_the_owner +' - '+ data; + let description = data != '' ? '( '+ data +' )' : ''; + labelarray[index] = ' : '+val.owner_name +' - '+ val.mode_name + description; } - if(val.business_assets_mode == 2){ + if(val.mode == 2){ let data; - val.business_details.forEach((v,index) => { + val.details.forEach((v,index) => { data = v.property_type_name; }); - labelarray[index] = val.business_name_of_the_owner +' - '+ data; + let description = data != '' ? '( '+ data +' )' : ''; + labelarray[index] = ' : '+val.owner_name +' - '+ val.mode_name + description; } - if(val.business_assets_mode == 3){ + if(val.mode == 3){ let data; - val.business_details.forEach((v,index) => { + val.details.forEach((v,index) => { data = v.manufacturer_model_vehicle; }); - labelarray[index] = val.business_name_of_the_owner +' - '+ data; + let description = data != '' ? '( '+ data +' )' : ''; + labelarray[index] = ' : '+val.owner_name +' - '+ val.mode_name + description; } - if(val.business_assets_mode == 4){ + if(val.mode == 4){ let data; - val.business_details.forEach((v,index) => { + val.details.forEach((v,index) => { data = v.equipment_manufacturing_description; }); - labelarray[index] = val.business_name_of_the_owner +' - '+ data; + let description = data != '' ? '( '+ data +' )' : ''; + labelarray[index] = ' : '+val.owner_name +' - '+ val.mode_name + description; + } + if(val.mode == 6){ + labelarray[index] = ' : '+val.owner_name+' - '+ val.mode_name; + } + if(val.mode == 7){ + let data; + val.details.forEach((v,index) => { + data = v.investments_type != 1 + ? this.investmentTypeData.filter(data => data.id == v.investments_type)[0].name + : v.other_investments_type ; + + }); + let description = data != '' ? '( '+ data +' )' : ''; + labelarray[index] = ' : '+val.owner_name +' - '+ val.mode_name + description; } - }); const control = this.currentLoanForm.controls['loan_details']; this.labelArr = labelarray; @@ -213,8 +272,13 @@ export class CurrentLoanComponent implements OnInit { // this.currentLoanForm.controls['existing_loan'].setValue(arr); } } + else{ + // console.log('else,else.part'); + control.push(this.createLoanDetail(null)); + } } - }); + } + }); } }) } @@ -398,6 +462,9 @@ export class CurrentLoanComponent implements OnInit { else if(type==3 && val.isactive == 1){ this.loanTypeData.push(val); } + else if(type==4 && val.isactive == 1){ + this.investmentTypeData.push(val); + } }) }); } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html index 15fb039c0..2c914bda6 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html @@ -1,7 +1,8 @@

- {{pageTitle}} + {{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}}
+ {{pageTitle}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts index 494db14ec..3640fbe04 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts @@ -29,7 +29,11 @@ import {ActivatedRoute, Router} from '@angular/router'; styleUrls: ['./employment-info.component.scss'] }) export class EmploymentInfoComponent implements OnInit { - + customer_segment_abbr: any; + subproduct_abbr: any; + lender_applicant_id: any; + main_applicant: any; + pageTitle: string ="Employement Information"; pdid: number; form_id: number; @@ -48,6 +52,10 @@ export class EmploymentInfoComponent implements OnInit { this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.form_id = 12; this.notifier = notifier; + 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.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; + this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; } public viewerOptions: any = { @@ -181,7 +189,7 @@ export class EmploymentInfoComponent implements OnInit { records.bonus_type_other = this.employmentForm.controls['bonus_type_other'].value; records.any_delays = this.employmentForm.controls['any_delays'].value; records.employment_remarks = this.employmentForm.controls['employment_remarks'].value; - console.log('data', records); + // console.log('data', records); this._pd.saveForm(records).subscribe(data => { // console.log('data', data); // this.notifier.notify('success', 'Saved Successfully.'); 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 4bc1c1c34..f254d43b7 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 @@ -261,7 +261,8 @@

- {{pageTitle}} + {{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}}
+ {{pageTitle}}
-
+
+
+
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 426cc6e6c..d4be48427 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 @@ -295,7 +295,11 @@ import { ActivatedRoute, Router } from "@angular/router"; styleUrls: ['./family-details.component.scss'] }) export class FamilyDetailsComponent implements OnInit { - IncomePerMonth: any =[]; + customer_segment_abbr: any; + subproduct_abbr: any; + lender_applicant_id: any; + main_applicant: any; + IncomePerMonth: any = []; RentAmount: any = []; FamilyMemberAsLabel: any = []; //@Input() pdid: number; @@ -342,11 +346,15 @@ export class FamilyDetailsComponent implements OnInit { private _pd: PdTrigerService, private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { - console.log(pd_all_details); + // console.log(pd_all_details); this.selectPerson = this.pd_all_details.pdapplicants_detials; this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.form_id = 6; this.notifier = notifier; + 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.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; + this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; } ngOnInit() { this.getMasterDetails('RELATIONSHIPS', 1); @@ -361,7 +369,7 @@ export class FamilyDetailsComponent implements OnInit { this._pd.getFamilyDetails(this.pdid).subscribe(data=>{ console.clear(); - console.log('data',data); + // console.log('data',data); if(data.dataStatus == true){ let Temparr : any = []; @@ -379,7 +387,7 @@ export class FamilyDetailsComponent implements OnInit { name:element.applicant_name, relationship:element.relationship, relation_to:element.relation_to, - age:'', + age:element.age, data_gets_from:'GeneralForm'}; }); // console.log('familyMembersGeneralForm',familyMembersGeneralForm); @@ -403,7 +411,7 @@ export class FamilyDetailsComponent implements OnInit { Temparr.push(datas); } this.apiFamilyMembers = [].concat.apply([],Temparr); - console.log(this.apiFamilyMembers); + // console.log(this.apiFamilyMembers); } }) @@ -590,7 +598,7 @@ export class FamilyDetailsComponent implements OnInit { control.push(formData); let inx = control.length - 1; this.addFamilyMemberDetailsWithData(inx, val.family_members_details); - console.log(control); + // console.log(control); }); } @@ -631,17 +639,44 @@ export class FamilyDetailsComponent implements OnInit { } selectedPerson(e,inx){ - + // console.log('e,inx',e,inx); + // console.log( e,inx, "Logged!"); + // console.info( e,inx, "Logged!"); + // console.warn( e,inx, "Logged!"); + // console.debug(e,inx, "Logged!"); + // console.error(e,inx, "Logged!"); + this.FamilyMemberAsLabel[inx] = this.selectPerson.filter(item => item.pd_co_applicant_id == e)[0].applicant_name; const control = this.familyForm.controls['family_details']['controls'][inx].controls.family_members_details; + // console.log(control.length); + let newControlLength: number; + let oldControlLength: number = control.length; + if(this.apiFamilyMembers.length>0){ + let arraydata : any; let data = this.apiFamilyMembers.filter(item => item.relation_to == e); + // console.log('this.apiFamilyMembers',this.apiFamilyMembers); + // console.log('selectedPerson data',data); if(data.length > 0){ + // console.log(control.length); + // console.log(data.length); + + newControlLength = data.length; + let index: number = 0; + while(index < oldControlLength) + { + control.removeAt(index); + index++; + } + oldControlLength = newControlLength + + data.forEach((val,inx) => { + if(val.age){ this.isReadOnly[inx] = true; }else{ @@ -662,15 +697,25 @@ export class FamilyDetailsComponent implements OnInit { 'non_earning_if_retired_from': '', 'non_earning_if_schoolorcollege': '' } + control.push(this.initgenerateFamilyMembersDetailsGet(arraydata)); }); - control.push(this.initgenerateFamilyMembersDetailsGet(arraydata)); } else{ + + let index: number = 0; + while(index < oldControlLength) + { + control.removeAt(index); + index++; + } + oldControlLength = 1; + control.push(this.generateFamilyMembersDetailsGet()); } } else{ + // console.log('main else'); control.push(this.generateFamilyMembersDetailsGet()); } } 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 4603d85f1..966e16fa0 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 @@ -1,5 +1,8 @@

-
{{pageTitle}}
+
+ {{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}}
+ {{pageTitle}} +
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 c3c8a61e8..fdcf0b02b 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 @@ -30,6 +30,10 @@ import { analyzeAndValidateNgModules } from '@angular/compiler'; styleUrls: ['./final-remarks.component.scss'] }) export class FinalRemarksComponent implements OnInit { + customer_segment_abbr: any; + subproduct_abbr: any; + main_applicant: any; + lender_applicant_id: any; pageTitle: string = "Final Remarks Details"; @@ -52,6 +56,10 @@ export class FinalRemarksComponent implements OnInit { this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.form_id = 20; this.notifier = notifier; + 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.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; + this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; this._finalRemarkForm = this._formBuilder.group({ pdid: [this.pdid], formid: ['20'], @@ -134,7 +142,7 @@ export class FinalRemarksComponent implements OnInit { //To Remove The "Null" With Key also Object.keys(answerFormValues).forEach((key) => (answerFormValues[key] == null) && delete answerFormValues[key]); - console.log(JSON.stringify(answerFormValues)); + // console.log(JSON.stringify(answerFormValues)); //Add BRANCH data with help Service File this.pdTrigerService.savePDFormDetailsWithID(answerFormValues).subscribe( dataresult => { 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 8497c5c64..7e12dac5b 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 @@ -3,7 +3,8 @@

- {{pageTitle}} + {{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}}
+ {{pageTitle}}
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 3aca4522f..c18e322cb 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 @@ -30,6 +30,10 @@ import {ActivatedRoute, Router} from '@angular/router'; styleUrls: ['./financial-info.component.scss'] }) export class FinancialInfoComponent implements OnInit { + customer_segment_abbr: any; + subproduct_abbr: any; + lender_applicant_id: any; + main_applicant: any; //Common Declaration pageTitle: string ="Financial Information"; pdid: string; @@ -75,6 +79,10 @@ export class FinancialInfoComponent implements OnInit { this.company_id =this.pd_all_details.company_id; this.notifier = notifier; this.pageTitle = this.pd_all_details.company_name + ' - ' +this.pageTitle ; + 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.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; + this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; } //ViewerOption For Docs Display @@ -301,7 +309,7 @@ export class FinancialInfoComponent implements OnInit { } selectedProfitOrLossType(e,detail){ - console.log(e); + // console.log(e); if(e.value == 1){ detail.controls.financial_net_loss.setValue(''); detail.controls.financial_margin_of_loss.setValue(''); @@ -437,8 +445,8 @@ export class FinancialInfoComponent implements OnInit { let profit = detail.value.financial_net_profit; let loss = detail.value.financial_net_loss; let salary = detail.value.financial_annual_sale; - console.log('current profit',profit); - console.log('current loss',loss); + // console.log('current profit',profit); + // console.log('current loss',loss); if ( (profit != '' || loss != '') && index != 0) { if(+profit > +salary){ @@ -451,13 +459,13 @@ export class FinancialInfoComponent implements OnInit { let prev_profit = array.value[index - 1].financial_net_profit != '' ? array.value[index - 1].financial_net_profit : 0; let prev_loss = array.value[index - 1].financial_net_loss !='' ? array.value[index - 1].financial_net_loss : 0 ; - console.log('prev_profit',prev_profit); - console.log('prev_loss',prev_loss); + // console.log('prev_profit',prev_profit); + // console.log('prev_loss',prev_loss); loss = loss != 0 ? loss * (-1) : loss; - console.log('-1',loss); + // console.log('-1',loss); prev_loss = prev_loss != 0 ? prev_loss * (-1) : prev_loss ; - console.log('prev_loss',prev_loss); + // console.log('prev_loss',prev_loss); let variation = (((profit != '' ? profit : loss ) - (prev_profit != '' ? prev_profit : prev_loss ))/ (prev_profit != '' ? Math.abs(prev_profit) : Math.abs(prev_loss))) * 100; @@ -497,7 +505,7 @@ export class FinancialInfoComponent implements OnInit { if (salary != '' && profit != '') { if(+profit>+salary){ - alert("profit is greater than salary"); + alert("profit is greater than Annual Sale "); detail.controls.financial_net_profit.setValue(0); detail.controls.financial_margin_of_profit.setValue(''); detail.controls.financial_profit_to_sale_variation.setValue(''); @@ -517,7 +525,7 @@ export class FinancialInfoComponent implements OnInit { if (salary != '' && loss != '') { if(+loss>+salary){ - alert("Loss is greater than salary"); + alert("Loss is greater than Annual Sale "); detail.controls.financial_net_loss.setValue(0); detail.controls.financial_margin_of_loss.setValue(''); detail.controls.financial_profit_to_sale_variation.setValue(''); @@ -536,8 +544,8 @@ export class FinancialInfoComponent implements OnInit { let array = this.financialForm.controls['date_per_financial']; - let prev_profit_margin = array.value[index - 1].financial__margin_of_profit != '' ? array.value[index - 1].financial_margin_of_profit : 0; - let prev_loss_margin = array.value[index - 1].financial__margin_of_loss !='' ? array.value[index - 1].financial_margin_of_loss : 0 ; + let prev_profit_margin = array.value[index - 1].financial_margin_of_profit != '' ? array.value[index - 1].financial_margin_of_profit : 0; + let prev_loss_margin = array.value[index - 1].financial_margin_of_loss !='' ? array.value[index - 1].financial_margin_of_loss : 0 ; loss_margin = loss_margin !== undefined ? loss_margin : 0; prev_loss_margin = prev_loss_margin !== undefined ? prev_loss_margin : 0 ; @@ -662,7 +670,7 @@ export class FinancialInfoComponent implements OnInit { details.controls.estimate_sales_to.setValue(estimate_sales_to!= Infinity ? estimate_sales_to:0); } } - else if(estimate_sales_from > 5000000 || estimate_sales_from <= 10000000){ + else if(estimate_sales_from > 5000000 && estimate_sales_from <= 10000000){ if(D >= 15){ var r = confirm("Given Sales Range is greater than 15%"); if (r == true) { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html index cf0bcf0c9..becb8ff24 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html @@ -2,7 +2,8 @@

- {{pageTitle}} + {{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}}
+ {{pageTitle}}
@@ -258,8 +259,10 @@ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts index 0bb218c41..a774c3184 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts @@ -16,6 +16,10 @@ import { SearchRelationPipe } from './../../../../../pd-pipes/search-relation.pi providers: [SearchRelationPipe], }) export class GeneralInfoComponent implements OnInit { + subproduct_abbr: any; + customer_segment_abbr: any; + lender_applicant_id: any; + main_applicant: any; pipe = new DatePipe('en-US'); pageTitle: string ="General Information"; pdid : string; @@ -45,6 +49,10 @@ export class GeneralInfoComponent implements OnInit { this.notifier = notifier; this.form_id = 18; this.pd_applicants_details = this.pd_all_details.pdapplicants_detials; + 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.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; + this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html index bc1bc7bb3..3fc823428 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html @@ -1,16 +1,19 @@

+ {{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}}
{{pageTitle}}
- + + +

- + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.scss index f22af58e7..cc247bddb 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.scss @@ -1,7 +1,24 @@ .mat-form-field { width: 97%; } - + ::ng-deep .cdk-global-overlay-wrapper { + align-items: flex-start !important; + } + ::ng-deep .mat-snack-bar-container.mat-snack-bar-center{ + margin: 5px !important; + } + ::ng-deep .mat-simple-snackbar-action button { + text-align: right; + padding: 0px; + color: #e00201; +} +// .notificard{ +// width: 25%; +// margin-top: -66px; +// position: absolute; +// color: #fff !important; +// background: rgba(74, 70, 70, 0.30980392156862746); +// } // .address > * { // width: 100%; // } @@ -9,9 +26,9 @@ // margin: 0 2%; // width:100%; // } - ::ng-deep .cdk-global-overlay-wrapper{ - justify-content: center !important; -} +// ::ng-deep .cdk-global-overlay-wrapper{ +// justify-content: center !important; +// } .paragraph_change { color: #fff !important; background-color: #e00201 !important; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.ts index d430fefb1..903eb06ca 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.ts @@ -4,7 +4,9 @@ import { NotifierService } from 'angular-notifier'; import { MatDialog, MatDialogRef, - MAT_DIALOG_DATA + MAT_DIALOG_DATA, + // MatSnackBarConfig, + // MatSnackBar, } from '@angular/material'; /** Service */ import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; @@ -16,23 +18,45 @@ import { ActivatedRoute, Router } from "@angular/router"; styleUrls: ['./lender-representative.component.scss'] }) export class LenderRepresentativeComponent implements OnInit { - public representativeForm: FormGroup; + customer_segment_abbr: any; + subproduct_abbr: any; + lender_applicant_id: any; + main_applicant: any; + // message : any = {}; + // applicant_name: any; + // snackBar: any; + public representativeForm: FormGroup; private notifier: NotifierService; pageTitle: string ="Lender Representative Details"; pdid: number; form_id: number; + //snack bar + + constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute, private router: Router, + // private snackBar: MatSnackBar, private _pd: PdTrigerService, private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { this.pdid = this.pd_all_details.pdmaster_details.pd_id; + 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.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; + this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; + // console.log(this.main_applicant+','+this.lender_applicant_id+','+this.subproduct_abbr+','+this.customer_segment_abbr); this.form_id = 15; this.notifier = notifier; } + // message ='Snack Bar Opened.'; + // actionButtonLabel = 'Close'; + // action = true; + // setAutohide = true; + // autoHide = 1000000; + // addExtraClass = false; public viewerOptions: any = { navbar: false, toolbar: { @@ -52,7 +76,18 @@ export class LenderRepresentativeComponent implements OnInit { flipVertical: 4, } }; + +// open() { +// // console.log('hai'); + +// const config = new MatSnackBarConfig(); +// config.duration = this.autoHide; +// config.panelClass = this.addExtraClass ? ['party'] : null; +// this.snackBar.open(this.message, this.action && this.actionButtonLabel, config); +// } ngOnInit() { + // this.message.main_applicant = this.main_applicant; + // this.message.lender_applicant_id = this.lender_applicant_id; this.initRepresentative(); let params: any = {}; params.pd_id = this.pdid; 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 b00b83441..f115114a7 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 @@ -1,6 +1,7 @@

+ {{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}}
{{pageTitle}}
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 0cc832b9d..a29b66f15 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 @@ -29,6 +29,10 @@ import {ActivatedRoute, Router} from '@angular/router'; styleUrls: ['./loan-details.component.scss'] }) export class LoanDetailsComponent implements OnInit { + customer_segment_abbr: any; + subproduct_abbr: any; + lender_applicant_id: any; + main_applicant: any; public loanDetailsForm: FormGroup; private notifier: NotifierService; @@ -97,6 +101,10 @@ export class LoanDetailsComponent implements OnInit { this.form_id = 10; this.pdid= this.pd_all_details.pdmaster_details.pd_id; this.notifier = notifier; + 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.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; + this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; } public viewerOptions: any = { navbar: false, @@ -119,7 +127,7 @@ export class LoanDetailsComponent implements OnInit { }; ngOnInit() { console.clear(); - console.log('this.applicants',this.applicants); + // console.log('this.applicants',this.applicants); this.initloanDetailsForm(); this.getM_EndUseofLoad(); this.getM_EndUseForLoan(this.pdid); @@ -346,30 +354,30 @@ getM_sourceofamount() { let that = this; this.m_mortageTypeProperty = data.records.filter( function(data){ - console.log(data); + // console.log(data); if(that.productAbbr != "LAP"){ - console.log(that.productAbbr); + // console.log(that.productAbbr); if(data.group_name == that.productAbbr && data.isactive==1){ return data; } } else if(that.productAbbr == "LAP"){ - console.log(that.productAbbr); - console.log(that.subProductName); - console.log(data.sub_group_name); + // console.log(that.productAbbr); + // console.log(that.subProductName); + // console.log(data.sub_group_name); if(data.group_name == that.productAbbr && data.sub_group_name == that.subProductName && data.isactive==1){ - console.log('lap with subproduct',data); + // console.log('lap with subproduct',data); return data; } else if(data.group_name == that.productAbbr && data.sub_group_name != null && data.isactive==1) { - console.log('lap with subproduct null',data); + // console.log('lap with subproduct null',data); return data; } } }); this.m_mortageTypeProperty // mortage_property_id">{{ typeprop.property_name - console.log(this.m_mortageTypeProperty); + // console.log(this.m_mortageTypeProperty); } }, error => { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html index 017731376..d27bf2482 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html @@ -4,7 +4,8 @@
- {{pageTitle}} + {{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}}
+ {{pageTitle}}
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 b12374961..5d5ad9eb7 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 @@ -10,7 +10,11 @@ import { parse } from 'url'; styleUrls: ['./neighbour-hood.component.scss'] }) export class NeighbourHoodComponent implements OnInit { - pageTitle: string ="Neighbourhood Check / Reference Check"; + customer_segment_abbr: any; + subproduct_abbr: any; + lender_applicant_id: any; + main_applicant: any; + pageTitle: string = "Neighbourhood Check / Reference Check"; public _neighbourhoodForm: FormGroup; pdid : string; form_id:number; @@ -30,6 +34,10 @@ export class NeighbourHoodComponent implements OnInit { this.pdid = this.data.pdmaster_details.pd_id; this.notifier = notifier; this.form_id = 19; + this.main_applicant = this.data.pdmaster_details.main_applicant; + this.lender_applicant_id = this.data.pdmaster_details.lender_applicant_id; + this.subproduct_abbr = this.data.pdmaster_details.subproduct_abbr; + this.customer_segment_abbr = this.data.pdmaster_details.customer_segment_abbr; } ngOnInit() { 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 47c367d0e..74a444bff 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 @@ -2,7 +2,8 @@

- {{pageTitle}} + {{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}}
+ {{pageTitle}}
@@ -56,8 +57,8 @@ - - {{person}} + + {{person.applicant_name}} 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 d7e421085..63519fa68 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 @@ -31,7 +31,11 @@ import {ActivatedRoute, Router} from '@angular/router'; }) export class OtherIncomeComponent implements OnInit { - pageTitle: string ="Other Income Details"; + customer_segment_abbr: any; + subproduct_abbr: any; + lender_applicant_id: any; + main_applicant: any; + pageTitle: string = "Other Income Details"; loadDataStatus: boolean=true; @@ -61,6 +65,10 @@ export class OtherIncomeComponent implements OnInit { this.applicants = this.pd_all_details.pdapplicants_detials; this.form_id = 9; this.notifier = notifier; + 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.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; + this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; } public viewerOptions: any = { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html index 2571dd94a..a3459ae4f 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html @@ -2,7 +2,8 @@

- {{pageTitle}} + {{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}}
+ {{pageTitle}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts index 83e76486b..90b5cc027 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts @@ -12,6 +12,10 @@ import { Key } from 'protractor'; }) export class PersonalInfoComponent implements OnInit { + customer_segment_abbr: any; + subproduct_abbr: any; + lender_applicant_id: any; + main_applicant: any; pageTitle: string ="Personal Details"; //qualifications:any=["Graduate","Under Graduate","Post Graduate","Professional"]; @@ -65,6 +69,10 @@ export class PersonalInfoComponent implements OnInit { this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.notifier = notifier; this.form_id = 3; + 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.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; + this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; } public viewerOptions: any = { navbar: false, diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html index cd69f0535..80d23bbfc 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html @@ -2,6 +2,7 @@

+ {{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}}
{{pageTitle}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.ts index 953ca9246..7e9d3ea84 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.ts @@ -12,6 +12,10 @@ import {Key} from 'protractor'; styleUrls: ['./rental-info.component.scss'] }) export class RentalInfoComponent implements OnInit { + customer_segment_abbr: any; + subproduct_abbr: any; + lender_applicant_id: any; + main_applicant: any; // @Input() pdid: string; // @Input() pd_all_details: any; @@ -36,6 +40,10 @@ export class RentalInfoComponent implements OnInit { this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.notifier = notifier; this.form_id = 17; + 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.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; + this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; } public viewerOptions: any = { navbar: false, 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 76d7e814b..b04ebe0c8 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 @@ -1,6 +1,7 @@

- {{pageTitle}} + {{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}}
+ {{pageTitle}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts index b182a3342..07f14edd4 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts @@ -18,6 +18,10 @@ import { analyzeAndValidateNgModules } from '@angular/compiler'; }) export class StockComponent implements OnInit { + customer_segment_abbr: any; + subproduct_abbr: any; + lender_applicant_id: any; + main_applicant: any; pageTitle: string ="Stock Details"; pdid: number; @@ -70,6 +74,10 @@ export class StockComponent implements OnInit { this.company_id = this.pd_all_details.company_id; this.notifier = notifier; this.pageTitle = this.pd_all_details.company_name + ' - ' +this.pageTitle ; + 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.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; + this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; } public viewerOptions: any = { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html index 57b72e300..4e5fe6056 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html @@ -1,5 +1,8 @@

-
{{pageTitle}}
+
+ {{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}}
+ {{pageTitle}} +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts index 1b19f75b9..66d04a9d5 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts @@ -31,6 +31,10 @@ import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; }) export class SupplierInfoComponent implements OnInit { + customer_segment_abbr: any; + subproduct_abbr: any; + lender_applicant_id: any; + main_applicant: any; pageTitle: string = "Supplier Details"; @@ -55,6 +59,10 @@ export class SupplierInfoComponent implements OnInit { this.company_id = this.pd_all_details.company_id this.notifier = notifier; this.pageTitle = this.pd_all_details.company_name + ' - ' +this.pageTitle ; + 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.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; + this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; } public viewerOptions: any = { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.scss index c97e840f3..f89b4ea23 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.scss @@ -1,6 +1,9 @@ // .child_mat_card mat-card { // margin: 2 0%; // } +::ng-deep .mat-dialog-container{ + overflow: hidden !important; +} ::ng-deep .mat-card-header-text{ margin:0px !important; } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts index 7ceeb53af..669b8950e 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts @@ -155,8 +155,11 @@ export class StartPdComponent implements OnInit, OnDestroy { if(this.selectedFormsCategory.form_id==1){ const dialogRef = this.dialog.open(SupplierInfoComponent, { data: this.pdFullDetails, - position: { right: '0'}, - width:'80%', + // position: { right: '0'}, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', disableClose: true }); dialogRef.afterClosed() @@ -168,8 +171,11 @@ export class StartPdComponent implements OnInit, OnDestroy { if(this.selectedFormsCategory.form_id==2){ const dialogRef = this.dialog.open(ClientInfoComponent, { data: this.pdFullDetails, - position: { right: '0'}, - width:'80%', + // position: { right: '0'}, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', disableClose: true }); dialogRef.afterClosed() @@ -181,8 +187,11 @@ export class StartPdComponent implements OnInit, OnDestroy { if(this.selectedFormsCategory.form_id==3){ const dialogRef = this.dialog.open(PersonalInfoComponent, { data: this.pdFullDetails, - position: { right: '0'}, - width:'80%', + // position: { right: '0'}, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', disableClose: true }); dialogRef.afterClosed() @@ -194,8 +203,11 @@ export class StartPdComponent implements OnInit, OnDestroy { if(this.selectedFormsCategory.form_id==4){ const dialogRef = this.dialog.open(AssetsInfoComponent, { data: this.pdFullDetails, - position: { right: '0'}, - width:'80%', + // position: { right: '0'}, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', disableClose: true }); dialogRef.afterClosed() @@ -207,8 +219,11 @@ export class StartPdComponent implements OnInit, OnDestroy { if(this.selectedFormsCategory.form_id==5){ const dialogRef = this.dialog.open(AddressComponent, { data: this.pdFullDetails, - position: { right: '0'}, - width:'80%', + // position: { right: '0'}, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', disableClose: true }); dialogRef.afterClosed() @@ -220,8 +235,11 @@ export class StartPdComponent implements OnInit, OnDestroy { if(this.selectedFormsCategory.form_id==6){ const dialogRef = this.dialog.open(FamilyDetailsComponent, { data: this.pdFullDetails, - position: { right: '0'}, - width:'80%', + // position: { right: '0'}, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', disableClose: true }); dialogRef.afterClosed() @@ -233,8 +251,11 @@ export class StartPdComponent implements OnInit, OnDestroy { if(this.selectedFormsCategory.form_id==7){ const dialogRef = this.dialog.open(BankingDetailsComponent, { data: this.pdFullDetails, - position: { right: '0'}, - width:'80%', + // position: { right: '0'}, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', disableClose: true }); dialogRef.afterClosed() @@ -247,8 +268,11 @@ export class StartPdComponent implements OnInit, OnDestroy { if(this.selectedFormsCategory.form_id==8){ const dialogRef = this.dialog.open(CurrentLoanComponent, { data: this.pdFullDetails, - position: { right: '0'}, - width:'80%', + // position: { right: '0'}, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', disableClose: true }); dialogRef.afterClosed() @@ -261,8 +285,11 @@ export class StartPdComponent implements OnInit, OnDestroy { if(this.selectedFormsCategory.form_id==9){ const dialogRef = this.dialog.open(OtherIncomeComponent, { data: this.pdFullDetails, - position: { right: '0'}, - width:'80%', + // position: { right: '0'}, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', disableClose: true }); dialogRef.afterClosed() @@ -274,8 +301,11 @@ export class StartPdComponent implements OnInit, OnDestroy { if(this.selectedFormsCategory.form_id==10){ const dialogRef = this.dialog.open(LoanDetailsComponent, { data: this.pdFullDetails, - position: { right: '0'}, - width:'80%', + // position: { right: '0'}, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', disableClose: true }); dialogRef.afterClosed() @@ -287,8 +317,11 @@ export class StartPdComponent implements OnInit, OnDestroy { if(this.selectedFormsCategory.form_id==11){ const dialogRef = this.dialog.open(StockComponent, { data: this.pdFullDetails, - position: { right: '0'}, - width:'80%', + // position: { right: '0'}, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', disableClose: true }); dialogRef.afterClosed() @@ -300,8 +333,11 @@ export class StartPdComponent implements OnInit, OnDestroy { if(this.selectedFormsCategory.form_id==12){ const dialogRef = this.dialog.open(EmploymentInfoComponent, { data: this.pdFullDetails, - position: { right: '0'}, - width:'80%', + // position: { right: '0'}, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', disableClose: true }); dialogRef.afterClosed() @@ -313,8 +349,11 @@ export class StartPdComponent implements OnInit, OnDestroy { if(this.selectedFormsCategory.form_id==13){ const dialogRef = this.dialog.open(BusinessInfoGroupComponent, { data: this.pdFullDetails, - position: { right: '0'}, - width:'80%', + // position: { right: '0'}, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', disableClose: true }); dialogRef.afterClosed() @@ -326,8 +365,11 @@ export class StartPdComponent implements OnInit, OnDestroy { if(this.selectedFormsCategory.form_id==14){ const dialogRef = this.dialog.open(FinancialInfoComponent, { data: this.pdFullDetails, - position: { right: '0'}, - width:'80%', + // position: { right: '0'}, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', disableClose: true }); dialogRef.afterClosed() @@ -339,8 +381,11 @@ export class StartPdComponent implements OnInit, OnDestroy { if(this.selectedFormsCategory.form_id==15){ const dialogRef = this.dialog.open(LenderRepresentativeComponent, { data: this.pdFullDetails, - position: { right: '0'}, - width:'80%', + // position: { right: '0'}, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', disableClose: true }); dialogRef.afterClosed() @@ -353,8 +398,11 @@ export class StartPdComponent implements OnInit, OnDestroy { if(this.selectedFormsCategory.form_id==16){ const dialogRef = this.dialog.open(AssessedIncomeComponent, { data: this.pdFullDetails, - position: { right: '0'}, - width:'80%', + // position: { right: '0'}, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', disableClose: true }); dialogRef.afterClosed() @@ -366,8 +414,11 @@ export class StartPdComponent implements OnInit, OnDestroy { if(this.selectedFormsCategory.form_id==17){ const dialogRef = this.dialog.open(RentalInfoComponent, { data: this.pdFullDetails, - position: { right: '0'}, - width:'80%', + // position: { right: '0'}, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', disableClose: true }); dialogRef.afterClosed() @@ -379,8 +430,11 @@ export class StartPdComponent implements OnInit, OnDestroy { else if(this.selectedFormsCategory.form_id==18){ const generaldialogRef = this.dialog.open(GeneralInfoComponent, { data: this.pdFullDetails, - position: { right: '0'}, - width:'80%', + // position: { right: '0'}, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', disableClose: true }); generaldialogRef.afterClosed() @@ -392,8 +446,11 @@ export class StartPdComponent implements OnInit, OnDestroy { else if(this.selectedFormsCategory.form_id==19){ const generaldialogRef = this.dialog.open(NeighbourHoodComponent, { data: this.pdFullDetails, - position: { right: '0'}, - width:'80%', + // position: { right: '0'}, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', disableClose: true }); generaldialogRef.afterClosed() @@ -404,8 +461,11 @@ export class StartPdComponent implements OnInit, OnDestroy { }else if(this.selectedFormsCategory.form_id==20){ const generaldialogRef = this.dialog.open(FinalRemarksComponent, { data: this.pdFullDetails, - position: { right: '0'}, - width:'80%', + // position: { right: '0'}, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', disableClose: true }); generaldialogRef.afterClosed() @@ -417,8 +477,11 @@ export class StartPdComponent implements OnInit, OnDestroy { if(this.selectedFormsCategory.form_id==22){ const dialogRef = this.dialog.open(BusinessAssetsInfoComponent, { data: this.pdFullDetails, - position: { right: '0'}, - width:'80%', + // position: { right: '0'}, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', disableClose: true }); dialogRef.afterClosed() 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 fa1a819eb..7f2604156 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 @@ -510,6 +510,7 @@ export class PdTrigerService { /** To get Family Member Name For * 1) other income form - (income earned field) + * 2) bussiness form - (partner_name field) */ getAllPersonsName(pdid:any): Observable { return this._http.post(this.apiUrl + "getAllPersonsName", { "pd_id" : pdid}) diff --git a/ng6-seed/src/app/personal-discussion/personal-discussion.module.ts b/ng6-seed/src/app/personal-discussion/personal-discussion.module.ts index 8149f4af5..0bc51ae8d 100755 --- a/ng6-seed/src/app/personal-discussion/personal-discussion.module.ts +++ b/ng6-seed/src/app/personal-discussion/personal-discussion.module.ts @@ -50,7 +50,6 @@ import { personalDiscussionRoutes } from './personal-discussion.routing'; TreeModule, MatDialogModule,MatSortModule, NgxMatSelectSearchModule,MatTooltipModule, MatExpansionModule, - ], - declarations: [] + ] }) export class PersonalDiscussionModule { } diff --git a/ng6-seed/src/app/personal-discussion/snack-bar/snack-bar.component.html b/ng6-seed/src/app/personal-discussion/snack-bar/snack-bar.component.html new file mode 100644 index 000000000..8fe9cab13 --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/snack-bar/snack-bar.component.html @@ -0,0 +1,3 @@ +

+ snack-bar works! +

diff --git a/ng6-seed/src/app/personal-discussion/snack-bar/snack-bar.component.scss b/ng6-seed/src/app/personal-discussion/snack-bar/snack-bar.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/ng6-seed/src/app/personal-discussion/snack-bar/snack-bar.component.spec.ts b/ng6-seed/src/app/personal-discussion/snack-bar/snack-bar.component.spec.ts new file mode 100644 index 000000000..05db7e794 --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/snack-bar/snack-bar.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { SnackBarComponent } from './snack-bar.component'; + +describe('SnackBarComponent', () => { + let component: SnackBarComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ SnackBarComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(SnackBarComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/ng6-seed/src/app/personal-discussion/snack-bar/snack-bar.component.ts b/ng6-seed/src/app/personal-discussion/snack-bar/snack-bar.component.ts new file mode 100644 index 000000000..d7870a9e2 --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/snack-bar/snack-bar.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-snack-bar', + templateUrl: './snack-bar.component.html', + styleUrls: ['./snack-bar.component.scss'] +}) +export class SnackBarComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +}