From eee3f27cecd491d717f3e11772a147b7e7d19478 Mon Sep 17 00:00:00 2001 From: enadhilal Date: Thu, 2 Dec 2021 09:25:00 +0300 Subject: [PATCH] fixed loading div in worklist --- .../worklist-main.component.html | 20 +++++++++++++++---- .../worklist-main.component.scss | 9 +++++++++ .../worklist-main/worklist-main.component.ts | 11 +++++++++- 3 files changed, 35 insertions(+), 5 deletions(-) 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 81a701b9..dfffa55c 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.html +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.html @@ -40,8 +40,7 @@ -
{{pInformation}} -
+
{{pInformation}}
@@ -49,10 +48,16 @@ -
+ +

{{'worklist, loading'| translate}}

-
+ +
+

{{ 'general, empty' | translate}}

+
+ +
@@ -126,6 +131,13 @@ +
+

{{'worklist, loading'| translate}}

+
+ +
+

{{ 'general, empty' | translate}}

+
diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.scss b/Mohem/src/app/notification/worklist-main/worklist-main.component.scss index a60545fb..31893558 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.scss +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.scss @@ -137,6 +137,15 @@ border-radius: 10px; margin: 10px; } + + .no-data-div{ + background: #ffffff; + height: 100%; + text-align: center; + padding-top: 1px; + border-radius: 10px; + margin: 10px; + } .container { font-size: 14px; 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 b45ba252..617e7b3d 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts @@ -108,6 +108,7 @@ export class WorklistMainComponent implements OnInit { closeDis: boolean = false; public selectedFilter: string; public arr_hr_req_only = []; + public showInformation = true; constructor( public worklistService: WorklistService, @@ -337,6 +338,7 @@ export class WorklistMainComponent implements OnInit { } handleWorkListBodyResult(result, Type) { + this.showInformation = false; if (this.common.validResponse(result)) { this.pInformation = result.P_INFORMATION; this.pQuestion = result.P_QUESTION; @@ -1148,7 +1150,6 @@ export class WorklistMainComponent implements OnInit { } - @@ -1157,4 +1158,12 @@ export class WorklistMainComponent implements OnInit { return this.locale[lang].month_names_short[month]; } +showLoading( notificationList ) { + if (notificationList.length < 0) { + return true; + } else if (notificationList === []){ + return false; + } else {return true;} +} + }