From a290a076173e6c61c2902623d7d4571b24c0e4e8 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 6 Feb 2019 10:07:31 +0530 Subject: [PATCH 1/4] merge : kms --- .../pd-directive/view-location/view-location.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/ng6-seed/src/app/personal-discussion/pd-directive/view-location/view-location.component.ts b/ng6-seed/src/app/personal-discussion/pd-directive/view-location/view-location.component.ts index 5730a5066..b9704ac89 100644 --- a/ng6-seed/src/app/personal-discussion/pd-directive/view-location/view-location.component.ts +++ b/ng6-seed/src/app/personal-discussion/pd-directive/view-location/view-location.component.ts @@ -11,7 +11,6 @@ export class ViewLocationComponent implements OnInit { constructor(@Inject(MAT_DIALOG_DATA) public data: any, private dialogRef: MatDialogRef) { } ngOnInit() { - console.log(this.data); } } From bafcea1556e096b83722688bb2ceee74cd42fadd Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 6 Feb 2019 16:00:49 +0530 Subject: [PATCH 2/4] assessed income sumary changes --- .../assessed-income.component.html | 186 ++++++++++++------ .../assessed-income.component.scss | 36 ++-- .../assessed-income.component.ts | 78 ++------ 3 files changed, 169 insertions(+), 131 deletions(-) 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 8ec856cb6..90286cb5a 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 @@ -17,87 +17,155 @@ - + + + +
+

a) Cost of Goods Sold

+
+
+

{{sumary_details.sales_revenue !='' && sumary_details.sales_revenue!=null ? sumary_details.sales_revenue : '0'}}

+
+ +
+ +
+

{{subDetails.sales_item}}

+
+
+

{{subDetails.annual_sale_value !='' && subDetails.annual_sale_value!=null ? subDetails.annual_sale_value : '0'}}

+
+ +
+
- -
-

a) Cost of Goods Sold

+ + + +
+

b) Purchases

+
+
+

{{sumary_details.purchase !='' && sumary_details.purchase!=null ? sumary_details.purchase : '0'}}

+
+ +
+ +
+

{{subDetails.purchase_item}}

-
-

{{sales_value}}

+
+

{{subDetails.annual_purchase_value !='' && subDetails.annual_purchase_value!=null ? subDetails.annual_purchase_value : '0'}}

- -
-

b) Purchases

-
-
-

{{purchase_value}}

-
+ + + + +
+

c) Gross Profit (a-b)

+
+
+

{{sumary_details.gross_profit}}

+
+ +
+
+ + + +
+

d) Other Income

+
+
+

{{sumary_details.other_business_income !='' && sumary_details.other_business_income !=null ? sumary_details.other_business_income : '0' }}

+
+
- -
-

c) Gross Profit (a-b)

+ +
+

{{subDetails.business_income_item}}

-
-

{{gross_profit_value}}

+
+

{{subDetails.annual_income_value !='' && subDetails.annual_income_value!=null ? subDetails.annual_income_value : '0'}}

- -
-

d) Other Income

+ + + + +
+

e) Other Expenses

+
+
+

{{sumary_details.business_expense !='' && sumary_details.business_expense !=null ? sumary_details.business_expense : '0'}}

+
+ +
+ +
+

{{subDetails.expense_item}}

-
-

{{other_income_value}}

+
+

{{subDetails.annual_expenses_value !='' && subDetails.annual_expenses_value!=null ? subDetails.annual_expenses_value : '0'}}

- -
-

e) Other Expenses

+ + + + +
+

f) Net Profit (c+d-e)

+ +
+
+

{{sumary_details.net_profit_value!='' && sumary_details.net_profit_value!=null ? sumary_details.net_profit_value : '0'}}

+
+ +
+
+ + + + +
+

g) Household Expenses

+
-
-

{{other_expense_value}}

+
+

{{sumary_details.household_expenses}}

- + - -
-

f) Net Profit (c+d-e)

- + +
+

{{subDetails.expense_item}}

-
-

{{net_profit_value}}

+
+

{{subDetails.annual_expense_value !='' && subDetails.annual_expense_value!=null ? subDetails.annual_expense_value : '0'}}

- -
-

g) Household Expenses

- -
-
-

{{house_hold_value}}

-
- -
- -
-

h) Net Disposable Income (f-g)

- - -
-
-

{{net_disable_income_value}}

-
- -
- - - + + + + +
+

h) Net Disposable Income (f-g)

+ + +
+
+

{{sumary_details.net_disable_income_value !='' && sumary_details.net_disable_income_value !=null ? sumary_details.net_disable_income_value : 0}}

+
+ +
+
+ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.scss index 71e617ab3..a63b81ec4 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.scss @@ -119,21 +119,35 @@ display: flex; border:1px solid rgba(0, 0, 0, 0.12); } - - mat-list-item:nth-child(3) { - background-color: #f5f5f5; - } - mat-list-item:nth-child(6) { - background-color: #f5f5f5; - } - mat-list-item:nth-child(8) { - background-color: #f5f5f5; - } + +// mat-list-item:nth-child(3) { +// background-color: #f5f5f5; +// } +// mat-list-item:nth-child(6) { +// background-color: #f5f5f5; +// } +// mat-list-item:nth-child(8) { +// background-color: #f5f5f5; +// } + mat-list-item:not(:first-child) { + cursor: auto; + .sub_item{ + margin-left: 35% !important; + } + p{ + font-size: 1rem !important; + } + + } + mat-list-item:first-child { + background-color: papayawhip; + } + .mat_list_right_div { text-align: left; } .mat_list_center_div { - text-align: center; + text-align: right; } 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 bdb939669..29ef95b94 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 @@ -21,15 +21,8 @@ export class AssessedIncomeComponent implements OnInit { // @Input() form_id: number; pdid: number; form_id: number; - displayedColumns = ['sno','list','amount']; - sales_value: number; - purchase_value: number; - gross_profit_value: number; - other_income_value: number; - other_expense_value: number; - net_profit_value: number; - house_hold_value: number; - net_disable_income_value: number; + sumary_details:any={"sales_revenue":0,"sales_revenue_details":[],"purchase":0,"purchase_details":[],"gross_profit":0,"other_business_income":0,"other_business_income_details":[] + ,"business_expense":0,"business_expense_details":[],"net_profit_value":0,"household_expenses":0,"house_hold_expense_details":[],"net_disable_income_value":0}; public salesCaluatedItem:any= []; public salesItemMonthWise:any= []; public purchaseDetails:any= []; @@ -65,15 +58,7 @@ 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.sales_value=0; - this.purchase_value=0; - this.gross_profit_value=0; - this.other_income_value=0; - this.other_expense_value=0; - this.net_profit_value=0; - this.house_hold_value=0; - this.net_disable_income_value=0; - + } public viewerOptions: any = { navbar: false, @@ -117,35 +102,6 @@ public viewerOptions: any = { } if(value.records.sales_items_by_monthwise){ this.salesItemMonthWise = value.records.sales_items_by_monthwise; - // hide table format start - - // this.salesItemMonthWise.forEach((itemElement, itemIndex) => { - // this.salesItemMonthWiseBody= Object.keys(itemElement.items).map(key => ({ header:key, value: itemElement.items[key] })); - // let combineTableColumn = Object.keys(itemElement.items).map(key => (itemElement.items[key])); - // let sumItems: any=[]; - // combineTableColumn.forEach((sumValue, sumIndex) => { - // let calculateItems = sumValue.reduce((acc, calculate) => acc + Number(calculate.sales_value), 0); - // sumItems.push({bodyElement:sumValue, bodyElementTotal:calculateItems}); - // }) - // let calculateAllItemsTotal:number=sumItems.reduce((racc, rcalculate) => racc + Number(rcalculate.bodyElementTotal), 0); - // let convertYear : number = 12 / sumItems.length; - // let tableFooterMessage: any=[]; - // tableFooterMessage.push({ - // message: sumItems.length + ' Months ' + itemElement.sales_item + ' Sales ', - // value:calculateAllItemsTotal, - // cols_span_length:sumItems.length * 2 -1, - // }) - // tableFooterMessage.push({ - // message: ' Yearly ' + itemElement.sales_item + ' Sales Arrived', - // value: calculateAllItemsTotal * convertYear, - // cols_span_length:sumItems.length * 2 -1 , - // }) - // this.salesMonthWiseTable.push({salesItem:itemElement.sales_item,headerElement:this.salesItemMonthWiseBody, bodyElements:sumItems, parentTableFooter:tableFooterMessage}); - // //console.log(this.salesMonthWiseTable) - // }); - // hide table format end - - this.salesItemMonthWise.forEach((itemElement, itemIndex) => { let expandBodyContent= Object.keys(itemElement.items).map(key => ({ header:key, value: itemElement.items[key] })); let listItems: any=[]; @@ -185,26 +141,26 @@ public viewerOptions: any = { if(value.records.final_data.length >0){ // this.finalData = value.records.final_data[0]; - - this.sales_value = value.records.final_data[0].income.sales_revenue !='' && value.records.final_data[0].income.sales_revenue !=null ? value.records.final_data[0].income.sales_revenue : 0; - this.purchase_value = value.records.final_data[0].expense.purchase !='' && value.records.final_data[0].expense.purchase !=null ? value.records.final_data[0].expense.purchase : 0; - this.gross_profit_value = value.records.final_data[0].gross_profit !='' && value.records.final_data[0].gross_profit !=null ? value.records.final_data[0].gross_profit : 0; - this.other_income_value = value.records.final_data[0].income.other_business_income !='' && value.records.final_data[0].income.other_business_income !=null ? value.records.final_data[0].income.other_business_income : 0; - this.other_expense_value = value.records.final_data[0].expense.business_expense !='' && value.records.final_data[0].expense.business_expense !=null ? value.records.final_data[0].expense.business_expense : 0; - this.net_profit_value = value.records.final_data[0].expense.net_profit !='' && value.records.final_data[0].expense.net_profit !=null ? value.records.final_data[0].expense.net_profit : 0; - this.house_hold_value = 0; - this.net_disable_income_value = this.net_profit_value-this.house_hold_value; + this.sumary_details = value.records.final_data[0]; + this.sumary_details["sales_revenue"] = value.records.final_data[0].sales_revenue; + this.sumary_details["sales_revenue_details"] = value.records.final_data[0].sales_revenue_details; + this.sumary_details["purchase"] = value.records.final_data[0].purchase; + this.sumary_details["purchase_details"] = value.records.final_data[0].purchase_details; + this.sumary_details["gross_profit"] = value.records.final_data[0].gross_profit; + this.sumary_details["other_business_income"] = value.records.final_data[0].other_business_income; + this.sumary_details["other_business_income_details"] = value.records.final_data[0].other_business_income_details; + this.sumary_details["business_expense"] = value.records.final_data[0].business_expense; + this.sumary_details["business_expense_details"] = value.records.final_data[0].business_expense_details; + this.sumary_details["net_profit_value"] = value.records.final_data[0].net_profit_value !='' && value.records.final_data[0].net_profit_value!=null ? value.records.final_data[0].net_profit_value : 0; + this.sumary_details["household_expenses"] = value.records.final_data[0].household_expenses; + this.sumary_details["house_hold_expense_details"] = value.records.final_data[0].house_hold_expense_details !='' && value.records.final_data[0].house_hold_expense_details !=null ? value.records.final_data[0].house_hold_expense_details : 0; + this.sumary_details["net_disable_income_value"] = Number(this.sumary_details.net_profit_value) - Number(this.sumary_details.household_expenses); } } }) } - // get total cost - getTotalCost(getItems:any) { - return getItems.map(t => t.sales_value).reduce((acc, value) => acc + Number(value), 0); - } - // get common drop down list getAIMaster(table:string, type:Number):void { this._pd.getAllMasterDatas(table).subscribe( From de9c8649ce8b34ee7a8f61a0f9a5e87f0aea8283 Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Wed, 6 Feb 2019 18:18:23 +0530 Subject: [PATCH 3/4] UI Changes --- .../business-info-group.component.ts | 49 ++++-- .../lender-representative.component.html | 21 ++- .../lender-representative.component.scss | 25 ++- .../lender-representative.component.ts | 39 ++++- .../list-pd/start-pd/start-pd.component.scss | 3 + .../list-pd/start-pd/start-pd.component.ts | 147 +++++++++++++----- .../personal-discussion.module.ts | 3 +- .../snack-bar/snack-bar.component.html | 3 + .../snack-bar/snack-bar.component.scss | 0 .../snack-bar/snack-bar.component.spec.ts | 25 +++ .../snack-bar/snack-bar.component.ts | 15 ++ 11 files changed, 264 insertions(+), 66 deletions(-) create mode 100644 ng6-seed/src/app/personal-discussion/snack-bar/snack-bar.component.html create mode 100644 ng6-seed/src/app/personal-discussion/snack-bar/snack-bar.component.scss create mode 100644 ng6-seed/src/app/personal-discussion/snack-bar/snack-bar.component.spec.ts create mode 100644 ng6-seed/src/app/personal-discussion/snack-bar/snack-bar.component.ts 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..cc10f5619 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 @@ -60,8 +60,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 +75,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 +90,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 +105,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 +120,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 +135,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 +150,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/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..6224e0a8f 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,33 @@

+ {{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..fa9f58874 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/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 0af985710..75a7bbdb3 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 @@ -161,8 +161,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() @@ -174,8 +177,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() @@ -187,8 +193,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() @@ -200,8 +209,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() @@ -213,8 +225,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() @@ -226,8 +241,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() @@ -239,8 +257,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() @@ -253,8 +274,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() @@ -267,8 +291,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() @@ -280,8 +307,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() @@ -293,8 +323,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() @@ -306,8 +339,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() @@ -319,8 +355,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() @@ -332,8 +371,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() @@ -345,8 +387,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() @@ -359,8 +404,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() @@ -372,8 +420,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() @@ -385,8 +436,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() @@ -398,8 +452,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() @@ -410,8 +467,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() @@ -423,8 +483,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/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() { + } + +} From 510fa91598adf78d6b2d0fe8405c8615bae31a46 Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Wed, 6 Feb 2019 19:09:23 +0530 Subject: [PATCH 4/4] changes --- .../forms/address/address.component.html | 3 ++- .../forms/address/address.component.ts | 11 ++++++++++- .../assessed-income.component.html | 1 + .../assessed-income.component.ts | 8 ++++++++ .../assets-info/assets-info.component.html | 3 ++- .../forms/assets-info/assets-info.component.ts | 10 +++++++++- .../banking-details.component.html | 3 ++- .../banking-details.component.ts | 10 +++++++++- .../business-assets-info.component.html | 3 ++- .../business-assets-info.component.ts | 8 ++++++++ .../business-banking-details.component.html | 3 ++- .../business-banking-details.component.ts | 9 ++++++++- .../business-info-group.component.html | 4 +++- .../business-info-group.component.ts | 10 +++++++++- .../business-info/business-info.component.html | 3 ++- .../business-info/business-info.component.ts | 8 ++++++++ .../client-info/client-info.component.html | 5 ++++- .../forms/client-info/client-info.component.ts | 8 ++++++++ .../current-loan/current-loan.component.html | 5 ++++- .../current-loan/current-loan.component.ts | 8 ++++++++ .../employment-info.component.html | 3 ++- .../employment-info.component.ts | 10 +++++++++- .../family-details.component.html | 3 ++- .../family-details/family-details.component.ts | 10 +++++++++- .../final-remarks/final-remarks.component.html | 5 ++++- .../final-remarks/final-remarks.component.ts | 8 ++++++++ .../financial-info.component.html | 3 ++- .../financial-info/financial-info.component.ts | 8 ++++++++ .../general-info/general-info.component.html | 3 ++- .../general-info/general-info.component.ts | 8 ++++++++ .../lender-representative.component.html | 18 ++---------------- .../lender-representative.component.ts | 8 ++++---- .../loan-details/loan-details.component.html | 1 + .../loan-details/loan-details.component.ts | 8 ++++++++ .../neighbour-hood.component.html | 3 ++- .../neighbour-hood/neighbour-hood.component.ts | 10 +++++++++- .../other-income/other-income.component.html | 3 ++- .../other-income/other-income.component.ts | 10 +++++++++- .../personal-info/personal-info.component.html | 3 ++- .../personal-info/personal-info.component.ts | 8 ++++++++ .../rental-info/rental-info.component.html | 1 + .../forms/rental-info/rental-info.component.ts | 8 ++++++++ .../start-pd/forms/stock/stock.component.html | 3 ++- .../start-pd/forms/stock/stock.component.ts | 8 ++++++++ .../supplier-info/supplier-info.component.html | 5 ++++- .../supplier-info/supplier-info.component.ts | 8 ++++++++ 46 files changed, 241 insertions(+), 48 deletions(-) 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..3e5e97070 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; @@ -94,6 +98,11 @@ export class AddressComponent implements OnInit { 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..af41902d8 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}}
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 cc10f5619..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() { 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..1e1489e0f 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}}
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..2edf014a3 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; @@ -93,6 +97,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, 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..1420925d2 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}} +
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..775db9787 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"; @@ -63,6 +67,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, 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..0fa166745 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 = { 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..d5367cf07 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/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..39036c141 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'], 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..34461d5ca 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 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..3c5b8bb37 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}}
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 6224e0a8f..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 @@ -5,13 +5,7 @@ {{pageTitle}}
- + @@ -19,15 +13,7 @@

- + 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 fa9f58874..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 @@ -5,8 +5,8 @@ import { MatDialog, MatDialogRef, MAT_DIALOG_DATA, - MatSnackBarConfig, - MatSnackBar, + // MatSnackBarConfig, + // MatSnackBar, } from '@angular/material'; /** Service */ import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; @@ -22,7 +22,7 @@ export class LenderRepresentativeComponent implements OnInit { subproduct_abbr: any; lender_applicant_id: any; main_applicant: any; - message : any = {}; + // message : any = {}; // applicant_name: any; // snackBar: any; public representativeForm: FormGroup; @@ -38,7 +38,7 @@ export class LenderRepresentativeComponent implements OnInit { private fb: FormBuilder, private route: ActivatedRoute, private router: Router, - private snackBar: MatSnackBar, + // private snackBar: MatSnackBar, private _pd: PdTrigerService, private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { 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..5cb7da2c9 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, 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..d8675beda 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}}
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 = {