From ff04ddc57728fdecf39c4607dbb257389a0bd2c0 Mon Sep 17 00:00:00 2001 From: enadhilal Date: Mon, 13 Apr 2020 15:38:31 +0300 Subject: [PATCH 1/3] fix user to be list --- .../work-list-main-itg.component.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html index 127dc7e5..08556ea4 100644 --- a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html +++ b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html @@ -25,7 +25,7 @@
- +
@@ -166,17 +166,17 @@ - + - {{action.name}} + {{action.name}} - + - Skip + Skip From 8d1acd53f81c20794b4914d565d89caf40ae7bab Mon Sep 17 00:00:00 2001 From: enadhilal Date: Mon, 13 Apr 2020 15:49:06 +0300 Subject: [PATCH 2/3] fix user to be list and fix header color for replacment --- .../work-list-replacement-itg.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html index d4538af0..06d775fa 100644 --- a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html +++ b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html @@ -1,5 +1,5 @@ - + {{ 'vacation-rule, search-employee' | translate}} From 45f0ab942a331489109e07f08bd5fe2be21d91cf Mon Sep 17 00:00:00 2001 From: enadhilal Date: Mon, 13 Apr 2020 19:35:07 +0300 Subject: [PATCH 3/3] fix count in ITG --- .../work-list-main-itg.component.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts index 9078511f..782d42a5 100644 --- a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts +++ b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts @@ -243,7 +243,7 @@ export class WorkListMainItgComponent implements OnInit { } else if (result.MessageStatus == 1) { console.log("hello action 1"); this.common.presentAlert(this.ts.trPK('worklistMain', 'Tran_Succ')); - + this.common.sharedService.setSharedData(true, 'loadWorkList'); this.confirmMsg(1) // this.common.openNotificationPage(); @@ -261,7 +261,7 @@ export class WorkListMainItgComponent implements OnInit { } else if (result.MessageStatus == 1) { this.common.presentAlert(this.ts.trPK('worklistMain', 'Tran_Succ')); - + this.common.sharedService.setSharedData(true, 'loadWorkList'); this.confirmMsg(2) // this.common.openNotificationPage(); this.skip(); @@ -285,7 +285,7 @@ export class WorkListMainItgComponent implements OnInit { if (result.MessageStatus == 1) { this.common.presentAlert(this.ts.trPK('worklistMain', 'Tran_Succ')); - + this.common.sharedService.setSharedData(true, 'loadWorkList'); this.confirmMsg(3) // this.common.openNotificationPage(); this.skip(); @@ -304,7 +304,7 @@ export class WorkListMainItgComponent implements OnInit { } else if (result.MessageStatus == 1) { this.common.presentAlert(this.ts.trPK('worklistMain', 'Tran_Succ')); - + this.common.sharedService.setSharedData(true, 'loadWorkList'); this.confirmMsg(4) // this.common.openNotificationPage(); this.skip(); @@ -324,7 +324,7 @@ export class WorkListMainItgComponent implements OnInit { } else if (result.MessageStatus == 1) { this.common.presentAlert(this.ts.trPK('worklistMain', 'Tran_Succ')); - + this.common.sharedService.setSharedData(true, 'loadWorkList'); this.confirmMsg(5) // this.common.openNotificationPage(); this.skip(); @@ -347,7 +347,7 @@ export class WorkListMainItgComponent implements OnInit { } else if (result.MessageStatus == 1) { this.common.presentAlert(this.ts.trPK('worklistMain', 'Tran_Succ')); - + this.common.sharedService.setSharedData(true, 'loadWorkList'); this.confirmMsg(6) // this.common.openNotificationPage(); this.skip();