From 785538983f41b74be7180dc3cb1af9dd51b43249 Mon Sep 17 00:00:00 2001 From: enadhilal Date: Sun, 1 Mar 2020 10:30:19 +0300 Subject: [PATCH 1/3] adding translate and fixing desgin in worklist and myleave and ticket request --- Mohem/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mohem/package.json b/Mohem/package.json index 883fac4e..939b044a 100755 --- a/Mohem/package.json +++ b/Mohem/package.json @@ -202,4 +202,4 @@ "android" ] } -} \ No newline at end of file +} From 10ec3c4ec8625304d1998795ec7f6e045f37bd33 Mon Sep 17 00:00:00 2001 From: enadhilal Date: Mon, 2 Mar 2020 10:21:22 +0300 Subject: [PATCH 2/3] fixing payslip in arabic version --- Mohem/src/app/home/home.page.ts | 2 +- .../src/app/payslip/home/home.component.html | 16 ++++---- .../src/app/payslip/home/home.component.scss | 37 +++++++++++++++++++ Mohem/src/app/payslip/home/home.component.ts | 2 + 4 files changed, 48 insertions(+), 9 deletions(-) diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index e7bbf93b..3207faed 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -638,7 +638,7 @@ getSubordinatesAttStatus() { } openPage(subMenu) { - console.log("openPage"); + console.log(subMenu); let selMenu: MenuResponse = new MenuResponse(); selMenu = this.common.sharedService.getSharedData( MenuResponse.SHARED_DATA, diff --git a/Mohem/src/app/payslip/home/home.component.html b/Mohem/src/app/payslip/home/home.component.html index 142a36a5..d0789b91 100644 --- a/Mohem/src/app/payslip/home/home.component.html +++ b/Mohem/src/app/payslip/home/home.component.html @@ -78,7 +78,7 @@ [value]="gaugeValue" [label]="gaugeLabel"> --> -
+
-
+

{{GetSummaryOfPaymentList.TOTAL_PAY_AMOUNT}}

@@ -138,9 +138,9 @@ -
{{ts.trPK('payslip','summary-payment')}}
- -
+ +
+
{{ts.trPK('payslip','summary-payment')}}
@@ -201,8 +201,8 @@
-
{{ts.trPK('payslip','earnings')}}
+
{{ts.trPK('payslip','earnings')}}
@@ -224,8 +224,8 @@
-
{{ts.trPK('payslip','deductions')}}
+
{{ts.trPK('payslip','deductions')}}
@@ -255,8 +255,8 @@ --> +
{{ts.trPK('payslip','payment-information')}}
-
diff --git a/Mohem/src/app/payslip/home/home.component.scss b/Mohem/src/app/payslip/home/home.component.scss index 11086df0..4105874b 100644 --- a/Mohem/src/app/payslip/home/home.component.scss +++ b/Mohem/src/app/payslip/home/home.component.scss @@ -137,6 +137,12 @@ margin-left: -48px; margin-right: 3px; } + + .result-graph-ar{ + font-size: 14px; + margin-right: -48px; + margin-left: 3px; + } .headerGrid{ background-color: white !important; border: 1px solid #cac8c8 !important; @@ -150,6 +156,37 @@ padding-right: 21px; } + + .result-text-container-ar { + padding: 0; + margin: 0; + position: absolute; + left: 54%; + top: 50%; + display: block; + text-align: center; + transform: translate(-50%, -50%); + + h2 { + + font-size: 25px; + font-family: WorkSans-Bold; + margin: 0 auto; + line-height: 36px; + + } + + span { + + width: 125px; + display: block; + margin: 0 auto; + font-size: 15px; + font-family: workSans-Regular; + } + } + + .result-text-container { padding: 0; margin: 0; diff --git a/Mohem/src/app/payslip/home/home.component.ts b/Mohem/src/app/payslip/home/home.component.ts index 7fd9b363..e3f0fe82 100644 --- a/Mohem/src/app/payslip/home/home.component.ts +++ b/Mohem/src/app/payslip/home/home.component.ts @@ -57,6 +57,7 @@ export class HomeComponent implements OnInit { tooltips: { enabled: false }, legend: { display: false }}; gaugeType = "full"; + direction: string; // gaugeValue = 11.200; // gaugeLabel = ""; @@ -74,6 +75,7 @@ export class HomeComponent implements OnInit { ngOnInit() { + this.direction = TranslatorService.getCurrentLanguageName() // this.selEmp = this.common.sharedService.getSharedData( // MenuResponse.SHARED_SEL_EMP, // false From 11dd7e56e4934d643d19243b4922c050a950bdb6 Mon Sep 17 00:00:00 2001 From: enadhilal Date: Tue, 3 Mar 2020 09:54:11 +0300 Subject: [PATCH 3/3] fix profile in arabic and translate --- Mohem/src/app/app.component.html | 10 ++++--- Mohem/src/app/app.component.scss | 26 +++++++++++++++++++ .../change-password.component.html | 2 +- Mohem/src/app/home/home.page.html | 6 +++-- Mohem/src/app/home/home.page.scss | 24 +++++++++++------ Mohem/src/app/home/home.page.ts | 2 ++ .../app/notification/home/home.component.ts | 1 + .../edit-profile/edit-profile.component.html | 2 +- Mohem/src/theme/styles.scss | 3 +++ 9 files changed, 61 insertions(+), 15 deletions(-) diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index 4a975deb..5dcc2432 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -12,15 +12,19 @@
-
+

+
+
+ +
-
+

{{User_name_Emp}}

@@ -62,7 +66,7 @@
-->
- +
diff --git a/Mohem/src/app/app.component.scss b/Mohem/src/app/app.component.scss index e2901722..5b3cf302 100644 --- a/Mohem/src/app/app.component.scss +++ b/Mohem/src/app/app.component.scss @@ -17,6 +17,16 @@ header margin-top: -24px !important; margin-bottom: 11px; } + +.mohemmLogo-ar{ + + max-width: 46% !important; + border: 0 !important; + margin-right: 70px !important; + margin-top: -24px !important; + margin-bottom: 11px; +} + .closeIcon{ height: 10px !important; @@ -84,6 +94,22 @@ padding: 6px 24px; } +.logout-ar{ + background-color: #22C6B3; + border: none; + color: white; + text-align: center; + text-decoration: none; + display: inline-block; + font-size: 12px; + margin-right: 95px !important; + margin-top: 15px !important; + margin-bottom: 20px !important; + border-radius: 30px; + height: 26px; + padding: 6px 24px; +} + .menuImg{ width: 105px !important; height: 105px !important; 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 29eb0d85..939e66ba 100644 --- a/Mohem/src/app/authentication/change-password/change-password.component.html +++ b/Mohem/src/app/authentication/change-password/change-password.component.html @@ -1,7 +1,7 @@ - + {{'changePassword,changePassword' | translate}} diff --git a/Mohem/src/app/home/home.page.html b/Mohem/src/app/home/home.page.html index 54e6fe9d..221901fd 100644 --- a/Mohem/src/app/home/home.page.html +++ b/Mohem/src/app/home/home.page.html @@ -2,8 +2,10 @@ {{'home,dashboard' | translate}} -
- +
+
+
+
diff --git a/Mohem/src/app/home/home.page.scss b/Mohem/src/app/home/home.page.scss index f5f2bc46..c26c6473 100644 --- a/Mohem/src/app/home/home.page.scss +++ b/Mohem/src/app/home/home.page.scss @@ -9,14 +9,22 @@ ion-row { .profile-image-container{ position: relative; z-index: 999; - img { - width: 32px; - float: right; - margin-top: -42px; - border-radius: 20px; - height: 32px; - margin-right: 4px; - } + // img { + // width: 32px; + // float: right; + // // margin-top: -42px; + // border-radius: 20px; + // height: 32px; + // // margin-right: 4px; + // } +} +.profile-image{ + width: 32px; + float: right; + // margin-top: -42px; + border-radius: 20px; + height: 32px; + // margin-right: 4px; } ion-title{ color: white; diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index 6606a201..ac59a2d1 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -140,6 +140,7 @@ export class HomePage implements OnInit { vacationRuleTitle: string; public myTeamIcon: string; public vacationRuleIcon: string; + direction: string; constructor( public ts: TranslatorService, @@ -176,6 +177,7 @@ export class HomePage implements OnInit { } ngOnInit() { + this.direction = TranslatorService.getCurrentLanguageName(); // this.getUserDetails(); // this.getCount(); // this.events.subscribe('getNotCount', badge => { diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index a30c11d2..2d1f172f 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -411,6 +411,7 @@ export class HomeComponent implements OnInit { if(this.ITGSegment.length != 0 ){ this.setActive(this.ITGSegment[0].code); } + console.log(this.ITGSegment); }); } 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 9163ba2a..9ce9f3d3 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.html +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.html @@ -1,7 +1,7 @@
- +

{{ts.trPK('userProfile','title')}}

diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index f5bd4929..cb74c49d 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -42,6 +42,9 @@ ion-label{ .profileDiv{ margin: 5px auto !important; } +.profileDiv-ar{ + margin: 16px auto !important; +} .full-modal{ --height:100%; --width:100%;