diff --git a/Mohem/src/app/hmg-common/services/common/common.service.ts b/Mohem/src/app/hmg-common/services/common/common.service.ts
index 31f9a7cd..711a8ec5 100644
--- a/Mohem/src/app/hmg-common/services/common/common.service.ts
+++ b/Mohem/src/app/hmg-common/services/common/common.service.ts
@@ -596,7 +596,7 @@ public getMonthNameAr(value: number): string {
if (result.MessageStatus === 1) {
return true;
} else if (result.MessageStatus === 2) {
- return this.hasData(result['SameClinicApptList']);
+ return false;
}
return false;
}
diff --git a/Mohem/src/app/hmg-common/services/connector/connector.service.ts b/Mohem/src/app/hmg-common/services/connector/connector.service.ts
index 1f34b0ad..e1ce2293 100644
--- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts
+++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts
@@ -167,6 +167,7 @@ public static host = 'https://uat.hmgwebservices.com/';
}
if (!this.cs.validResponse(result)) {
if (result.IsAuthenticated === false) {
+ this.cs.stopLoading();
this.cs.presentAcceptDialog(result.ErrorEndUserMessage, () => {
this.cs.sharedService.clearAll();
this.cs.openLogin();
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 c6848fb7..d7ca6888 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
@@ -1,11 +1,8 @@
-
-
-
+
+
-
-
-
+
+
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 74f64e09..2303f683 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
@@ -1,14 +1,9 @@
-
-
-
-
-
-
+
+
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 2546220a..438b15dd 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
@@ -1,11 +1,9 @@
-
-
-
+
+
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 2d6b35f0..e3836ebd 100644
--- a/Mohem/src/app/notification/worklist-main/worklist-main.component.html
+++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.html
@@ -1,11 +1,10 @@
-
-
-
+
+
+
diff --git a/Mohem/src/app/profile/edit-profile/edit-profile.component.html b/Mohem/src/app/profile/edit-profile/edit-profile.component.html
index 06fafaa1..67534708 100644
--- a/Mohem/src/app/profile/edit-profile/edit-profile.component.html
+++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.html
@@ -1,14 +1,7 @@
-
-
-
-
-
-
+
+