diff --git a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.html b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.html index 0206f5a4..d3bb1ab1 100644 --- a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.html +++ b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.html @@ -202,13 +202,18 @@ + +

{{'worklist, loading'| translate}}

+
+ -
+

{{ 'general, empty' | translate}}

-
+
diff --git a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.ts b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.ts index d4d94682..4e2a3bf4 100644 --- a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.ts +++ b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.ts @@ -129,8 +129,8 @@ export class WorklistMainIcComponent implements OnInit { reqInfo_label: any; closeDis: boolean = false; selectedFilter: string; - ; close_label: any; + public showActionHistoryLoading = true; constructor( public common: CommonService, @@ -875,6 +875,7 @@ export class WorklistMainIcComponent implements OnInit { } handleWorkListActionHistoryResult(result) { + this.showActionHistoryLoading = false; if (this.common.validResponse(result)) { if (this.common.hasData(result.GetActionHistoryList)) { this.actionHistoryRes = result.GetActionHistoryList; diff --git a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html index de2dff5f..1ae21026 100644 --- a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html +++ b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html @@ -437,13 +437,19 @@ + +

{{'worklist, loading'| translate}}

+
+ - -
+ +

{{ 'general, empty' | translate}}

-
+ +
diff --git a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts index bfdf25c6..4881b8c7 100644 --- a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts +++ b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts @@ -118,6 +118,7 @@ export class WorklistMainMRComponent implements OnInit { close_label: any; closeDis: boolean = false; selectedFilter: string; + public showActionHistoryLoading = true; constructor( @@ -809,6 +810,7 @@ export class WorklistMainMRComponent implements OnInit { } handleWorkListActionHistoryResult(result) { + this.showActionHistoryLoading = false; if (this.common.validResponse(result)) { if (this.common.hasData(result.GetActionHistoryList)) { this.actionHistoryRes = result.GetActionHistoryList; diff --git a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html index bd933831..32757fe0 100644 --- a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html +++ b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html @@ -170,13 +170,19 @@ + +

{{'worklist, loading'| translate}}

+
+ -
+

{{ 'general, empty' | translate}}

-
+ +
diff --git a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts index f2e79a55..0d7e4247 100644 --- a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts +++ b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts @@ -129,8 +129,9 @@ export class WorklistMainPoComponent implements OnInit { reqInfo_label: any; closeDis: boolean = false; selectedFilter: string; - ; close_label: any; + public showActionHistoryLoading = true; + constructor( public common: CommonService, @@ -851,6 +852,7 @@ export class WorklistMainPoComponent implements OnInit { } handleWorkListActionHistoryResult(result) { + this.showActionHistoryLoading = false; if (this.common.validResponse(result)) { if (this.common.hasData(result.GetActionHistoryList)) { this.actionHistoryRes = result.GetActionHistoryList; diff --git a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html index 69de2e55..50db52b7 100644 --- a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html +++ b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html @@ -200,13 +200,17 @@ + +

{{'worklist, loading'| translate}}

+
+ - -
+

{{ 'general, empty' | translate}}

-
+
diff --git a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts index 74cc53ce..0335c9be 100644 --- a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts +++ b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts @@ -115,6 +115,7 @@ export class WorklistMainPRComponent implements OnInit { close_label: any; closeDis: boolean = false; selectedFilter: any; + public showActionHistoryLoading = true; constructor( @@ -836,6 +837,7 @@ export class WorklistMainPRComponent implements OnInit { } handleWorkListActionHistoryResult(result) { + this.showActionHistoryLoading = false; if (this.common.validResponse(result)) { if (this.common.hasData(result.GetActionHistoryList)) { this.actionHistoryRes = result.GetActionHistoryList; diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.html b/Mohem/src/app/notification/worklist-main/worklist-main.component.html index 6400b618..09a9a2c1 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.html +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.html @@ -624,14 +624,18 @@ + +

{{'worklist, loading'| translate}}

+
-
+

{{ 'general, empty' | translate}}

-
+
diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts index 337d2307..f917efe3 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts @@ -111,6 +111,7 @@ export class WorklistMainComponent implements OnInit { public selectedFilter: string; public arr_hr_req_only = []; public showInformation = true; + public showActionHistoryLoading = true; constructor( @@ -1000,6 +1001,7 @@ export class WorklistMainComponent implements OnInit { } handleWorkListActionHistoryResult(result) { + this.showActionHistoryLoading = false; console.log("1" + this.IsReachEnd); if (this.common.validResponse(result)) { if (this.common.hasData(result.GetActionHistoryList)) {