From ba2ac70f8651e7fba36d1980c5fc9547fcfc36ba Mon Sep 17 00:00:00 2001 From: enadhilal Date: Sat, 11 Apr 2020 21:40:07 +0300 Subject: [PATCH] showing comment --- .../work-list-main-itg/work-list-main-itg.component.html | 9 ++++++++- .../work-list-main-itg/work-list-main-itg.component.ts | 5 ++++- 2 files changed, 12 insertions(+), 2 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 6c7082f9..7c41c2ff 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 @@ -110,7 +110,14 @@

{{approvalInfo.Action}}

-

{{approvalInfo.Name}}

+
+

{{approvalInfo.Name}}

+
+

{{ 'submitAbsence, comments' | translate}}:

+

{{approvalInfo.Notes}}

+ +
+
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 c531062f..dfd4f5e3 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 @@ -301,7 +301,10 @@ export class WorkListMainItgComponent implements OnInit { } }, this.ts.trPK('general', 'ok'), - () => { this.actionSelected = '' }, this.ts.trPK('general', 'cancel'), + () => { + this.actionSelected = ''; + this.common.sharedService.setSharedData(true, 'loadWorkList'); + }, this.ts.trPK('general', 'cancel'), this.ts.trPK('vacation-rule', 'confirmation'), this.confirmMsg(action));