diff --git a/Mohem/src/app/absence/submit-absence/submit-absence.component.html b/Mohem/src/app/absence/submit-absence/submit-absence.component.html index e1a10ef5..62d8901b 100644 --- a/Mohem/src/app/absence/submit-absence/submit-absence.component.html +++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.html @@ -1,11 +1,7 @@ - - - {{ts.trPK('submitAbsence','submitAbsence')}} - - - - - + + diff --git a/Mohem/src/app/authentication/change-password/change-password.component.html b/Mohem/src/app/authentication/change-password/change-password.component.html index 7f25dbc6..b758a8ce 100644 --- a/Mohem/src/app/authentication/change-password/change-password.component.html +++ b/Mohem/src/app/authentication/change-password/change-password.component.html @@ -1,11 +1,7 @@ - - - - - - {{'changePassword,changePassword' | translate}} - - + + diff --git a/Mohem/src/app/authentication/check-user/check-user.component.html b/Mohem/src/app/authentication/check-user/check-user.component.html index ba3aec50..0f28d541 100644 --- a/Mohem/src/app/authentication/check-user/check-user.component.html +++ b/Mohem/src/app/authentication/check-user/check-user.component.html @@ -1,11 +1,7 @@ - - - - - - {{'login,forgot-password' | translate}} - - + + diff --git a/Mohem/src/app/eit/add-eit/add-eit.component.html b/Mohem/src/app/eit/add-eit/add-eit.component.html index 91fde23b..a43e3501 100644 --- a/Mohem/src/app/eit/add-eit/add-eit.component.html +++ b/Mohem/src/app/eit/add-eit/add-eit.component.html @@ -1,8 +1,7 @@ - + {{headerTitle}} @@ -13,7 +12,13 @@ - + --> + + + +
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 @@ - - - {{ts.trPK('worklistMain','title')}} - - - - - + + - - {{ts.trPK('worklistMain','title')}} - - - - - - + +
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 @@ - - - {{ts.trPK('worklistMain','title')}} - - - - - - - - + +
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 @@ - - - {{ts.trPK('worklistMain','title')}} - - - - - + +
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 @@ - - - {{ts.trPK('worklistMain','title')}} - - - - - + + +
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 @@ - - - - {{ts.trPK('userProfile','title')}} - - - - - - - + +