diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index 3e74694c..d56827ab 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -712,14 +712,19 @@ export class HomeComponent implements OnInit { const key = 'P_OPEN_NTF_NUMBER'; // this.totalRequestCount = ; // this.ITGCountAllNotification(result[key]); + this.common.setFilterValues(result['GetOpenNotificationsList']); + const values = this.common.getFiltersData(); + this.data = values.data; + this.filters = values.filters; + this.totalRequestCount = Math.floor(result[key]); + this.common.sharedService.setSharedData(this.totalRequestCount, 'total-count'); + + this.common.stopLoading() this.common.sharedService.setSharedData( result, 'worklistNotifications' ); - this.common.setFilterValues(result['GetOpenNotificationsList']); - - } }); } diff --git a/Mohem/src/app/profile/confirm-address/confirm-address.component.ts b/Mohem/src/app/profile/confirm-address/confirm-address.component.ts index fb51f580..274116b4 100644 --- a/Mohem/src/app/profile/confirm-address/confirm-address.component.ts +++ b/Mohem/src/app/profile/confirm-address/confirm-address.component.ts @@ -273,7 +273,8 @@ export class ConfirmAddressComponent implements OnInit { this.cs.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED); // this.cs.openHome(); //this.cs.setTotalNumberOfWorklistRequest(true); - this.cs.openNotificationPage(); + this.cs.openProfile('sideMenu'); + //this.cs.openNotificationPage(); } } diff --git a/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.ts b/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.ts index 8b34d7f4..e1cede68 100644 --- a/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.ts +++ b/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.ts @@ -196,7 +196,8 @@ export class ConfirmBasicDetailsComponent implements OnInit { // this.cs.presentAlert(msg); this.cs.greenToastPK("eit", "approval-message-success"); this.cs.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED); - this.cs.openNotificationPage(); + this.cs.openProfile('sideMenu'); + //this.cs.openNotificationPage(); } } diff --git a/Mohem/src/app/profile/confirm-contact/confirm-contact.component.ts b/Mohem/src/app/profile/confirm-contact/confirm-contact.component.ts index 894fb16e..f484df00 100644 --- a/Mohem/src/app/profile/confirm-contact/confirm-contact.component.ts +++ b/Mohem/src/app/profile/confirm-contact/confirm-contact.component.ts @@ -197,7 +197,8 @@ export class ConfirmContactComponent implements OnInit { // this.cs.presentAlert(msg); this.cs.greenToastPK("eit", "approval-message-success"); this.cs.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED); - this.cs.openNotificationPage(); + this.cs.openProfile('sideMenu'); + //this.cs.openNotificationPage(); } }