header translate and quick walkthrouh to test design and translate

6 years ago · 25826f900d
parent 43bc72b9b8
commit 25826f900d
14 changed files with 59 additions and 33 deletions
--- a/Mohem/src/app/eit/eit-list/eit-list.component.html
+++ b/Mohem/src/app/eit/eit-list/eit-list.component.html
@ -1,7 +1,8 @@
 <ion-header>
  <ion-toolbar class="header-toolbar-new">
+    <ion-title color="light">{{headerTitle}}</ion-title>
    <nav-buttons [enableMenu]="false" [enableBack]="true" [navigate]="true"></nav-buttons>
-    <ion-title style="color: white;">{{headerTitle}}</ion-title>
+   
 </ion-toolbar>
 </ion-header>

--- a/Mohem/src/app/hmg-common/ui/services-button/services-button.component.html
+++ b/Mohem/src/app/hmg-common/ui/services-button/services-button.component.html
@ -1,7 +1,11 @@
 <div feedback class="custom-button">
    <div class="iconBox">
-      <img *ngIf="title != 'My Team' && title != 'Vacation Rule'" [src]="'data:image/png;base64,'+icon" class="icon">
-      <img *ngIf="title == 'My Team' || title == 'Vacation Rule'" [src]="icon" class="icon">
+      <img *ngIf="title != 'My Team' && title != 'Vacation Rule' && title != 'فريقي' &&  title != 'قواعد الإجازات' " [src]="'data:image/png;base64,'+icon" class="icon">
+      <!-- <img *ngIf="title == 'My Team' || title == 'Vacation Rule'" [src]="icon" class="icon"> -->
+      <img *ngIf="title == 'My Team' || title == 'فريقي' " [src]="myTeamIcon" class="icon">
+      <img *ngIf="title == 'Vacation Rule' || title == 'قواعد الإجازات'" [src]="vacationRuleIcon" class="icon">
+
+
    </div>
    <div class="titleBox">
      <p class="pClass">{{title}}</p>
--- a/Mohem/src/app/hmg-common/ui/services-button/services-button.component.ts
+++ b/Mohem/src/app/hmg-common/ui/services-button/services-button.component.ts
@ -17,6 +17,9 @@ export class ServicesButtonComponent implements OnInit {
  @Input() disabled = false;
  public direction: string;
  public style: any;
+
+  public myTeamIcon="assets/icon/new-design/leave_balance.png";
+  public vacationRuleIcon="assets/icon/new-design/vacation_rules_icon.png"
  constructor(
    public ts: TranslatorService
  ) {}
--- a/Mohem/src/app/home/home.page.html
+++ b/Mohem/src/app/home/home.page.html
@ -65,18 +65,19 @@
        <ion-slide *ngIf="i == 0"> 
          <app-services-button
          (click)="openMyTeamPage()"
-          title="My Team"
-          icon="assets/icon/new-design/leave_balance.png">
+          [title]="myTeamTitle" 
+         >
      </app-services-button>
      </ion-slide>
        <ion-slide *ngIf="i == 2"> 
          <app-services-button
              (click)="Vacation_Rule()"
-              title="Vacation Rule"
-              icon="assets/icon/new-design/vacation_rules_icon.png">
+              [title]="vacationRuleTitle"
+              >
          </app-services-button>
      </ion-slide>
-
+      <!-- icon="vacationRuleIcon"
+      icon="myTeamIcon" -->

    </ion-slides>
    </ion-row>
--- a/Mohem/src/app/home/home.page.scss
+++ b/Mohem/src/app/home/home.page.scss
@ -23,8 +23,8 @@ ion-title{
    position: absolute;
    top: 0;
    text-align: center;
-    left: 15%;
-    right: 15%;
+    // left: 15%;
+    // right: 15%;
    font-size: 0.42cm;
    font-weight: bold;
    height: 100%;
--- a/Mohem/src/app/home/home.page.ts
+++ b/Mohem/src/app/home/home.page.ts
@ -136,6 +136,10 @@ export class HomePage implements OnInit {
  public menuType: any;
  accrualBalancesList: any;
  public countAllNotification = 0;
+  myTeamTitle: string;
+  vacationRuleTitle: string;
+  public myTeamIcon: string;
+  public vacationRuleIcon: string;

  constructor(
    public ts: TranslatorService,
@ -177,6 +181,12 @@ export class HomePage implements OnInit {
    // this.events.subscribe('getNotCount', badge => {
    //   this.notBadge = badge;
    // });
+    this.myTeamTitle= this.ts.trPK('myTeam','myTeam-header');
+    this.vacationRuleTitle = this.ts.trPK('vacation-rule','vacationRule');
+    // this.myTeamIcon="assets/icon/new-design/leave_balance.png";
+    // this.vacationRuleIcon="assets/icon/new-design/vacation_rules_icon.png"
+
+
  }

  ionViewWillEnter() {
--- a/Mohem/src/app/my-team/home/home.component.html
+++ b/Mohem/src/app/my-team/home/home.component.html
@ -1,9 +1,10 @@
 <ion-header>
  <ion-toolbar class="header-toolbar-new">
+    <ion-title color="light">{{ts.trPK('myTeam','myTeam-header')}}</ion-title>
      <ion-buttons slot="start">
-        <nav-buttons backLink="/home"></nav-buttons>
+        <!-- <nav-buttons backLink="/home"></nav-buttons> -->
+        <nav-buttons></nav-buttons>
      </ion-buttons>
-      <ion-title>{{ts.trPK('myTeam','myTeam-header')}}</ion-title>
  </ion-toolbar>
 </ion-header>

@ -57,7 +58,7 @@
    <div *ngIf="isSearch">
      <ion-row class="search-container">
        <ion-col style="float: left;" size=[6] (click)="clearSearch()">
-            <span style="margin-left: 5px;">Clear Search</span>
+            <span style="margin-left: 5px;">{{ts.trPK('work-list','clear-search')}}</span>
            <ion-icon name="close" ></ion-icon>
        </ion-col>
      </ion-row>
--- a/Mohem/src/app/my-team/home/home.component.scss
+++ b/Mohem/src/app/my-team/home/home.component.scss
@ -3,13 +3,14 @@ ion-title{
    position: absolute;
    top: 0;
    text-align: center;
-    left: 15%;
-    right: 15%;
+    // left: 15%;
+    // right: 15%;
    font-size: 0.42cm;
    font-weight: bold;
    height: 100%;
 }

+
 .contentBg{
    padding: 0px 20px;
 }
--- a/Mohem/src/app/notification/home/home.component.scss
+++ b/Mohem/src/app/notification/home/home.component.scss
@ -237,8 +237,8 @@ ion-title{
    position: absolute;
    top: 0;
    text-align: center;
-    left: 15%;
-    right: 15%;
+    // left: 15%;
+    // right: 15%;
    font-size: 0.42cm;
    font-weight: bold;
    height: 100%;
--- a/Mohem/src/app/time-card/time-card-details/time-card-details.component.html
+++ b/Mohem/src/app/time-card/time-card-details/time-card-details.component.html
@ -1,9 +1,11 @@
 <ion-header>
  <ion-toolbar class="header-toolbar-new">
+    <ion-title>{{ts.trPK('home','monthly-attendance')}}</ion-title>
      <ion-buttons slot="start">
-        <nav-buttons backLink="/home"></nav-buttons>
+        <!-- <nav-buttons backLink="/home"></nav-buttons> -->
+        <nav-buttons></nav-buttons>
      </ion-buttons>
-      <ion-title>MONTHLY ATTENDANCE</ion-title>
+     
  </ion-toolbar>
 </ion-header>

--- a/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss
+++ b/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss
@ -495,8 +495,8 @@ ion-title{
  position: absolute;
  top: 0;
  text-align: center;
-  left: 15%;
-  right: 15%;
+  // left: 15%;
+  // right: 15%;
  font-size: 0.42cm;
  font-weight: bold;
  height: 100%;
@ -737,6 +737,7 @@ $actionBtnSize : 36px;
      margin-left: 10px;
  }
 }
+
 .result-text-container {
  padding: 0;
  margin: 0;
--- a/Mohem/src/app/vacation-rule/home/home.component.html
+++ b/Mohem/src/app/vacation-rule/home/home.component.html
@ -1,11 +1,11 @@
 <ion-header>
    <ion-toolbar class="header-toolbar-new">
        <!-- <nav-buttons></nav-buttons> -->
+        <ion-title color="light">{{ 'vacation-rule, vacationRule' | translate}}</ion-title>
    <ion-buttons slot="start">
-      <ion-back-button color="light" class="btnBack" defaultHref="/home"></ion-back-button>
-      
+      <!-- <ion-back-button color="light" class="btnBack" defaultHref="/home"></ion-back-button> -->
+      <nav-buttons></nav-buttons>
    </ion-buttons>
-    <ion-title color="light">{{ 'vacation-rule, vacationRule' | translate}}</ion-title>
    
  </ion-toolbar>
 </ion-header>
--- a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html
+++ b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html
@ -1,9 +1,11 @@
 <ion-header>
    <ion-toolbar class="header-toolbar-new">
+      <ion-title color="light">{{ 'vacation-rule, vacation-type' | translate}}</ion-title>
        <ion-buttons slot="start">
-      <ion-back-button color="light" class="btnBack" defaultHref="/vacation-rule/home" ></ion-back-button>
+      <!-- <ion-back-button color="light" class="btnBack" defaultHref="/vacation-rule/home" ></ion-back-button> -->
+      <nav-buttons></nav-buttons>
    </ion-buttons>    
-    <ion-title color="light">{{ 'vacation-rule, vacation-type' | translate}}</ion-title>
+   
  </ion-toolbar>
 </ion-header>

--- a/Mohem/src/assets/localization/i18n.json
+++ b/Mohem/src/assets/localization/i18n.json
@ -898,8 +898,8 @@
            "ar":"رصيد الاجزات"
        },
        "":{
-            "":"",
-            "":""
+            "en":"",
+            "ar":""
        },
        "possitionAlert": {
            "en": "The app could not access your location. Make sure that the location service is enabled from your device settings",
@ -1409,7 +1409,7 @@
        },
        "todayAttendance": {
            "en": "Today's Attendance",
-            "ar": "Today's Attendance"
+            "ar": "حضور اليوم"
        },
        "checkIn": {
            "en": "Check-In",
@ -1425,19 +1425,19 @@
        },
        "attendance-statistics": {
            "en": "Attendance Statistics",
-            "ar": "Attendance Statistics"
+            "ar": "احصائيات الحضور"
        },
        "myTeam-header": {
            "en": "MY TEAM",
-            "ar": "MY TEAM"
+            "ar": "فريقي"
        },
        "total": {
            "en": "TOTAL",
-            "ar": "TOTAL"
+            "ar": "المجموع"
        },
        "team-members": {
            "en": "TEAM MEMBERS",
-            "ar": "TEAM MEMBERS"
+            "ar": "اعضاء الفريق"
        }
    },
    "searchForReplacment": {