From 25826f900da1a93091c10de3ac6240c11e3227ae Mon Sep 17 00:00:00 2001 From: "Fatimah.Alshammari" Date: Sun, 1 Mar 2020 15:03:32 +0300 Subject: [PATCH] header translate and quick walkthrouh to test design and translate --- Mohem/src/app/eit/eit-list/eit-list.component.html | 3 ++- .../services-button/services-button.component.html | 8 ++++++-- .../services-button/services-button.component.ts | 3 +++ Mohem/src/app/home/home.page.html | 11 ++++++----- Mohem/src/app/home/home.page.scss | 4 ++-- Mohem/src/app/home/home.page.ts | 10 ++++++++++ Mohem/src/app/my-team/home/home.component.html | 7 ++++--- Mohem/src/app/my-team/home/home.component.scss | 5 +++-- .../src/app/notification/home/home.component.scss | 4 ++-- .../time-card-details.component.html | 6 ++++-- .../time-card-details.component.scss | 5 +++-- .../src/app/vacation-rule/home/home.component.html | 6 +++--- .../vacation-type/vacation-type.component.html | 6 ++++-- Mohem/src/assets/localization/i18n.json | 14 +++++++------- 14 files changed, 59 insertions(+), 33 deletions(-) diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.html b/Mohem/src/app/eit/eit-list/eit-list.component.html index 1df8edcf..7b3ac618 100644 --- 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 @@ + {{headerTitle}} - {{headerTitle}} + diff --git 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 index cd667c87..3bb77db7 100644 --- 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 @@
- - + + + + + +

{{title}}

diff --git 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 index bdc3b3b1..5b1d9f4c 100644 --- 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 ) {} diff --git a/Mohem/src/app/home/home.page.html b/Mohem/src/app/home/home.page.html index 3a981616..54e6fe9d 100644 --- a/Mohem/src/app/home/home.page.html +++ b/Mohem/src/app/home/home.page.html @@ -65,18 +65,19 @@ + [title]="myTeamTitle" + > + [title]="vacationRuleTitle" + > - + diff --git a/Mohem/src/app/home/home.page.scss b/Mohem/src/app/home/home.page.scss index c803673d..f5f2bc46 100644 --- 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%; diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index e7bbf93b..9a736e93 100644 --- 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() { diff --git a/Mohem/src/app/my-team/home/home.component.html b/Mohem/src/app/my-team/home/home.component.html index 1a297ab0..162b1c7c 100644 --- a/Mohem/src/app/my-team/home/home.component.html +++ b/Mohem/src/app/my-team/home/home.component.html @@ -1,9 +1,10 @@ + {{ts.trPK('myTeam','myTeam-header')}} - + + - {{ts.trPK('myTeam','myTeam-header')}} @@ -57,7 +58,7 @@
- Clear Search + {{ts.trPK('work-list','clear-search')}} diff --git a/Mohem/src/app/my-team/home/home.component.scss b/Mohem/src/app/my-team/home/home.component.scss index 650979e9..804efc72 100644 --- 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; } diff --git a/Mohem/src/app/notification/home/home.component.scss b/Mohem/src/app/notification/home/home.component.scss index 8e752def..bf56a8d8 100644 --- 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%; diff --git 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 index d2f9d80d..5f3115a7 100644 --- 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 @@ + {{ts.trPK('home','monthly-attendance')}} - + + - MONTHLY ATTENDANCE + diff --git 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 index 8e16086a..babe8b96 100644 --- 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; diff --git a/Mohem/src/app/vacation-rule/home/home.component.html b/Mohem/src/app/vacation-rule/home/home.component.html index 4d59d520..9de43239 100644 --- a/Mohem/src/app/vacation-rule/home/home.component.html +++ b/Mohem/src/app/vacation-rule/home/home.component.html @@ -1,11 +1,11 @@ + {{ 'vacation-rule, vacationRule' | translate}} - - + + - {{ 'vacation-rule, vacationRule' | translate}} diff --git a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html index b526fb7f..f145118d 100644 --- 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 @@ + {{ 'vacation-rule, vacation-type' | translate}} - + + - {{ 'vacation-rule, vacation-type' | translate}} + diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index cc05bd1c..9e5ecfd0 100644 --- 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": {