From fc0179e1eb08f943adb5de1fb15d2b3a9976f6e5 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Wed, 31 Aug 2022 15:33:17 +0300 Subject: [PATCH] fixed moe issues --- .../ui/stats-button/stats-button.component.scss | 2 +- Mohem/src/app/home/home.page.ts | 4 ++-- .../worklist-advanced-search.component.html | 8 ++++---- .../worklist-advanced-search.component.scss | 13 ++++++++++++- Mohem/src/app/profile/home/home.component.scss | 2 +- Mohem/src/assets/localization/i18n.json | 8 ++++++-- 6 files changed, 26 insertions(+), 11 deletions(-) diff --git a/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss b/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss index f11d4d21..301515c1 100644 --- a/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss +++ b/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss @@ -50,7 +50,7 @@ ion-app[dir="rtl"] .titleBox { font-weight: bold; text-align: -webkit-auto; display: block; - font-size: 14px !important; + font-size: 15px !important; } .iconFab { diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index 580ed48c..487084ba 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -100,7 +100,7 @@ export class HomePage implements OnInit { show: true, }, { - title: this.ts.trPK('absenceList', 'my-request'), + title: this.ts.trPK('eit', 'my-reports'), statsValue: 0, icon: 'assets/icon/new-design/ticket_balance.png', link: '4', @@ -830,7 +830,7 @@ export class HomePage implements OnInit { let totalTicketsLeft = 0; this.accrualBalancesList = result.GetAccrualBalancesList; for (const accrualBalance of result.GetAccrualBalancesList) { - if (accrualBalance.ACCURAL_PLAN_NAME === 'Annual Vacation Accrual') { + if (accrualBalance.ACCURAL_PLAN_NAME === 'Annual Vacation Accrual' || accrualBalance.ACCURAL_PLAN_NAME == " خطة استحقاق الاجازة الاعتيادية") { this.statsButtons[1].statsValue = accrualBalance.ACCRUAL_NET_ENTITLEMENT === null ? 0 : Number(accrualBalance.ACCRUAL_NET_ENTITLEMENT.toFixed(2)); this.common.sharedService.setSharedData(accrualBalance, 'leaveAccrualBalance'); this.common.sharedService.setSharedData(request, 'leaveAccrualBalanceDate'); 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 5a840c1d..1d5540c9 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 @@ -1,8 +1,8 @@ -
-

{{ts.trPK('general','advanced-search')}}

- -
+
+

{{ts.trPK('general','advanced-search')}}

+ +
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 83db0e95..b0871071 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 @@ -14,11 +14,22 @@ display: inline-block; font-size: 23px; position: absolute; - left: 15px; top: 10px; } } +.position-en{ + ion-icon { + right: 15px; + } +} + +.position-ar { + ion-icon { + left: 15px !important; + } +} + .search-container { margin-right: 15px; margin-left: 15px; diff --git a/Mohem/src/app/profile/home/home.component.scss b/Mohem/src/app/profile/home/home.component.scss index 1ea38b01..c123d317 100644 --- a/Mohem/src/app/profile/home/home.component.scss +++ b/Mohem/src/app/profile/home/home.component.scss @@ -1263,7 +1263,7 @@ $actionBtnSize: 36px; .card-size-info-ar { width: 90%; - right: 3%; + right: 1%; padding-right: 0px; margin-left: 0px; } diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 511bd250..3a5bcb7d 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -266,8 +266,8 @@ "ar": "لا توجد بيانات متاحة للمفضلة" }, "concurrent-report": { - "en": "Concurrent Report", - "ar": "تقرير متزامن" + "en": "Reports", + "ar": "تقرير" }, "update-contact": { "en": "Update contact information", @@ -2087,6 +2087,10 @@ "en": "My Requests", "ar": "طلباتي" }, + "my-reports": { + "en": "My Reports", + "ar": "تقاريري" + }, "added": { "en": "Added", "ar": "وأضاف"