From 36c4bf322bae23762ffe07da45e0ab5c9afec191 Mon Sep 17 00:00:00 2001 From: enadhilal Date: Tue, 25 Feb 2020 16:08:01 +0300 Subject: [PATCH 01/17] add translate for header and fix the position back arrow in arabic version --- .../check-user/check-user.component.html | 2 +- .../confirm-login.component.html | 2 +- .../forgot/forgot.component.html | 2 +- .../authentication/login/login.component.html | 8 ++-- .../sms-page/sms-page.page.html | 2 +- Mohem/src/app/home/home.page.html | 10 ++--- .../app/notification/home/home.component.html | 12 +++--- .../app/notification/home/home.component.ts | 4 +- Mohem/src/assets/localization/i18n.json | 42 +++++++++++++++++++ 9 files changed, 64 insertions(+), 20 deletions(-) diff --git a/Mohem/src/app/authentication/check-user/check-user.component.html b/Mohem/src/app/authentication/check-user/check-user.component.html index 766c4349..ba3aec50 100644 --- a/Mohem/src/app/authentication/check-user/check-user.component.html +++ b/Mohem/src/app/authentication/check-user/check-user.component.html @@ -1,7 +1,7 @@ - + {{'login,forgot-password' | translate}} diff --git a/Mohem/src/app/authentication/confirm-login/confirm-login.component.html b/Mohem/src/app/authentication/confirm-login/confirm-login.component.html index ba09e11a..83eeed30 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.html +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.html @@ -1,7 +1,7 @@ - + {{'login,verify-login' | translate}} diff --git a/Mohem/src/app/authentication/forgot/forgot.component.html b/Mohem/src/app/authentication/forgot/forgot.component.html index 07be7169..acc41a5b 100644 --- a/Mohem/src/app/authentication/forgot/forgot.component.html +++ b/Mohem/src/app/authentication/forgot/forgot.component.html @@ -1,7 +1,7 @@ - + {{'login,forgot-password' | translate}} diff --git a/Mohem/src/app/authentication/login/login.component.html b/Mohem/src/app/authentication/login/login.component.html index 9ff9fb26..f2590d28 100644 --- a/Mohem/src/app/authentication/login/login.component.html +++ b/Mohem/src/app/authentication/login/login.component.html @@ -62,10 +62,10 @@ {{ts.trPK('login','signup')}}
- - - + + +
diff --git a/Mohem/src/app/authentication/sms-page/sms-page.page.html b/Mohem/src/app/authentication/sms-page/sms-page.page.html index c3a81c18..41ab6d70 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.html +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.html @@ -1,7 +1,7 @@ - + {{'verificationcode,verificationcode' | translate}} diff --git a/Mohem/src/app/home/home.page.html b/Mohem/src/app/home/home.page.html index 17f22142..f6cabafd 100644 --- a/Mohem/src/app/home/home.page.html +++ b/Mohem/src/app/home/home.page.html @@ -1,7 +1,7 @@ - DASHBOARD + {{'home,dashboard' | translate}}
@@ -27,10 +27,10 @@ -

Monthly Attendance

- View your Monthly Time Sheet +

{{'home,monthly-attendance' | translate}}

+ {{'home,monthly-time-sheet-view' | translate}} - View Detail + {{'home,view-detail' | translate}}
@@ -142,7 +142,7 @@
-->
- Time Left Today + {{'home,time-left' | translate}} - WORK LIST + {{'home,worklist' | translate}} @@ -12,11 +12,11 @@
- Open Request Analysis + {{'work-list,open-analysis' | translate}}

{{totalRequestCount}}

- TOTAL
OPEN REQUEST
+ {{'work-list,total' | translate}}
{{'work-list,open-reqest' | translate}}
@@ -37,12 +37,12 @@ - Clear Search + {{'work-list,clear-search' | translate}} - Advanced Search + {{'work-list,advanced-search' | translate}} -

Confirmation

+

{{'eit,confirmation' | translate}}

- No Attachment + {{'eit,no-attachment' | translate}}
- No Note + {{'eit,no-note' | translate}}
- Are you sure you want to submit + {{'eit,submit' | translate}} {{ts.trPK('general','ok')}} diff --git a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html index aa9cf636..a1a18349 100644 --- a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html +++ b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html @@ -104,7 +104,7 @@
-
+
- +
@@ -37,7 +37,7 @@
- +
@@ -53,7 +53,7 @@
-
+


@@ -61,7 +61,7 @@
-
+


@@ -70,7 +70,7 @@
-
+


diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.scss b/Mohem/src/app/eit/eit-list/eit-list.component.scss index ed9b1079..843af124 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.scss +++ b/Mohem/src/app/eit/eit-list/eit-list.component.scss @@ -134,6 +134,11 @@ h4 { margin-left: 7px !important; margin-right: 42px; } + .green-label-ar{ + font-size: 15px !important; + margin-left: 7px !important; + margin-right: 15px; + } .blue-label{ font-size: 15px !important; margin-left: 7px !important; @@ -144,6 +149,11 @@ h4 { margin-left: 7px !important; margin-right: -26px; } + .light-label-ar{ + font-size: 15px !important; + margin-right: 7px !important; + margin-left: -26px; + } .light-dote{ background-color: #3CB9D5; @@ -215,6 +225,16 @@ h4 { margin-left: -17px; margin-right: 5px; } + + .adult-dote-ar{ + background-color: #3CB9D5; + width: 15px; + height: 15px; + border-radius: 50% !important; + display: inline-block; + margin-right: 0px; + margin-left: 5px; + } .child-dote{ background-color: #22C6B3; @@ -225,6 +245,15 @@ h4 { margin-left: -17px; margin-right: 5px; } + .child-dote-ar{ + background-color: #22C6B3; + width: 15px; + height: 15px; + border-radius: 50% !important; + display: inline-block; + margin-right: 1px; + margin-left: 5px; + } .infants-dote{ background-color: #1FA269; width: 15px; @@ -235,4 +264,14 @@ h4 { margin-right: 5px; // margin-bottom: 6px; } + + .infants-dote-ar{ + background-color: #1FA269; + width: 15px; + height: 15px; + border-radius: 50% !important; + display: inline-block; + margin-right: 1px; + margin-left: 5px; + } \ No newline at end of file diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.ts b/Mohem/src/app/eit/eit-list/eit-list.component.ts index db00c923..2d0d24c5 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.ts +++ b/Mohem/src/app/eit/eit-list/eit-list.component.ts @@ -53,10 +53,12 @@ export class EitListComponent implements OnInit { gaugeType = "full"; accrualBalancesList: any; common: any; + direction: string; // gaugeValue = 11.200; // gaugeLabel = ""; constructor(private cs: CommonService, private EITService: EitService, private ts: TranslatorService, private modalCtrl: ModalController) { + this.direction = TranslatorService.getCurrentLanguageName() this.selMenu = this.cs.sharedService.getSharedData(MenuResponse.SHARED_DATA, false); this.selEmp = this.cs.sharedService.getSharedData(MenuResponse.SHARED_SEL_EMP, false); this.respID = this.cs.sharedService.getSharedData(MenuResponse.SHARED_SEL_RESP_ID, false); diff --git a/Mohem/src/app/eit/home/home.component.html b/Mohem/src/app/eit/home/home.component.html index 761904cc..421f1917 100644 --- a/Mohem/src/app/eit/home/home.component.html +++ b/Mohem/src/app/eit/home/home.component.html @@ -22,7 +22,7 @@ {{menuItem.PROMPT}} - + @@ -34,7 +34,7 @@  {{subPage.PROMPT}} - + diff --git a/Mohem/src/app/eit/home/home.component.scss b/Mohem/src/app/eit/home/home.component.scss index cc7f2852..ccda4466 100644 --- a/Mohem/src/app/eit/home/home.component.scss +++ b/Mohem/src/app/eit/home/home.component.scss @@ -66,3 +66,17 @@ ion-icon::before { // border-bottom: 1px solid #dedede; // } + +.span-arrow-en{ + float: right; + font-size: 25px; + color: grey; + transform: rotate(0deg); +} + +.span-arrow-ar{ + float: left; + font-size: 25px; + color: grey; + transform: rotate(180deg); +} diff --git a/Mohem/src/app/eit/home/home.component.ts b/Mohem/src/app/eit/home/home.component.ts index cb228fed..b740ec87 100644 --- a/Mohem/src/app/eit/home/home.component.ts +++ b/Mohem/src/app/eit/home/home.component.ts @@ -16,8 +16,10 @@ export class HomeComponent implements OnInit { selMenu: MenuResponse = new MenuResponse(); // Selected Side Menu selectedMenu: any; + direction: string; constructor(private cs: CommonService, private ts: TranslatorService) { + this.direction = TranslatorService.getCurrentLanguageName() this.menu = this.cs.sharedService.getSharedData('menuEntries', false); this.selMenu = this.cs.sharedService.getSharedData(MenuResponse.SHARED_DATA, false); const title: string = this.ts.trPK('eit', 'my-requests'); diff --git a/Mohem/src/app/eit/submit-eit-modal/submit-eit-modal.component.html b/Mohem/src/app/eit/submit-eit-modal/submit-eit-modal.component.html index 2a19db89..4bbf7b6b 100644 --- a/Mohem/src/app/eit/submit-eit-modal/submit-eit-modal.component.html +++ b/Mohem/src/app/eit/submit-eit-modal/submit-eit-modal.component.html @@ -10,21 +10,21 @@
--> -

Confirmation

+

{{'eit,confirmation' | translate}}

- No Attachment + {{'eit,no-attachment' | translate}}
- No Note + {{'eit,no-note' | translate}}
- Are you sure you want to submit + {{'eit,submit' | translate}} {{ts.trPK('general','ok')}} diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index d8aa4d86..0ff6168f 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -56,31 +56,31 @@ export class HomePage implements OnInit { camera: boolean; public statsButtons = [ { - title: 'Work List', + title: this.ts.trPK('home','worklist'), statsValue: 0, icon: 'assets/icon/new-design/work_list.png', link: '/notification/homepage' }, { - title: 'Pending Request', + title: this.ts.trPK('home','pending-request'), statsValue: 13, icon: 'assets/icon/new-design/pending_request.png', link: '' }, { - title: 'Missing Swipes', + title: this.ts.trPK('home','missing-swipes'), statsValue: 0, icon: 'assets/icon/new-design/missing_swipe.png', link: '' }, { - title: 'Leave Balance', + title: this.ts.trPK('home','leave-balance'), statsValue: 0, icon: 'assets/icon/new-design/leave_balance.png', link: '' }, { - title: 'Ticket Balance', + title: this.ts.trPK('absenceList','tickets-balance'), statsValue: 0, icon: 'assets/icon/new-design/ticket_balance.png', link: '' diff --git a/Mohem/src/app/notification/home/home.component.html b/Mohem/src/app/notification/home/home.component.html index 49c4a0d5..daa10f0d 100644 --- a/Mohem/src/app/notification/home/home.component.html +++ b/Mohem/src/app/notification/home/home.component.html @@ -61,9 +61,9 @@
-
+
- {{data.key}} + {{data.key}}

{{workList.SUBJECT}}

@@ -71,9 +71,9 @@
-
+
- {{segmentInfo.ModifiedDate |date}} + {{segmentInfo.ModifiedDate |date}}

{{segmentInfo.Title}}

diff --git a/Mohem/src/app/notification/home/home.component.scss b/Mohem/src/app/notification/home/home.component.scss index 19ac087d..8e752def 100644 --- a/Mohem/src/app/notification/home/home.component.scss +++ b/Mohem/src/app/notification/home/home.component.scss @@ -312,7 +312,7 @@ ion-content { margin-top: 10px; margin-left: 20px; } -.work-list-container { +.work-list-container-en { position: relative; padding-left: 60px; clear: both; @@ -320,7 +320,7 @@ ion-content { margin-bottom: 80px; padding-top: 15px; } -.work-list-container:before{ +.work-list-container-en:before{ content: ""; position: absolute; height: 100%; @@ -329,6 +329,26 @@ ion-content { top: 15px; background-color: #dddddd; } + +.work-list-container-ar { + position: relative; + padding-right: 60px; + clear: both; + min-height: 200px; + margin-bottom: 80px; + padding-top: 15px; +} +.work-list-container-ar:before{ + content: ""; + position: absolute; + height: 100%; + width: 4px; + right: 30px; + top: 15px; + background-color: #dddddd; +} + + .search-container{ margin-top: 15px; display: block; @@ -365,6 +385,9 @@ ion-content { background-color: #38c9b3; top: 1px; } + + + .date-data{ background-color: white; padding: 1px; @@ -418,3 +441,20 @@ ion-content { .slideCss{ width: 200px !important; } + + +.date-span-ar { + position: relative; + display: block; + margin-bottom: 10px; +} +.date-span-ar:before{ + content: ""; + position: absolute; + right: -35px; + border-radius: 50%; + width: 15px; + height: 15px; + background-color: #38c9b3; + top: 1px; +} diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index 37765d68..a30c11d2 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -153,7 +153,9 @@ export class HomeComponent implements OnInit { } ngOnInit() { - // this.direction = TranslatorService.getCurrentDirection(); + this.direction = TranslatorService.getCurrentLanguageName()//TranslatorService.getCurrentDirection(); + + console.log(">>>>>>>>>>>>>>>>>>"+this.direction); this.worklistNotifications = this.common.sharedService.getSharedData('worklistNotifications', false); this.Details(); this.Count(); @@ -406,7 +408,7 @@ export class HomeComponent implements OnInit { style: false }; } - if(this.ITGSegment.length !=0 ){ + if(this.ITGSegment.length != 0 ){ this.setActive(this.ITGSegment[0].code); } }); diff --git a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html index fa90523a..41f21f98 100644 --- a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html +++ b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html @@ -75,7 +75,7 @@
+ [class]="direction == 'en'? 'timeline-thumb-en timeline-icon': 'timeline-thumb-ar timeline-icon'">

{{approvalInfo.Action}}

diff --git a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts index 96518745..d42e7929 100644 --- a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts +++ b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts @@ -49,6 +49,7 @@ export class WorkListMainItgComponent implements OnInit { public ExchangeServerSelected: any; public ExchangeServerDBSelected: any; public actionBTN: { name: string, image: string, isAvailable: boolean }[] = []; + direction: string; constructor( public common: CommonService, public ts: TranslatorService, @@ -56,6 +57,7 @@ export class WorkListMainItgComponent implements OnInit { public modalCtrl: ModalController) { } ngOnInit() { + this.direction = TranslatorService.getCurrentLanguageName() this.request_info = this.common.sharedService.getSharedData(HomeComponent.REQUSET_INFO); this.request_name = this.common.sharedService.getSharedData(HomeComponent.REQUSET_NAME); this.all_request = this.common.sharedService.getSharedData(HomeComponent.ALL_REQUEST); diff --git a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html index 15f6e4ea..8c0fe4ee 100644 --- a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html +++ b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html @@ -455,7 +455,7 @@
--> -
+
diff --git a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts index 4dc1c916..09243324 100644 --- a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts +++ b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts @@ -113,7 +113,7 @@ export class WorklistMainMRComponent implements OnInit { private modalCtrl: ModalController, public worklistService: WorklistService ) { - + this.direction = TranslatorService.getCurrentLanguageName() //this.getPassNotificationDetails = this.common.sharedService.getSharedData('passNotificationInfo'); this.WorkListActionHistoryObj = new WorkListActionHistoryRequest(); this.WorkListActionHistoryObj.P_PAGE_NUM = this.P_PAGE_NUM; diff --git a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html index 83d464b5..f966aae2 100644 --- a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html +++ b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html @@ -598,7 +598,7 @@
--> -
+
diff --git a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts index 488aba47..5ba8e25f 100644 --- a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts +++ b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts @@ -115,6 +115,7 @@ export class WorklistMainPoComponent implements OnInit { approveDis: boolean = false; rejectDis: boolean = false; requestDis: boolean = false; + direction: string; constructor( @@ -128,6 +129,7 @@ export class WorklistMainPoComponent implements OnInit { private modalCtrl: ModalController, public worklistService: WorklistService, ) { + this.direction = TranslatorService.getCurrentLanguageName() this.WorkListActionHistoryObj = new WorkListActionHistoryRequest(); this.WorkListActionHistoryObj.P_PAGE_NUM = this.P_PAGE_NUM; this.WorkListActionHistoryObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; diff --git a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html index 6e82b0cf..b53e66c7 100644 --- a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html +++ b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html @@ -307,7 +307,7 @@
--> -
+
-
+
Date: Thu, 27 Feb 2020 12:35:25 +0300 Subject: [PATCH 03/17] design dynamic form and translate --- .../app/eit/add-eit/add-eit.component.scss | 1 + .../app/eit/eit-list/eit-list.component.html | 6 +- .../app/eit/eit-list/eit-list.component.scss | 7 +- Mohem/src/app/eit/home/home.component.html | 1 + Mohem/src/app/eit/home/home.component.scss | 7 ++ Mohem/src/app/uI-elements/select.input.ts | 41 +++++++-- Mohem/src/app/uI-elements/time.input.ts | 33 ++++++-- Mohem/src/theme/styles.scss | 83 ++++++++++++++++++- 8 files changed, 163 insertions(+), 16 deletions(-) diff --git a/Mohem/src/app/eit/add-eit/add-eit.component.scss b/Mohem/src/app/eit/add-eit/add-eit.component.scss index 08f5fd5c..22988b18 100644 --- a/Mohem/src/app/eit/add-eit/add-eit.component.scss +++ b/Mohem/src/app/eit/add-eit/add-eit.component.scss @@ -23,6 +23,7 @@ ion-label { padding-left: 10px; } + .header-toolbar-new{ --background: #22c6b3; } 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 b8be6804..7cf67ff5 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.html +++ b/Mohem/src/app/eit/eit-list/eit-list.component.html @@ -1,6 +1,8 @@ - + + + {{headerTitle}} @@ -130,7 +132,7 @@
- + diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.scss b/Mohem/src/app/eit/eit-list/eit-list.component.scss index ed9b1079..05395d61 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.scss +++ b/Mohem/src/app/eit/eit-list/eit-list.component.scss @@ -235,4 +235,9 @@ h4 { margin-right: 5px; // margin-bottom: 6px; } - \ No newline at end of file +// .icon-left{ +// margin-left: 10px; +// } +// .icon-right{ +// margin-left: 3px; +// } \ No newline at end of file diff --git a/Mohem/src/app/eit/home/home.component.html b/Mohem/src/app/eit/home/home.component.html index 761904cc..16d38ae6 100644 --- a/Mohem/src/app/eit/home/home.component.html +++ b/Mohem/src/app/eit/home/home.component.html @@ -2,6 +2,7 @@ {{headerTitle}} + diff --git a/Mohem/src/app/eit/home/home.component.scss b/Mohem/src/app/eit/home/home.component.scss index cc7f2852..8149a654 100644 --- a/Mohem/src/app/eit/home/home.component.scss +++ b/Mohem/src/app/eit/home/home.component.scss @@ -66,3 +66,10 @@ ion-icon::before { // border-bottom: 1px solid #dedede; // } + +// .icon-left{ +// margin-left: 10px; +// } +// .icon-right{ +// margin-left: 3px; +// } diff --git a/Mohem/src/app/uI-elements/select.input.ts b/Mohem/src/app/uI-elements/select.input.ts index f2797d44..d1cf8bf9 100644 --- a/Mohem/src/app/uI-elements/select.input.ts +++ b/Mohem/src/app/uI-elements/select.input.ts @@ -1,7 +1,9 @@ import { UiElement } from "./ui-element"; +import { TranslatorService } from '../hmg-common/services/translator/translator.service'; export class SelectInput extends UiElement { + public direction: string; constructor( private label: string, private elementId: string, @@ -11,25 +13,50 @@ export class SelectInput extends UiElement { private hidden: string, private required: string) { super(elementId, containerId, ''); + this.direction = TranslatorService.getCurrentLanguageName(); + console.log(this.direction); this.createElement(this.getTemplate()); } public getTemplate() { + let template :string = ""; let requiredClass: string = ""; if (this.required == 'Y') requiredClass = "requiredClass" if (this.disabled == "N") { this.disabled = "disabled" } else { this.disabled = "" } if (this.hidden == "N") { this.hidden = "display:none;" } else { this.hidden = "" } - const template = - "
" + - " " + - " "+ - "
"; + // const template = + // "
" + + // " " + + // " "+ + // "
"; + if(this.direction == 'en'){ + template = + "
" + + " " + + " "+ + "
"; + } + else{ + template = + "
" + + " " + + " "+ + "
"; + } +//[ngClass]=\"{\'daynamicForm-Select\': !ar,\'daynamicForm-Selects\':ar}\ + // [ngClass]= direction == 'en'? 'daynamicForm-Select' : 'daynamicForm-Selects' + // [ngClass]=" direction === 'rtl' ? 'daynamicForm-Selects' : 'daynamicForm-Select'" + // class='daynamicForm-Select' id='" + this.elementId + "' // "" + diff --git a/Mohem/src/app/uI-elements/time.input.ts b/Mohem/src/app/uI-elements/time.input.ts index 001589f0..7f148729 100644 --- a/Mohem/src/app/uI-elements/time.input.ts +++ b/Mohem/src/app/uI-elements/time.input.ts @@ -1,6 +1,8 @@ import { UiElement } from "./ui-element"; +import { TranslatorService } from '../hmg-common/services/translator/translator.service'; export class TimeInput extends UiElement { + public direction: string; constructor( private label: string, private elementId: string, @@ -10,6 +12,7 @@ export class TimeInput extends UiElement { private hidden: string, private required: string) { super(elementId, containerId, ''); + this.direction = TranslatorService.getCurrentLanguageName(); this.createElement(this.getTemplate()); } @@ -21,6 +24,7 @@ export class TimeInput extends UiElement { public getTemplate() { + let template :string = ""; let requiredClass: string = ""; let disaledClass = ""; if (this.required == 'Y') @@ -30,12 +34,31 @@ export class TimeInput extends UiElement { if (this.value == "currentTime") { this.formatDate(); } - const template = - "
" + - " " + + // const template = + // "
" + + // " " + // " "+ - "
"+this.value+"
"+ - "
"; + // "
"+this.value+"
"+ + // "
"; + + + if(this.direction == 'en'){ + template = + "
" + + " " + + // " "+ + "
"+this.value+"
"+ + "
"; + } + else{ + template = + "
" + this.label + "" + + // " "+ + "
" + this.elementId + "' data-dtvalue='" + this.value + "' "+this.disabled+">"+this.value+"
"+ + "
"; + + } // "" + // " " + this.label + "" + diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index 82603f96..277824d9 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -576,6 +576,37 @@ ion-col.colBold,ion-col.colBold>label{ } } + + +.ardaynamicForm-Label{ + font-size: 16px; + // margin-left: 15px; + color: #a2a5a6 !important; + display: block; + overflow: hidden; + -webkit-box-flex: 1; + -webkit-flex: 1; + -ms-flex: 1; + flex: 1; + /* font-size: inherit; */ + // text-overflow: ellipsis; + // white-space: nowrap; + white-space: normal; + // padding-top: 10px; + padding: 5px 0px; + padding-left: 10px !important; + margin: 10px auto; + margin-right: 12px !important; + :root[dir="ltr"]{ + font-family: var(--fontFamilySemiBoldEN) !important; + } + :root[dir="rtl"]{ + font-family: var(--fontFamilyIOSAR) !important; + font-weight: bold; + } + +} + img.flipImg{ :root[dir="rtl"]{ -webkit-transform: scaleX(-1); @@ -646,6 +677,7 @@ img.flipImg{ box-shadow: none; -webkit-box-shadow:none; -moz-box-shadow: none; + margin-bottom: 8px; } .daynamicForm-DateTime:after{ width: 0; @@ -683,7 +715,8 @@ img.flipImg{ background-color: var(--light); border-bottom: var(--cusgray) solid 1px; border-radius: 0px; - margin-left: 20px; + // margin-left: 20px; + margin-left: 34px; margin-top: -10px; // -webkit-appearance: none; // -moz-appearance: none; @@ -712,6 +745,54 @@ img.flipImg{ } } + +.ardaynamicForm-Select{ + color: var(--dark); + font-size: 15px; + // background: url(http://i62.tinypic.com/15xvbd5.png) no-repeat 96% 0; + // background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiP…AgICAgPC9nPgogICAgICAgICAgICA8L2c+CiAgICAgICAgPC9nPgogICAgPC9nPgo8L3N2Zz4=), -webkit-gradient(linear, left bottom, left top, color-stop(50%, rgba(0, 0, 0, 0.12)), color-stop(50%, rgba(0, 0, 0, 0.12))); + // background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiP…AgICAgPC9nPgogICAgICAgICAgICA8L2c+CiAgICAgICAgPC9nPgogICAgPC9nPgo8L3N2Zz4=), linear-gradient(to top, rgba(0, 0, 0, 0.12) 50%, rgba(0, 0, 0, 0.12) 50%); + // background-size: 96% 0; + // background-repeat: no-repeat; + border: none; + font-weight: 400; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + width: 80%; + padding: 6px 0px; + background-color: var(--light); + border-bottom: var(--cusgray) solid 1px; + border-radius: 0px; + margin-right: 34px; + margin-top: -10px; + // -webkit-appearance: none; + // -moz-appearance: none; + text-indent: 1px; + // text-overflow: ''; + box-shadow: none; + -webkit-box-shadow:none; + -moz-box-shadow: none; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + + :root[dir="ltr"]{ + background-image: linear-gradient(45deg, transparent 50%, #999 50%), linear-gradient(135deg, #999 50%, transparent 50%), linear-gradient(to right, #ffffff, #ffffff); + background-position: calc(100% - 14px) calc(1em + 2px), calc(100% - 8px) calc(1em + 2px), 100% 0; + background-size: 6px 6px, 6px 6px, 2.9em 2.9em; + background-repeat: no-repeat; + padding-right: 20px; + } + :root[dir="rtl"]{ + background-image: linear-gradient(-135deg, #999 50%, transparent 50%),linear-gradient(-45deg, transparent 50%, #999 50%), linear-gradient(to right, #ffffff, #ffffff); + background-position: calc(1em - 10px) calc(100% - 8px), calc(1em - 4px) calc(100% - 8px), 0 100%; + background-size: 6px 6px, 6px 6px, 2.9em 2.9em; + background-repeat: no-repeat; + padding-left: 20px; + } +} + + .daynamicForm-Select:after{ width: 0; height: 0; From 43bc72b9b8dd0dc67fae06e180cd3301aaa5aa64 Mon Sep 17 00:00:00 2001 From: "Fatimah.Alshammari" Date: Thu, 27 Feb 2020 14:55:54 +0300 Subject: [PATCH 04/17] update translate and fix design --- .../models/attendanceSwipe.Request.ts | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 Mohem/src/app/attendance/models/attendanceSwipe.Request.ts diff --git a/Mohem/src/app/attendance/models/attendanceSwipe.Request.ts b/Mohem/src/app/attendance/models/attendanceSwipe.Request.ts new file mode 100644 index 00000000..b08ad177 --- /dev/null +++ b/Mohem/src/app/attendance/models/attendanceSwipe.Request.ts @@ -0,0 +1,25 @@ +import { Request } from 'src/app/hmg-common/services/models/request'; + +export class attendanceSwipeScannerRequest extends Request{ + public static SHARED_DATA = 'attendanceSwipeScanner-request'; + public P_USER_NAME:string; + public P_PASSWORD: string; + public UserName: string; + public CompanyID:number; + public BranchID: number; + public UID:string; + public Latitude:number; + public Longitude:number; + public QRValue: string; + public MemberID:number; + public EmployeeID: number; + public IPAdress: string; + public UserID: string; +} + + + + + + + From 785538983f41b74be7180dc3cb1af9dd51b43249 Mon Sep 17 00:00:00 2001 From: enadhilal Date: Sun, 1 Mar 2020 10:30:19 +0300 Subject: [PATCH 05/17] 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 25826f900da1a93091c10de3ac6240c11e3227ae Mon Sep 17 00:00:00 2001 From: "Fatimah.Alshammari" Date: Sun, 1 Mar 2020 15:03:32 +0300 Subject: [PATCH 06/17] 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": { From 10ec3c4ec8625304d1998795ec7f6e045f37bd33 Mon Sep 17 00:00:00 2001 From: enadhilal Date: Mon, 2 Mar 2020 10:21:22 +0300 Subject: [PATCH 07/17] 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 08/17] 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%; From 7a30805e717e47f359439b6b11e73d6e9f3bd998 Mon Sep 17 00:00:00 2001 From: "Fatimah.Alshammari" Date: Tue, 3 Mar 2020 14:23:28 +0300 Subject: [PATCH 09/17] 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')}} Date: Thu, 5 Mar 2020 09:35:32 +0300 Subject: [PATCH 10/17] general --- .../src/app/absence/home/home.component.html | 8 +- .../src/app/absence/home/home.component.scss | 31 ++++---- Mohem/src/app/absence/home/home.component.ts | 14 ++-- .../date-info-modal.component.html | 4 +- .../date-info-modal.component.scss | 16 ++++ Mohem/src/app/payslip/home/home.component.ts | 2 +- .../edit-profile/edit-profile.component.html | 18 ++--- .../edit-profile/edit-profile.component.scss | 24 +++++- .../edit-profile/edit-profile.component.ts | 3 +- .../src/app/profile/home/home.component.html | 14 +++- .../src/app/profile/home/home.component.scss | 5 ++ Mohem/src/app/profile/home/home.component.ts | 3 +- .../performance-evaluation.component.html | 4 +- .../performance-evaluation.component.scss | 6 ++ .../performance-evaluation.component.ts | 79 ++++++++++--------- .../profile-image.component.html | 8 +- .../profile-image.component.scss | 4 +- Mohem/src/assets/localization/i18n.json | 12 +++ 18 files changed, 168 insertions(+), 87 deletions(-) diff --git a/Mohem/src/app/absence/home/home.component.html b/Mohem/src/app/absence/home/home.component.html index 7e438e1c..b2898b2b 100644 --- a/Mohem/src/app/absence/home/home.component.html +++ b/Mohem/src/app/absence/home/home.component.html @@ -1,6 +1,6 @@ - {{ts.trPK('absenceList','absenceList')}} + {{ts.trPK('home','leave-balance')}} @@ -68,7 +68,7 @@
-
+
@@ -78,7 +78,7 @@
-
+
@@ -89,7 +89,7 @@
-
+
diff --git a/Mohem/src/app/absence/home/home.component.scss b/Mohem/src/app/absence/home/home.component.scss index fdeaca6a..c3675a2e 100644 --- a/Mohem/src/app/absence/home/home.component.scss +++ b/Mohem/src/app/absence/home/home.component.scss @@ -227,7 +227,7 @@ margin-top: -13px; top: 0px; z-index: 1; } - .div-orng{ + .div-green{ position: relative; left: 82%; bottom: 128px; @@ -236,7 +236,17 @@ margin-top: -13px; width: 13%; height: 6px; } - .div-blue-ar{ + .div-green-ar{ + position: relative; + bottom: 59px; + color: black; + background-color: #1FA269; + width: 13%; + height: 6px; + right: 9px; + + } + .div-red-ar{ position: relative; bottom: 131px; color: black; @@ -247,7 +257,7 @@ margin-top: -13px; height: 6px; right: 78px; } - .div-blue{ + .div-red{ position: relative; left: 59%; bottom: 131px; @@ -257,17 +267,8 @@ margin-top: -13px; width: 13%; height: 6px; } - .div-orng-ar{ - position: relative; - bottom: 59px; - color: black; - background-color: #1FA269; - width: 13%; - height: 6px; - right: 9px; - - } - .div-red{ + + .div-orng{ position: relative; left: 82%; bottom: 80px; @@ -277,7 +278,7 @@ margin-top: -13px; width: 13%; height: 6px; } - .div-red-ar{ + .div-orng-ar{ position: relative; bottom: 139px; color: black; diff --git a/Mohem/src/app/absence/home/home.component.ts b/Mohem/src/app/absence/home/home.component.ts index 6fca2c82..5075bd6d 100644 --- a/Mohem/src/app/absence/home/home.component.ts +++ b/Mohem/src/app/absence/home/home.component.ts @@ -108,10 +108,10 @@ export class HomeComponent implements OnInit { this.data = { // labels: ['earingTotal', 'deductionTotal'], datasets: [ - { data: [this.accrualNet,this.accrualUsed,this.accrualYearly], + { data: [this.accrualNet,this.accrualYearly,this.accrualUsed], backgroundColor: [ - '#DDB017', - '#094875', + '#1FA269', + '#DDB017', '#CB3232',], borderWidth: 2 } @@ -263,11 +263,11 @@ createAbsence() { this.data = { // labels: ['earingTotal', 'deductionTotal'], datasets: [ - { data: [this.accrualNet,this.accrualUsed,this.accrualYearly], + { data: [this.accrualNet,this.accrualYearly,this.accrualUsed], backgroundColor: [ - '#DDB017', - '#094875', - '#CB3232',], + '#1FA269', + '#DDB017', + '#CB3232',], borderWidth: 2 } ] 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 66354835..983bcdc4 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 @@ -24,10 +24,10 @@

{{day}}

-

{{nameMonth}}

+

{{nameMonth}}

-

{{year}}

+

{{year}}

{{ts.trPK('attendance','present')}}

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 dd3a9524..c078c749 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 @@ -197,6 +197,22 @@ height: 360px !important; margin-top: -43px; margin-left: 27px; } + + .p2-ar{ font-weight: bold !important; + font-size: 17px !important; + margin-bottom: 43px !important; + margin-top: 0px !important; + color: black !important; + font-weight: bold !important; + margin-right: 33px; + } + .p3-ar{ /* margin-bottom: -72px !important; */ + color: black !important; + font-weight: bold !important; + font-size: 19px; + margin-top: -43px; + margin-right: 27px; + } .p4{ margin-bottom: 56px !important; margin-top: -26px !important; color: black !important; diff --git a/Mohem/src/app/payslip/home/home.component.ts b/Mohem/src/app/payslip/home/home.component.ts index 9fa024f2..66942158 100644 --- a/Mohem/src/app/payslip/home/home.component.ts +++ b/Mohem/src/app/payslip/home/home.component.ts @@ -58,7 +58,7 @@ export class HomeComponent implements OnInit { tooltips: { enabled: false }, legend: { display: false }}; gaugeType = "full"; - direction: string; + // gaugeValue = 11.200; // gaugeLabel = ""; 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 9ce9f3d3..47abf5dd 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.html +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.html @@ -26,16 +26,16 @@
- -
+ +
- -
+ +
- -
+ +
@@ -47,7 +47,7 @@
-

Years of Services

+

{{ts.trPK('userProfile','Years of Services')}}

@@ -58,7 +58,7 @@ {{ts.trPK('userProfile','edit-profile')}} - + @@ -69,7 +69,7 @@ {{ts.trPK('userProfile','performance-evaluation')}} - +
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 651acf4b..2fa4ab18 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.scss +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.scss @@ -106,6 +106,18 @@ font-size: 12px; color: white; } + .service-ar{ + font-size: 28px; + color: white; + letter-spacing: 1px; + font-weight: bold; + margin-right: 26px; + } + .services-ar{ + font-size: 14px; + color: white; + margin-right: 25px; + } .list{ margin-left: 14px; @@ -150,4 +162,14 @@ margin-top: 4px; } - \ No newline at end of file + .arrow{ + width: 20px; + height: 22px !important; + } + .arrow-ar{ + float: left; + font-size: 25px; + color: grey; + -webkit-transform: rotate(180deg); + transform: rotate(180deg); + } \ No newline at end of file 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 946dce11..a97d76ee 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.ts +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.ts @@ -20,7 +20,7 @@ export class EditProfileComponent implements OnInit { User_name_Emp: string = ""; User_Job_name: string; - + public direction: string; private menu: MenuController; setImage:any; // imageSrc: any = "../assets/imgs/profile.png"; @@ -41,6 +41,7 @@ export class EditProfileComponent implements OnInit { ) { + this.direction = TranslatorService.getCurrentDirection(); // this.events.subscribe("img-change", displayImg => { // console.log("app compont: "+displayImg); // this.user_image = this.sanitizer.bypassSecurityTrustUrl("data:Image/*;base64,"+displayImg); diff --git a/Mohem/src/app/profile/home/home.component.html b/Mohem/src/app/profile/home/home.component.html index dc6f6451..c9982711 100644 --- a/Mohem/src/app/profile/home/home.component.html +++ b/Mohem/src/app/profile/home/home.component.html @@ -10,13 +10,21 @@
--> + + + {{ts.trPK('userProfile','title')}} + + + + +
- +
@@ -32,7 +40,7 @@
-
+
diff --git a/Mohem/src/app/profile/home/home.component.scss b/Mohem/src/app/profile/home/home.component.scss index 4be2aac3..c508d39d 100644 --- a/Mohem/src/app/profile/home/home.component.scss +++ b/Mohem/src/app/profile/home/home.component.scss @@ -50,6 +50,11 @@ ion-col.colBold, ion-col.colBold > label{ top: 80%; left: 65%; } + .changeImgBtn-ar{ + position: absolute; + top: 80%; + left: 74%; + } .profileImg{ width: 160px; height: 160px; diff --git a/Mohem/src/app/profile/home/home.component.ts b/Mohem/src/app/profile/home/home.component.ts index 2e192b1f..4894cbb2 100644 --- a/Mohem/src/app/profile/home/home.component.ts +++ b/Mohem/src/app/profile/home/home.component.ts @@ -14,6 +14,7 @@ export class HomeComponent implements OnInit { personalInfo: any; setImage:any; imageSrc: any = "../assets/imgs/profile.png"; + public direction: string; // user_image: any = "../assets/imgs/profile.png"; constructor( public ts: TranslatorService, @@ -24,7 +25,7 @@ export class HomeComponent implements OnInit { ) { - + this.direction = TranslatorService.getCurrentDirection(); this.events.subscribe("img-change", displayImg => { // alert("1 - profile home : "+displayImg); //this.user_image = "data:image/png;base64"+displayImg; diff --git a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html index 447ba6d0..256fd5d8 100644 --- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html +++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html @@ -25,9 +25,9 @@
-

Performance Evaluation

+

{{ts.trPK('userProfile','performance-evaluation')}}

-
+
{ - // console.log("app compont: "+displayImg); - // this.user_image = this.sanitizer.bypassSecurityTrustUrl("data:Image/*;base64,"+displayImg); - - // }); - - - } + // private events: Events, + // private sanitizer: DomSanitizer, + + ) { + this.direction = TranslatorService.getCurrentDirection(); + // this.events.subscribe("img-change", displayImg => { + // console.log("app compont: "+displayImg); + // this.user_image = this.sanitizer.bypassSecurityTrustUrl("data:Image/*;base64,"+displayImg); + + // }); - colorScheme = { - domain: ['#22C6B3', '#094875','#3CB9D5','#1FA269','#0D155E'] - }; - + } + + + colorScheme = { + domain: ['#22C6B3', '#094875', '#3CB9D5', '#1FA269', '#0D155E'] + }; + ngOnInit() { - - + + this.getProfile(); - + this.performanceData = this.cs.sharedService.getSharedData( PerformanceAppraisalResponse.PERFORMANCE_DATA, true ); console.log(this.performanceData.length); - //i % 2 == 0 - this.length=this.performanceData.length; + //i % 2 == 0 + this.length = this.performanceData.length; - for(let i=0;i text").remove(); + } getProfile() { console.log("getProfile"); @@ -79,11 +83,12 @@ export class PerformanceEvaluationComponent implements OnInit { if (user) { this.personalInfo = user; this.user_image = user.EMPLOYEE_IMAGE - ? "data:image/png;base64," + user.EMPLOYEE_IMAGE - : "../assets/imgs/profile.png"; - + ? "data:image/png;base64," + user.EMPLOYEE_IMAGE + : "../assets/imgs/profile.png"; + + + } + }); + } - }}); -} - } diff --git a/Mohem/src/app/profile/profile-image/profile-image.component.html b/Mohem/src/app/profile/profile-image/profile-image.component.html index 04bfb165..22e79717 100644 --- a/Mohem/src/app/profile/profile-image/profile-image.component.html +++ b/Mohem/src/app/profile/profile-image/profile-image.component.html @@ -1,9 +1,11 @@ - + + {{ts.trPK('userProfile','changepicture')}} - + + - {{ts.trPK('userProfile','changepicture')}} +
@@ -35,7 +35,9 @@ - + + +

{{shiftTime}}

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

@@ -50,7 +52,7 @@
- +

{{startDate}}

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

@@ -65,13 +67,12 @@
- +

{{lateIn}}

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

-

{{excess}}

@@ -79,7 +80,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 307738f4..096e04ab 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 @@ -68,11 +68,11 @@ margin-left: -60px; } .today-graph-ar{ - display: block; - height: 134px; - width: 285px; - margin-left: -18px; + height: 127px; + width: 270px; + /* margin-left: -61px; */ + margin-right: -18px; } .amountlabel{ color: black !important; @@ -202,4 +202,19 @@ height: 360px !important; padding-bottom: 21px; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; - } \ No newline at end of file + } + .col{ + border-bottom: 1px solid rgb(204, 204, 204); + border-right: 1px solid rgb(204, 204, 204); + flex: 0 0 calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); + width: calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); + max-width: calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); + } + .col-ar{ + border-bottom: 1px solid rgb(204, 204, 204); + border-left: 1px solid rgb(204, 204, 204); + flex: 0 0 calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); + width: calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); + max-width: calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); + } + \ No newline at end of file diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 099f55e2..ef9fcc82 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -1125,6 +1125,10 @@ "ar": "تقويم الحضور الشهري", "en": "Monthly Attendance Calendar" }, + "completed": { + "ar": "منجز", + "en": "Completed" + }, "present": { "ar": "حضور", "en": "Present" From 821811c8e2d049c47ceee4f6573d24e91204807e Mon Sep 17 00:00:00 2001 From: "Fatimah.Alshammari" Date: Sun, 8 Mar 2020 11:15:47 +0300 Subject: [PATCH 13/17] edit worklist main page --- .../src/app/notification/home/home.component.html | 14 +++++++------- .../worklist-advanced-search.component.html | 6 +++--- Mohem/src/assets/localization/i18n.json | 4 ++++ 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Mohem/src/app/notification/home/home.component.html b/Mohem/src/app/notification/home/home.component.html index 829e0501..70327ee6 100644 --- a/Mohem/src/app/notification/home/home.component.html +++ b/Mohem/src/app/notification/home/home.component.html @@ -3,7 +3,7 @@ - WORK LIST + {{ts.trPK('home','worklist')}} @@ -12,15 +12,15 @@
- Open Request Analysis + {{ts.trPK('work-list','open-analysis')}}
- {{newWorkListResponse.length + ITGCount}} of + {{newWorkListResponse.length + ITGCount}} {{ts.trPK('work-list','of')}} {{newWorkListResponse.length}} of

{{totalRequestCount}}

{{newWorkListResponse[0].NO_OF_ROWS + ITGCount}}

{{newWorkListResponse[0].NO_OF_ROWS}}

- TOTAL
OPEN REQUEST
+ {{ts.trPK('work-list','total')}}
{{ts.trPK('work-list','open-reqest')}}
@@ -42,12 +42,12 @@ - Clear Search + {{ts.trPK('work-list','clear-search')}} - Advanced Search + {{ts.trPK('work-list','advanced-search')}} @@ -75,7 +71,6 @@
-
{{segmentInfo.ModifiedDate |date}} @@ -84,19 +79,13 @@
-
No Data Available
- - -
- - diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index 790b2ac3..15dd47c8 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -72,6 +72,7 @@ export class HomeComponent implements OnInit { public totalMR = 0; public showChart = false; + public isPostNoLoad = true; public options = { cutoutPercentage: 80, tooltips: { enabled: false }, @@ -165,6 +166,7 @@ export class HomeComponent implements OnInit { } ngOnInit() { + this.common.startLoading(); this.openNotificationsDashboard(); } @@ -175,7 +177,7 @@ export class HomeComponent implements OnInit { } openNotificationsDashboard() { - this.DS.getOpenNotifications().subscribe((result: GetOpenNotificationsResponse) => { + this.DS.getOpenNotifications('', '', this.isPostNoLoad).subscribe((result: GetOpenNotificationsResponse) => { if (this.common.validResponse(result)) { this.worklistNotifications = result; this.totalRequestCount = this.worklistNotifications.P_OPEN_NTF_NUMBER; @@ -256,6 +258,7 @@ export class HomeComponent implements OnInit { modal.onDidDismiss().then(result => { if (result.data) { if (result.data.notificationType !== '' || result.data.selectedValue !== '' || result.data.itemType !== '') { + this.common.startLoading(); this.showSearchButton = true; this.itemType = result.data.itemType; this.notificationType = result.data.notificationType; @@ -273,6 +276,7 @@ export class HomeComponent implements OnInit { if (this.itemType !== '') { this.disableFilters(); } + this.isPostNoLoad = false; this.getAllPushNotificationFun(); } } @@ -296,7 +300,7 @@ export class HomeComponent implements OnInit { this.WorkListObj.P_SEARCH_SENT_DATE = ''; this.WorkListObj.P_SEARCH_SUBJECT = ''; } - this.WorklistService.getWorkList(this.WorkListObj).subscribe((result) => { + this.WorklistService.getWorkList(this.WorkListObj, '', '', this.isPostNoLoad).subscribe((result) => { if (this.common.validResponse(result)) { this.handleWorkListResult(result.GetWorkList); } @@ -412,6 +416,7 @@ export class HomeComponent implements OnInit { this.showFormattedData = this.sortArray(categorizedWorkListResponse); this.allFormattedData = this.showFormattedData; this.common.sharedService.setSharedData(this.newWorkListResponse, HomeComponent.NOTIFICATION_ARR); + this.common.stopLoading(); } else { this.newWorkListResponse = []; } @@ -449,8 +454,10 @@ export class HomeComponent implements OnInit { } clearSearch() { + this.common.startLoading(); this.itemType = ''; this.selectedFilter = 'ALL'; + this.isPostNoLoad = true; this.disableFilters(); this.resetData(); this.getAllPushNotificationFun(); @@ -471,7 +478,7 @@ export class HomeComponent implements OnInit { } Count() { - this.workListService.getITGCount() + this.workListService.getITGCount('', '', this.isPostNoLoad) .subscribe((result: any) => { for (let i = 0; i < result.RequestType.length; i++) { this.ITGSegment[i] = { @@ -486,7 +493,7 @@ export class HomeComponent implements OnInit { } Details() { - this.workListService.getITGDetails() + this.workListService.getITGDetails('', '', this.isPostNoLoad) .subscribe((result: any) => { this.ITGCount = result.TotalCount; this.totalRequestCount = this.totalRequestCount + result.TotalCount; diff --git a/Mohem/src/app/notification/service/work-list.main.service.ts b/Mohem/src/app/notification/service/work-list.main.service.ts index 720f5c1e..55721b2a 100644 --- a/Mohem/src/app/notification/service/work-list.main.service.ts +++ b/Mohem/src/app/notification/service/work-list.main.service.ts @@ -240,19 +240,27 @@ export class WorklistMainService { ); } - public getITGCount( onError?: any, errorLabel?: string): Observable { - const request = new Request; - console.log(request) + public getITGCount( onError?: any, errorLabel?: string, isPostNoLoad = false): Observable { + const request = new Request(); this.authService.authenticateRequest(request); - return this.api.post( - WorklistMainService.getITGFormTaskCount, - request, - onError, - errorLabel - ); + if (isPostNoLoad) { + return this.api.postNoLoad( + WorklistMainService.getITGFormTaskCount, + request, + onError, + errorLabel + ); + } else { + return this.api.post( + WorklistMainService.getITGFormTaskCount, + request, + onError, + errorLabel + ); + } } - public getITGFormDetails(request:itgRequest, onError?: any, errorLabel?: string): Observable { + public getITGFormDetails(request: itgRequest, onError?: any, errorLabel?: string): Observable { this.authService.authenticateRequest(request); request.EmployeeNumber = request.P_USER_NAME; console.log(request); @@ -266,16 +274,25 @@ export class WorklistMainService { - public getITGDetails( onError?: any, errorLabel?: string): Observable { - const request = new Request; - console.log(request) + public getITGDetails( onError?: any, errorLabel?: string, isPostNoLoad = false): Observable { + const request = new Request(); + console.log(request); this.authService.authenticateRequest(request); - return this.api.post( - WorklistMainService.getITGFormTaskDetails, - request, - onError, - errorLabel - ); + if (isPostNoLoad) { + return this.api.postNoLoad( + WorklistMainService.getITGFormTaskDetails, + request, + onError, + errorLabel + ); + } else { + return this.api.post( + WorklistMainService.getITGFormTaskDetails, + request, + onError, + errorLabel + ); + } } diff --git a/Mohem/src/app/notification/service/worklist.service.ts b/Mohem/src/app/notification/service/worklist.service.ts index 6dce8f24..2c719e86 100644 --- a/Mohem/src/app/notification/service/worklist.service.ts +++ b/Mohem/src/app/notification/service/worklist.service.ts @@ -22,10 +22,14 @@ export class WorklistService { ) { } - public getWorkList(WorkListReq: any, onError?: any, errorLabel?: string): Observable { + public getWorkList(WorkListReq: any, onError?: any, errorLabel?: string, isPostNoLoad = false): Observable { const request = WorkListReq; this.authService.authenticateRequest(request); - return this.api.post(WorklistService.getWorkList, request, onError, errorLabel); + if (isPostNoLoad) { + return this.api.postNoLoad(WorklistService.getWorkList, request, onError, errorLabel); + } else { + return this.api.post(WorklistService.getWorkList, request, onError, errorLabel); + } } public getReplacmentEmployeeList(ReplacmentEmployeeRequest: any, onError?: any, errorLabel?: string): Observable { diff --git a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html index e0b313d3..9319d83d 100644 --- a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html +++ b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html @@ -7,8 +7,8 @@
- {{ts.trPK('worklist','view')}} - {{ts.trPK('worklist','view')}} + {{ts.trPK('worklist','openNot')}} {{ts.trPK('worklist','fyi')}} @@ -19,8 +19,8 @@ - {{ts.trPK('worklist','searchby')}} - {{ts.trPK('worklist','searchby')}} + {{ts.trPK('worklist','from')}} {{ts.trPK('worklist','subject')}} @@ -32,7 +32,7 @@
- {{ts.trPK('worklist','sent')}} + {{ts.trPK('worklist','sent')}} @@ -46,8 +46,8 @@
- Item Type - Item Type + HR PO diff --git a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.scss b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.scss index 36f26405..f842613c 100644 --- a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.scss +++ b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.scss @@ -18,7 +18,7 @@ .search-container { margin-right: 15px; margin-left: 15px; - padding-bottom: 100px; + // padding-bottom: 100px; margin-top: 5px; ion-item{ border: 2px solid #eaeaea; @@ -37,4 +37,10 @@ span{ color: white; } +} +.custom-width{ + max-width: 100% !important; +} +.enable-overflow{ + overflow: visible !important; } \ No newline at end of file From bca40eef6d8e892a4c3a5e8011be4ff97d123fc1 Mon Sep 17 00:00:00 2001 From: Mohamed Mekawy Date: Mon, 9 Mar 2020 17:21:05 +0300 Subject: [PATCH 16/17] edit add icon --- Mohem/package.json | 2 +- Mohem/src/app/absence/home/home.component.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Mohem/package.json b/Mohem/package.json index 939b044a..883fac4e 100755 --- a/Mohem/package.json +++ b/Mohem/package.json @@ -202,4 +202,4 @@ "android" ] } -} +} \ No newline at end of file diff --git a/Mohem/src/app/absence/home/home.component.scss b/Mohem/src/app/absence/home/home.component.scss index 4f9588c4..49b358e9 100644 --- a/Mohem/src/app/absence/home/home.component.scss +++ b/Mohem/src/app/absence/home/home.component.scss @@ -15,7 +15,7 @@ right: 8%; position: fixed; color: white; - bottom: 10%; + bottom: 5%; border-radius: 50%; z-index: 999; -webkit-box-shadow: 2px -1px 13px 0px rgba(0,0,0,0.59); From 04e35853a50ac183cee9c066ed79ed977e99d0f0 Mon Sep 17 00:00:00 2001 From: Mohamed Mekawy Date: Mon, 9 Mar 2020 17:39:42 +0300 Subject: [PATCH 17/17] edit addClass --- Mohem/src/app/eit/eit-list/eit-list.component.html | 2 +- Mohem/src/app/eit/eit-list/eit-list.component.scss | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) 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 d30d86ac..ddf3476d 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.html +++ b/Mohem/src/app/eit/eit-list/eit-list.component.html @@ -7,7 +7,7 @@ -
+
diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.scss b/Mohem/src/app/eit/eit-list/eit-list.component.scss index 446a1c0a..2dfdf5be 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.scss +++ b/Mohem/src/app/eit/eit-list/eit-list.component.scss @@ -76,6 +76,17 @@ h4 { box-shadow: 2px -1px 13px 0px rgba(0,0,0,0.59); } +.contentEit:before { + position: absolute; +content: ""; +// background: #22c6b3; +height: 140px; +width: 100%; +left: 0; +top: 0px; +z-index: 1; +} + .hrClass{ border-width: 0; box-sizing: content-box;