added generic header throughout the application

6 years ago · f44ddb6931
parent 88cabac92f
commit f44ddb6931
12 changed files with 56 additions and 83 deletions
--- 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 @@
-<ion-header >
-  <ion-toolbar  class="header-toolbar-new">
-      <ion-title color="light">  {{ts.trPK('submitAbsence','submitAbsence')}}</ion-title>
-      <ion-buttons slot="start">
-        <nav-buttons></nav-buttons>
-      </ion-buttons>
-</ion-toolbar>
-</ion-header>
+<app-generic-header
+  showBack="true"
+  [headerText]="'submitAbsence, submitAbsence' | translate">
+</app-generic-header>

 <ion-content padding>
  <ion-item class='dynamicField'>
--- 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 @@
-<ion-header>
-    <ion-toolbar  class="header-toolbar-new">
-        <ion-buttons slot="start">
-            <nav-buttons [enableMenu]="false" [enableBack]="true" [navigate]="true"></nav-buttons>
-        </ion-buttons>
-        <ion-title color="light" > {{'changePassword,changePassword' | translate}}</ion-title>
-      </ion-toolbar>
-</ion-header>
+<app-generic-header
+  showBack="true"
+  [headerText]="'changePassword,changePassword' | translate">
+</app-generic-header>



--- 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 @@
-<ion-header>
-  <ion-toolbar  class="header-toolbar">
-      <ion-buttons slot="start">
-        <nav-buttons [enableMenu]="false" [enableBack]="true" [navigate]="true"></nav-buttons>
-      </ion-buttons>
-      <ion-title color="light" > {{'login,forgot-password' | translate}}</ion-title>
-    </ion-toolbar>
-</ion-header>
+<app-generic-header
+  showBack="true"
+  [headerText]="'login,forgot-password' | translate">
+</app-generic-header>
 <ion-content padding>
      <ion-grid>

--- 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 @@
-<ion-header>
+<!-- <ion-header>
  <ion-toolbar class="header-toolbar-new">
      <ion-buttons slot="start">
        <nav-buttons backLink=""></nav-buttons>
-        <!-- <ion-back-button color="light" class="btnBack" defaultHref="/eit/eit-list/" ></ion-back-button> -->
        </ion-buttons>
    <ion-title color="light">{{headerTitle}}</ion-title>

@ -13,7 +12,13 @@
    </ion-buttons>

  </ion-toolbar>
-</ion-header>
+</ion-header> -->
+
+<app-generic-header
+  showBack="true"
+  [headerText]="headerTitle">
+</app-generic-header>
+

 <ion-content padding>
  <div #containerDiv id="containerDiv">
--- 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;
  }
--- 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();
--- 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 @@
-<ion-header>
-  <ion-toolbar class="header-toolbar">
-    <ion-title color="light"> {{ts.trPK('worklistMain','title')}}</ion-title>
-    <ion-buttons slot="start">
-      <nav-buttons backLink="/notification/homepage"></nav-buttons>
-    </ion-buttons>
-  </ion-toolbar>
-</ion-header>
+<app-generic-header
+  showBack="true"
+  backLink="/notification/homepage"
+  [headerText]="'worklistMain,title' | translate">
+</app-generic-header>

 <ion-content class="colorBG">
  <ion-segment mode="md" color="secondary" (ionChange)="segmentChangedClick($event)"
--- 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
@ -1,12 +1,9 @@
-<ion-header *ngIf="!messageSuccess">
-  <ion-toolbar class="header-toolbar-new">
-    <ion-title color="light"> {{ts.trPK('worklistMain','title')}}</ion-title>
-    <ion-buttons slot="start">
-      <nav-buttons backLink="/notification/homepage"></nav-buttons>
-    </ion-buttons>
-  </ion-toolbar>
-
-</ion-header>
+<app-generic-header
+  *ngIf="!messageSuccess"
+  showBack="true"
+  backLink="/notification/homepage"
+  [headerText]="'worklistMain,title' | translate">
+</app-generic-header>

 <ion-content  class="colorBG">
 <div *ngIf="!messageSuccess" >
--- 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 @@
-<ion-header *ngIf="!messageSuccess">
-    <ion-toolbar class="header-toolbar-new">
-        <ion-title color="light"> {{ts.trPK('worklistMain','title')}}</ion-title>
-        <ion-buttons slot="start">
-            <nav-buttons backLink="/notification/homepage"></nav-buttons>
-        </ion-buttons>
-    </ion-toolbar>
-
-  
-    
-</ion-header>
+<app-generic-header
+  *ngIf="!messageSuccess"
+  showBack="true"
+  backLink="/notification/homepage"
+  [headerText]="'worklistMain,title' | translate">
+</app-generic-header>

 <ion-content  class="colorBG">
 <div *ngIf="!messageSuccess">
--- 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 @@
-<ion-header *ngIf="!messageSuccess">
-    <ion-toolbar class="header-toolbar-new">
-        <ion-title color="light"> {{ts.trPK('worklistMain','title')}}</ion-title>
-        <ion-buttons slot="start">
-            <nav-buttons backLink="/notification/homepage"></nav-buttons>
-        </ion-buttons>
-    </ion-toolbar>
-</ion-header>
+<app-generic-header
+  *ngIf="!messageSuccess"
+  showBack="true"
+  backLink="/notification/homepage"
+  [headerText]="'worklistMain,title' | translate">
+</app-generic-header>

 <ion-content  class="colorBG">
 <div *ngIf="!messageSuccess">
--- 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 @@
-<ion-header *ngIf="!messageSuccess">
-    <ion-toolbar class="header-toolbar-new">
-        <ion-title color="light"> {{ts.trPK('worklistMain','title')}}</ion-title>
-        <ion-buttons slot="start">
-            <nav-buttons backLink="/notification/homepage"></nav-buttons>
-        </ion-buttons>
-    </ion-toolbar>
-</ion-header>
+<app-generic-header
+  *ngIf="!messageSuccess"
+  showBack="true"
+  backLink="/notification/homepage"
+  [headerText]="'worklistMain,title' | translate">
+</app-generic-header>
+
 <ion-content  class="colorBG">
        <div *ngIf="!messageSuccess">
    <!-- add segemnt part -->
--- 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 @@
-
-<ion-header >
-  <ion-toolbar  class="header-toolbar-new">
-      <ion-title color="light">{{ts.trPK('userProfile','title')}}</ion-title>
-      <ion-buttons slot="start">
-        <nav-buttons></nav-buttons>
-      </ion-buttons>
-</ion-toolbar>
-</ion-header>
-
-
+<app-generic-header
+  showBack="true"
+  [headerText]="'userProfile,title' | translate">
+</app-generic-header>

 <ion-content class="colorBG">
  <div class="header-div">