From 3740606bd22551413c249e32c47eb7191e0a8e13 Mon Sep 17 00:00:00 2001 From: enadhilal Date: Wed, 26 Feb 2020 17:54:45 +0300 Subject: [PATCH] add translate and fix design in Home, worklist, myLeave and Ticket Request --- .../absence-confirm.component.html | 2 +- .../absence-confirm.component.ts | 3 +- .../submit-absence-modal.component.html | 8 ++-- .../confirm-add-eit.component.html | 2 +- .../confirm-add-eit.component.ts | 2 + .../app/eit/eit-list/eit-list.component.html | 10 ++--- .../app/eit/eit-list/eit-list.component.scss | 39 ++++++++++++++++ .../app/eit/eit-list/eit-list.component.ts | 2 + Mohem/src/app/eit/home/home.component.html | 4 +- Mohem/src/app/eit/home/home.component.scss | 14 ++++++ Mohem/src/app/eit/home/home.component.ts | 2 + .../submit-eit-modal.component.html | 8 ++-- Mohem/src/app/home/home.page.ts | 10 ++--- .../app/notification/home/home.component.html | 8 ++-- .../app/notification/home/home.component.scss | 44 ++++++++++++++++++- .../app/notification/home/home.component.ts | 6 ++- .../work-list-main-itg.component.html | 2 +- .../work-list-main-itg.component.ts | 2 + .../worklist-main-mr.component.html | 2 +- .../worklist-main-mr.component.ts | 2 +- .../worklist-main-po.component.html | 2 +- .../worklist-main-po.component.ts | 2 + .../worklist-main-pr.component.html | 2 +- .../worklist-main-pr.component.ts | 3 +- .../worklist-main.component.html | 2 +- .../worklist-main/worklist-main.component.ts | 2 + Mohem/src/assets/localization/i18n.json | 33 ++++++++++++++ Mohem/src/theme/worklist.scss | 19 +++++++- 28 files changed, 198 insertions(+), 39 deletions(-) diff --git a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.html b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.html index d54f2c4e..2439bfae 100644 --- a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.html +++ b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.html @@ -109,7 +109,7 @@
-
+
--> -

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 @@
--> -
+
-
+