diff --git a/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.html b/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.html index 3cf45f01d..a10af7a21 100755 --- a/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.html @@ -1,5 +1,5 @@ -
+
+ + Customer-SMS + + + + + + + QCteam -SMS + + + + + + + + Customer -MAIL + + + + + + + Lender -MAIL @@ -89,6 +112,59 @@ + + QCteam -MAIL + + + + + + + + + Customer -App + + + + + + + + + Lender -App + + + + + + + + + PD Incharge -App + + + + + + + + PD Officer -App + + + + + + + + QCteam -App + + + + + + - + - - + + @@ -124,7 +200,8 @@ -
+
+

diff --git a/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.scss b/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.scss index 92b4ae72e..868cab018 100755 --- a/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.scss +++ b/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.scss @@ -22,8 +22,8 @@ .mat-table { display: table; width: 100%; - overflow: auto; - max-height: 500px; + // overflow: auto; + // max-height: 500px; > .mat-header-row, > .mat-row { display: table-row; @@ -62,4 +62,13 @@ .filter-header { min-height: 64px; padding: 8px 24px 0; +} + +.mat-row, .mat-header-row { + min-width: 2800px; + width: 100%; +} +.example-container { + height: 100%; + overflow: -webkit-paged-x; } \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.ts b/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.ts index c82cac7a1..fe3c8c94c 100755 --- a/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.ts @@ -35,7 +35,7 @@ export class PdNotificationListComponent implements OnInit { public dataLength: number; public dataSource = new MatTableDataSource(); - displayedColumns = ['serialno','pd_status_name','sms_lender','sms_pdofficer','sms_pdincharge','mail_lender', 'mail_pdincharge','mail_pdofficer']; + displayedColumns = ['serialno','pd_status_name','sms_customer','sms_lender','sms_pdofficer','sms_pdincharge','sms_qcteam','mail_customer','mail_lender', 'mail_pdincharge','mail_pdofficer','mail_qcteam','app_customer','app_lender','app_pdincharge','app_pdofficer','app_qcteam']; @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; @@ -92,6 +92,11 @@ export class PdNotificationListComponent implements OnInit { this.noRecordFound = false; this.notificationData = data.records; this.notificationData.forEach((item, index) => { + if(item.sms_customer ==1){ + this.notificationData[index].sms_customer = true; + }else{ + this.notificationData[index].sms_customer = false; + } if(item.sms_lender ==1){ this.notificationData[index].sms_lender = true; }else{ @@ -107,6 +112,16 @@ export class PdNotificationListComponent implements OnInit { }else{ this.notificationData[index].sms_pdincharge = false; } + if(item.sms_qcteam ==1){ + this.notificationData[index].sms_qcteam = true; + }else{ + this.notificationData[index].sms_qcteam = false; + } + if(item.mail_customer ==1){ + this.notificationData[index].mail_customer = true; + }else{ + this.notificationData[index].mail_customer = false; + } if(item.mail_lender ==1){ this.notificationData[index].mail_lender = true; }else{ @@ -122,6 +137,36 @@ export class PdNotificationListComponent implements OnInit { }else{ this.notificationData[index].mail_pdofficer = false; } + if(item.mail_qcteam ==1){ + this.notificationData[index].mail_qcteam = true; + }else{ + this.notificationData[index].mail_qcteam = false; + } + if(item.app_customer ==1){ + this.notificationData[index].app_customer = true; + }else{ + this.notificationData[index].app_customer = false; + } + if(item.app_lender ==1){ + this.notificationData[index].app_lender = true; + }else{ + this.notificationData[index].app_lender = false; + } + if(item.app_pdincharge ==1){ + this.notificationData[index].app_pdincharge = true; + }else{ + this.notificationData[index].app_pdincharge = false; + } + if(item.app_pdofficer ==1){ + this.notificationData[index].app_pdofficer = true; + }else{ + this.notificationData[index].app_pdofficer = false; + } + if(item.app_qcteam ==1){ + this.notificationData[index].app_qcteam = true; + }else{ + this.notificationData[index].app_qcteam = false; + } if(item.isactive ==1){ this.notificationData[index].isactive = true; }else{