From 7a30805e717e47f359439b6b11e73d6e9f3bd998 Mon Sep 17 00:00:00 2001 From: "Fatimah.Alshammari" Date: Tue, 3 Mar 2020 14:23:28 +0300 Subject: [PATCH] add arabic version + fix bugs --- .../src/app/absence/home/home.component.html | 30 ++------ .../src/app/absence/home/home.component.scss | 73 ++++++++++++++++++- Mohem/src/app/absence/home/home.component.ts | 5 +- .../date-info-modal.component.html | 14 ++-- .../date-info-modal.component.scss | 58 ++++++++++++++- .../date-info-modal.component.ts | 6 +- Mohem/src/app/home/home.page.scss | 4 +- .../src/app/my-team/home/home.component.scss | 4 +- .../src/app/payslip/home/home.component.html | 41 ++++++----- .../src/app/payslip/home/home.component.scss | 50 +++++++++++++ Mohem/src/app/payslip/home/home.component.ts | 5 +- .../edit-profile/edit-profile.component.ts | 2 +- .../performance-evaluation.component.html | 20 +++-- .../performance-evaluation.component.scss | 6 +- .../performance-evaluation.component.ts | 5 +- .../time-card-details.component.html | 20 ++++- .../time-card-details.component.scss | 25 ++++++- .../time-card-details.component.ts | 7 +- Mohem/src/assets/localization/i18n.json | 12 +-- 19 files changed, 302 insertions(+), 85 deletions(-) diff --git a/Mohem/src/app/absence/home/home.component.html b/Mohem/src/app/absence/home/home.component.html index 86fd1dcc..7e438e1c 100644 --- a/Mohem/src/app/absence/home/home.component.html +++ b/Mohem/src/app/absence/home/home.component.html @@ -55,26 +55,20 @@
-

{{totalnumber}}

+ - {{ts.trPK('absenceList','totalNumber')}} +
- + -
+
@@ -84,13 +78,7 @@
-
+
@@ -101,13 +89,7 @@
-
+
diff --git a/Mohem/src/app/absence/home/home.component.scss b/Mohem/src/app/absence/home/home.component.scss index 670bd6c2..fdeaca6a 100644 --- a/Mohem/src/app/absence/home/home.component.scss +++ b/Mohem/src/app/absence/home/home.component.scss @@ -137,6 +137,17 @@ // padding-top: 29px; margin-left: -70px !important; } +.today-graph-ar{ + display: block !important; + height: 196px; + width: 385px; + padding-left: 51px; + /* margin-left: -70px !important; */ + font-size: 14px; + margin-left: -48px; + margin-right: 63px; + margin-bottom: -30px; +} .headerGrid{ background-color: white !important; @@ -215,4 +226,64 @@ margin-top: -13px; left: 0; top: 0px; z-index: 1; - } \ No newline at end of file + } + .div-orng{ + position: relative; + left: 82%; + bottom: 128px; + color: black; + background-color: #1FA269; + width: 13%; + height: 6px; + } + .div-blue-ar{ + position: relative; + bottom: 131px; + color: black; + background-color: #CB3232; + // background-color: #094875; + // background-color: #DDB017; + width: 13%; + height: 6px; + right: 78px; + } + .div-blue{ + position: relative; + left: 59%; + bottom: 131px; + color: black; + background-color: #CB3232; + // background-color: #094875; + width: 13%; + height: 6px; + } + .div-orng-ar{ + position: relative; + bottom: 59px; + color: black; + background-color: #1FA269; + width: 13%; + height: 6px; + right: 9px; + + } + .div-red{ + position: relative; + left: 82%; + bottom: 80px; + color: black; + // background-color: #CB3232; + background-color: #DDB017; + width: 13%; + height: 6px; + } + .div-red-ar{ + position: relative; + bottom: 139px; + color: black; + // background-color: #CB3232; + background-color: #DDB017; + width: 13%; + height: 6px; + right: 10px; + } \ No newline at end of file diff --git a/Mohem/src/app/absence/home/home.component.ts b/Mohem/src/app/absence/home/home.component.ts index 398820e9..6fca2c82 100644 --- a/Mohem/src/app/absence/home/home.component.ts +++ b/Mohem/src/app/absence/home/home.component.ts @@ -39,6 +39,7 @@ export class HomeComponent implements OnInit { ACCRUAL_USED_ENTITLEMENT: any; ACCRUAL_YEARLY_ENTITLEMENT: any; totalnumber: any; + public direction: string; public options = { cutoutPercentage: 80, @@ -55,7 +56,9 @@ export class HomeComponent implements OnInit { public absService: AbsenceListService, public accrualService: AccrualService, public authService: AuthenticationService - ) {} + ) { + this.direction = TranslatorService.getCurrentDirection(); + } ngOnInit() { diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html index 5c57f654..66354835 100644 --- a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html +++ b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html @@ -7,16 +7,16 @@
-
+

{{percentage}}

Completed



- +
-
+

{{nameDay}}

@@ -40,7 +40,7 @@
- +

{{shiftTime}}

{{ts.trPK('attendance-tracking','shift-time')}}

@@ -54,7 +54,7 @@
- +

{{startDate}}

{{ts.trPK('attendance-tracking','check-in')}}

@@ -68,7 +68,7 @@
- +

{{lateIn}}

{{ts.trPK('attendance-tracking','late-in')}}

@@ -82,7 +82,7 @@
- +

{{shortage}}

{{ts.trPK('attendance-tracking','shortage')}}

diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss index 53ea08a2..dd3a9524 100644 --- a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss +++ b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss @@ -54,11 +54,56 @@ } } +.result-text-container-ar { + padding: 0; + margin: 0; + position: absolute; + left: 38%; + top: 67%; + display: block; + text-align: center; + -webkit-transform: translate(-50%, -50%); + transform: translate(-50%, -50%); + + h2 { + + font-size: 25px; + + // font-family: WorkSans-Bold; + font-weight: bold; + + margin: 0 auto; + + line-height: 36px; + + } + + span { + + width: 125px; + + display: block; + + margin: 0 auto; + + font-size: 12px; + + font-family: workSans-Regular; + color: rgb(163, 163, 163) !important; + } +} .today-graph{ display: block; height: 127px; width: 288px; } +.today-graph-ar{ + + display: block; + height: 134px; + width: 285px; + margin-left: -18px; +} .amountlabel{ color: black !important; font-weight: bold !important; @@ -79,10 +124,13 @@ height: 360px !important; } .liftcol{ - // padding-top: 1px !important; - // padding-bottom: 1px !important; border-right: 1px solid rgb(163, 163, 163) !important; } + .liftcol-ar{ + + border-left: 1px solid rgb(163, 163, 163) !important; + } + .rightcol{ @@ -107,6 +155,12 @@ height: 360px !important; margin-right: -226px; + } + .div-ar{ + border: 1px solid #a3a3a3 !important; + border-radius: 9px; + width: 264%; + margin-right: -302px; } .p0{ margin-bottom: -13px !important; diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.ts b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.ts index 001b4b25..85305ec8 100644 --- a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.ts +++ b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.ts @@ -36,7 +36,7 @@ export class DateInfoModalComponent implements OnInit { nameMonth: any; nameDay: any; public weekDaysEn = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']; - + public direction: string; public options = { cutoutPercentage: 85, tooltips: { enabled: false }, @@ -52,7 +52,9 @@ export class DateInfoModalComponent implements OnInit { public modalController: ModalController, public navParams: NavParams, public ts: TranslatorService - ) { } + ) { + this.direction = TranslatorService.getCurrentDirection(); + } ngOnInit() { console.log(this.TODAYDATE); diff --git a/Mohem/src/app/home/home.page.scss b/Mohem/src/app/home/home.page.scss index f5f2bc46..49645159 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: 4%; + right: 4%; font-size: 0.42cm; font-weight: bold; height: 100%; diff --git a/Mohem/src/app/my-team/home/home.component.scss b/Mohem/src/app/my-team/home/home.component.scss index 804efc72..e9b398a2 100644 --- a/Mohem/src/app/my-team/home/home.component.scss +++ b/Mohem/src/app/my-team/home/home.component.scss @@ -3,8 +3,8 @@ ion-title{ position: absolute; top: 0; text-align: center; - // left: 15%; - // right: 15%; + left: 4%; + right: 4%; font-size: 0.42cm; font-weight: bold; height: 100%; diff --git a/Mohem/src/app/payslip/home/home.component.html b/Mohem/src/app/payslip/home/home.component.html index 142a36a5..8735a9c2 100644 --- a/Mohem/src/app/payslip/home/home.component.html +++ b/Mohem/src/app/payslip/home/home.component.html @@ -38,7 +38,7 @@
- + + + + + + + +

{{ (showPaySlip.PAYSLIP_CHOICE)?.substring(15,23) }}

+
+ + + +
@@ -98,12 +111,7 @@
-
+
@@ -113,12 +121,7 @@
-
+
diff --git a/Mohem/src/app/payslip/home/home.component.scss b/Mohem/src/app/payslip/home/home.component.scss index 11086df0..60a7f1b1 100644 --- a/Mohem/src/app/payslip/home/home.component.scss +++ b/Mohem/src/app/payslip/home/home.component.scss @@ -117,6 +117,15 @@ --background: transparent !important; + } + .activeArrow-ar{ + height: 26px; + width: 26px; + color: white; + background: transparent !important; + --background: transparent !important; + margin-right: 25px; + } .slidbtn{ background: transparent; @@ -131,6 +140,15 @@ background: transparent !important; --background: transparent !important; } + .disabledArrow-ar{ + height: 26px; + width: 26px; + color: #908d8d; + background: transparent !important; + --background: transparent !important; + margin-right: 3px; + margin-left: -124px; + } .result-graph{ font-size: 14px; @@ -267,4 +285,36 @@ margin-top: -13px; margin-left: 58px; margin-bottom: 12px; padding-right: 5px; +} +.div-green{ + position: relative; + left: 77%; + bottom: 117px; + color: black; + background-color: #22c6b3; + width: 20%; height: 6px; +} +.div-green-ar{ + position: relative; + // left: 77%; + bottom: 117px; + color: black; + background-color: #22c6b3; + width: 20%; height: 6px; +} +.div-blue{ + position: relative; + left: 77%; + bottom: 67px; + color: black; + background-color: #094875; + width: 20%; height: 6px; +} +.div-blue-ar{ + position: relative; + // left: 77%; + bottom: 67px; + color: black; + background-color: #094875; + width: 20%; height: 6px; } \ No newline at end of file diff --git a/Mohem/src/app/payslip/home/home.component.ts b/Mohem/src/app/payslip/home/home.component.ts index 7fd9b363..83084486 100644 --- a/Mohem/src/app/payslip/home/home.component.ts +++ b/Mohem/src/app/payslip/home/home.component.ts @@ -42,6 +42,7 @@ export class HomeComponent implements OnInit { sliderOne: any; payslipIndex :any; data:any; + public direction: string; @ViewChild('slides') slides: IonSlides; @ViewChild('slideWithNav') slideWithNav: IonSlides; @ViewChild('chart') chart: UIChart; @@ -70,7 +71,9 @@ export class HomeComponent implements OnInit { public cs: CommonService, - ) {} + ) { + this.direction = TranslatorService.getCurrentDirection(); + } ngOnInit() { diff --git a/Mohem/src/app/profile/edit-profile/edit-profile.component.ts b/Mohem/src/app/profile/edit-profile/edit-profile.component.ts index 58c888f3..946dce11 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.ts +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.ts @@ -100,7 +100,7 @@ private handlePerformanceAppraisalResult(result){ this.performanceData=[]; for(let i=0;i + + {{ts.trPK('userProfile','performance')}} + + + + + +
- +
- +
@@ -19,8 +29,8 @@
- - + diff --git a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss index aee2712f..834a3cde 100644 --- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss +++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss @@ -122,14 +122,14 @@ } .labelvalue{ - font-size: 28px !important; + font-size: 27px !important; font-weight: bold !important; margin-top: 7px !important; - margin-left: 72px !important; + margin-left: 90px !important; } .percentage{ - font-size: 15px !important; + font-size: 19px !important; margin-top: 15px !important; } diff --git a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts index efc55d7b..4140fe70 100644 --- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts +++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts @@ -23,7 +23,7 @@ export class PerformanceEvaluationComponent implements OnInit { view: any = [380, 450]; public performanceData: any=[]; public length; - + // public showText:boolean =false; constructor( public ts: TranslatorService, public cs: CommonService, @@ -49,7 +49,8 @@ export class PerformanceEvaluationComponent implements OnInit { }; ngOnInit() { - + + this.getProfile(); this.performanceData = this.cs.sharedService.getSharedData( 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 5f3115a7..eb7b7ec1 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 @@ -14,7 +14,7 @@
- + @@ -25,12 +25,24 @@ + + + + + + + {{month}} {{year}} + + + + +
-
- {{ts.trPK('myTeam','attendance-statistics')}} +
+ {{ts.trPK('myTeam','attendance-statistics')}}
@@ -83,7 +95,7 @@ -
+
{{ts.trPK('attendance','monthly-attendance-calendar')}}