From 2c5c0599d8ac8f6cebe484006221262295139198 Mon Sep 17 00:00:00 2001 From: ashwaq Date: Mon, 17 Feb 2020 13:23:59 +0300 Subject: [PATCH] fix conflict worklist --- Mohem/src/app/notification/home/home.component.html | 2 +- Mohem/src/app/notification/home/home.component.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Mohem/src/app/notification/home/home.component.html b/Mohem/src/app/notification/home/home.component.html index 1ab21604..0fc2a591 100644 --- a/Mohem/src/app/notification/home/home.component.html +++ b/Mohem/src/app/notification/home/home.component.html @@ -53,7 +53,7 @@
{{data.key}} -
+

{{workList.SUBJECT}}

diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index 1021547f..59c10f87 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -331,13 +331,13 @@ export class HomeComponent implements OnInit { openNotificationDetail(obj) { console.log(obj); - this.common.sharedService.setSharedData(obj, HomeComponent.NOTIFICATION_DATA); + this.common.sharedService.setSharedData(obj[0], HomeComponent.NOTIFICATION_DATA); // this.common.openWorklistMainPage(); if (obj.REQUEST_TYPE === 'PR') { this.common.openWorklistMainPRPage(); - } else if (obj.REQUEST_TYPE === 'PO') { + } else if (obj[0].REQUEST_TYPE === 'PO') { this.common.openWorklistMainPOPage(); - } else if (obj.REQUEST_TYPE === 'MO') { + } else if (obj[0].REQUEST_TYPE === 'MO') { this.common.openWorklistMainMRPage(); } else { this.common.openWorklistMainPage();