fixed moe issues

MOE_MAIN
umasoodch 3 years ago
parent 31629cc830
commit fc0179e1eb

@ -50,7 +50,7 @@ ion-app[dir="rtl"] .titleBox {
font-weight: bold; font-weight: bold;
text-align: -webkit-auto; text-align: -webkit-auto;
display: block; display: block;
font-size: 14px !important; font-size: 15px !important;
} }
.iconFab { .iconFab {

@ -100,7 +100,7 @@ export class HomePage implements OnInit {
show: true, show: true,
}, },
{ {
title: this.ts.trPK('absenceList', 'my-request'), title: this.ts.trPK('eit', 'my-reports'),
statsValue: 0, statsValue: 0,
icon: 'assets/icon/new-design/ticket_balance.png', icon: 'assets/icon/new-design/ticket_balance.png',
link: '4', link: '4',
@ -830,7 +830,7 @@ export class HomePage implements OnInit {
let totalTicketsLeft = 0; let totalTicketsLeft = 0;
this.accrualBalancesList = result.GetAccrualBalancesList; this.accrualBalancesList = result.GetAccrualBalancesList;
for (const accrualBalance of 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.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(accrualBalance, 'leaveAccrualBalance');
this.common.sharedService.setSharedData(request, 'leaveAccrualBalanceDate'); this.common.sharedService.setSharedData(request, 'leaveAccrualBalanceDate');

@ -1,8 +1,8 @@
<ion-content> <ion-content>
<div class="search-header" (click)="dismissModal()"> <div class="search-header" [ngClass]=" direction === 'en' ? 'position-en' : 'position-ar'" (click)="dismissModal()">
<h2>{{ts.trPK('general','advanced-search')}}</h2> <h2>{{ts.trPK('general','advanced-search')}}</h2>
<ion-icon [ngClass]=" direction === 'en' ? '' : 'cancel-ar'" slot="icon-only" name="md-close"></ion-icon> <ion-icon [ngClass]=" direction === 'en' ? '' : 'cancel-ar'" slot="icon-only" name="md-close"></ion-icon>
</div> </div>
<div class="search-container"> <div class="search-container">

@ -14,11 +14,22 @@
display: inline-block; display: inline-block;
font-size: 23px; font-size: 23px;
position: absolute; position: absolute;
left: 15px;
top: 10px; top: 10px;
} }
} }
.position-en{
ion-icon {
right: 15px;
}
}
.position-ar {
ion-icon {
left: 15px !important;
}
}
.search-container { .search-container {
margin-right: 15px; margin-right: 15px;
margin-left: 15px; margin-left: 15px;

@ -1263,7 +1263,7 @@ $actionBtnSize: 36px;
.card-size-info-ar { .card-size-info-ar {
width: 90%; width: 90%;
right: 3%; right: 1%;
padding-right: 0px; padding-right: 0px;
margin-left: 0px; margin-left: 0px;
} }

@ -266,8 +266,8 @@
"ar": "لا توجد بيانات متاحة للمفضلة" "ar": "لا توجد بيانات متاحة للمفضلة"
}, },
"concurrent-report": { "concurrent-report": {
"en": "Concurrent Report", "en": "Reports",
"ar": "تقرير متزامن" "ar": "تقرير"
}, },
"update-contact": { "update-contact": {
"en": "Update contact information", "en": "Update contact information",
@ -2087,6 +2087,10 @@
"en": "My Requests", "en": "My Requests",
"ar": "طلباتي" "ar": "طلباتي"
}, },
"my-reports": {
"en": "My Reports",
"ar": "تقاريري"
},
"added": { "added": {
"en": "Added", "en": "Added",
"ar": "وأضاف" "ar": "وأضاف"

Loading…
Cancel
Save