From d74b491dd9a80baa6d500d3352c9d4a1b184cb23 Mon Sep 17 00:00:00 2001 From: "Fatimah.Alshammari" Date: Sun, 22 Mar 2020 14:01:23 +0300 Subject: [PATCH] Fix issu --- .../my-team/details/details.component.html | 13 +++-- .../my-team/details/details.component.scss | 7 ++- .../app/my-team/details/details.component.ts | 48 ++++++++++++++- .../src/app/my-team/home/home.component.html | 5 +- .../src/app/payslip/home/home.component.html | 57 ++++++++++++------ .../src/app/payslip/home/home.component.scss | 58 ++++++++++++++----- .../edit-profile/edit-profile.component.html | 6 +- .../edit-profile/edit-profile.component.scss | 10 +++- Mohem/src/assets/localization/i18n.json | 10 ++-- 9 files changed, 163 insertions(+), 51 deletions(-) diff --git a/Mohem/src/app/my-team/details/details.component.html b/Mohem/src/app/my-team/details/details.component.html index 6b880c28..00976526 100644 --- a/Mohem/src/app/my-team/details/details.component.html +++ b/Mohem/src/app/my-team/details/details.component.html @@ -79,14 +79,14 @@
- {{ts.trPK('myTeam','checkIn')}} + {{ts.trPK('myTeam','check-in')}}

{{attendanceTrackingList.P_SWIPE_IN | slice:0:-3}}

--:--

- {{ts.trPK('myTeam','checkOut')}} + {{ts.trPK('myTeam','check-out')}}

{{attendanceTrackingList.P_SWIPE_OUT | slice:0:-3}}

--:--

@@ -103,14 +103,19 @@
+ - + {{month}} {{year}} - + + + + +
diff --git a/Mohem/src/app/my-team/details/details.component.scss b/Mohem/src/app/my-team/details/details.component.scss index 567a0fe9..76e9c027 100644 --- a/Mohem/src/app/my-team/details/details.component.scss +++ b/Mohem/src/app/my-team/details/details.component.scss @@ -231,13 +231,16 @@ ion-title{ .activeArrow-ar{ height: 20px; - width: 20px; - color: #22c6b3; + width: 20px; + color: #22c6b3; + margin-right: 275px; } .disabledArrow-ar{ height: 20px; width: 20px; color: gray; + /* margin-left: 136px; */ + margin-right: -251px; } .result-graph { position: relative; diff --git a/Mohem/src/app/my-team/details/details.component.ts b/Mohem/src/app/my-team/details/details.component.ts index 087df5da..a3604d0e 100644 --- a/Mohem/src/app/my-team/details/details.component.ts +++ b/Mohem/src/app/my-team/details/details.component.ts @@ -58,6 +58,7 @@ export class DetailsComponent implements OnInit { public yearTitle: string; public activeMonth: any; public currentMonthName = this.getMonthName(new Date().getMonth() + 1); + public showData = false; public currentYear = new Date().getFullYear(); public attendanceTrackingList: any = []; @@ -67,7 +68,7 @@ export class DetailsComponent implements OnInit { year: any; preMonth: number; nextMonth: any; - + public direction: string; public options = { cutoutPercentage: 80, tooltips: { enabled: false }, @@ -82,6 +83,7 @@ export class DetailsComponent implements OnInit { public searchEmail = ''; public showEmailInput = false; public showUserNameOrNameInput = true; + constructor( public timeCardService: TimeCardService, @@ -93,7 +95,9 @@ export class DetailsComponent implements OnInit { private location: Location, public authService: AuthenticationService, public dashboardService: DashboredService, - ) { } + ) { + this.direction = TranslatorService.getCurrentLanguageName(); + } ngOnInit() { this.common.startLoading(); @@ -131,7 +135,15 @@ export class DetailsComponent implements OnInit { this.showData = false; this.nextMonth = new Date().getMonth() + 2; this.preMonth = new Date().getMonth(); - this.calendarConfig(this.getMonthName(new Date().getMonth() + 1) , new Date().getFullYear()); + if(this.direction == 'en'){ + this.currentMonthName = this.getMonthName(new Date().getMonth() + 1); + + } + else{ + this.currentMonthName = this.getMonthNameAr(new Date().getMonth() + 1); + + } + this.calendarConfig(this.currentMonthName) , (new Date().getFullYear()); } calendarConfig(month?, year?) { @@ -167,6 +179,7 @@ export class DetailsComponent implements OnInit { }); } + nextSlide() { this.common.startLoading(); if (this.currentMonthName !== this.month) { @@ -310,6 +323,35 @@ export class DetailsComponent implements OnInit { } } + public getMonthNameAr(value: any): any { + switch (value) { + case 1: + return "يناير"; + case 2: + return " فبراير"; + case 3: + return "مارس"; + case 4: + return "أبريل"; + case 5: + return "مايو"; + case 6: + return "يونيو"; + case 7: + return "يوليو"; + case 8: + return "أغسطس"; + case 9: + return "سبتمبر"; + case 10: + return " اكتوبر"; + case 11: + return " نوفمبر"; + case 12: + return "ديسمبر"; + } +} + intializeMemberDetail(userID?) { this.empSubordinate = []; diff --git a/Mohem/src/app/my-team/home/home.component.html b/Mohem/src/app/my-team/home/home.component.html index 73b200a7..6ce9b0aa 100644 --- a/Mohem/src/app/my-team/home/home.component.html +++ b/Mohem/src/app/my-team/home/home.component.html @@ -2,12 +2,13 @@ {{ts.trPK('myTeam','myTeam-header')}} - - + + +
diff --git a/Mohem/src/app/payslip/home/home.component.html b/Mohem/src/app/payslip/home/home.component.html index b3201430..0819e298 100644 --- a/Mohem/src/app/payslip/home/home.component.html +++ b/Mohem/src/app/payslip/home/home.component.html @@ -45,15 +45,30 @@
-
+
-
- +
+ + + @@ -61,13 +76,26 @@ - +
@@ -111,18 +139,15 @@
-->
-

{{GetSummaryOfPaymentList.TOTAL_PAY_AMOUNT}}

{{ts.trPK('payslip','total')}}
{{ts.trPK('payslip','salary')}}
- -
-
+
@@ -132,7 +157,7 @@
-
+
@@ -179,9 +204,7 @@ - - - + diff --git a/Mohem/src/app/payslip/home/home.component.scss b/Mohem/src/app/payslip/home/home.component.scss index f79888be..46a732d0 100644 --- a/Mohem/src/app/payslip/home/home.component.scss +++ b/Mohem/src/app/payslip/home/home.component.scss @@ -28,6 +28,7 @@ font-size: 15px !important; text-align: center; margin-bottom: 1px; + margin-left: 8px; } .label-bold{ font-size: 13px !important; @@ -124,8 +125,12 @@ color: white; background: transparent !important; --background: transparent !important; - margin-right: 25px; - + -webkit-transform: scaleX(-1); + -moz-transform: scaleX(-1); + -o-transform: scaleX(-1); + transform: scaleX(-1); + margin-right: 38px; + margin-left: -45px; } .slidbtn{ background: transparent; @@ -147,7 +152,12 @@ background: transparent !important; --background: transparent !important; margin-right: 3px; - margin-left: -124px; + // margin-left: -124px; + margin-left: -105px; + -webkit-transform: scaleX(-1); + -moz-transform: scaleX(-1); + -o-transform: scaleX(-1); + transform: scaleX(-1); } .result-graph{ @@ -326,34 +336,54 @@ padding-right: 5px; } .div-green{ + // left: 77%; + // width: 20%; height: 6px; position: relative; - left: 77%; + left: 83%; bottom: 117px; color: black; background-color: #22c6b3; - width: 20%; height: 6px; + width: 16%; + height: 6px; } .div-green-ar{ - position: relative; + // position: relative; // left: 77%; + // bottom: 117px; + // color: black; + // background-color: #22c6b3; + // width: 20%; height: 6px; + position: relative; + left: 4%; bottom: 117px; color: black; background-color: #22c6b3; - width: 20%; height: 6px; + width: 15%; + height: 6px; } .div-blue{ + // left: 77%; + // width: 20%; height: 6px; position: relative; - left: 77%; - bottom: 67px; - color: black; - background-color: #094875; - width: 20%; height: 6px; + left: 83%; + bottom: 67px; + color: black; + background-color: #094875; + width: 16%; + height: 6px; } .div-blue-ar{ - position: relative; + //position: relative; // left: 77%; + // bottom: 67px; + // color: black; + // background-color: #094875; + // width: 20%; height: 6px; + position: relative; + left: 4%; bottom: 67px; color: black; background-color: #094875; - width: 20%; height: 6px; + width: 15%; + height: 6px; } \ No newline at end of file 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 eb770c23..11b91bc2 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.html +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.html @@ -37,15 +37,15 @@
- +
- +
- +
diff --git a/Mohem/src/app/profile/edit-profile/edit-profile.component.scss b/Mohem/src/app/profile/edit-profile/edit-profile.component.scss index 038856d4..294575dc 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.scss +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.scss @@ -95,7 +95,15 @@ padding-top: 19px; padding-bottom: 26px; } - + .columns-ar{ + margin: 10px; + background: #094875; + border-radius: 27px; + padding-left: 7px; + padding-right: 3px; + padding-top: 19px; + padding-bottom: 26px; + } .service{ font-size: 28px; diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 010f4334..14f02f64 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -1475,17 +1475,17 @@ "en": "Today's Attendance", "ar": "حضور اليوم" }, - "checkIn": { + "check-in":{ "en": "Check-In", - "ar": "CheckIn" + "ar":"وقت الدخول" }, - "checkOut": { + "check-out":{ "en": "Check-Out", - "ar": "CheckOut" + "ar":"وقت الخروج" }, "late": { "en": "Late", - "ar": "Late" + "ar": "التأخير" }, "attendance-statistics": { "en": "Attendance Statistics",