fix issue

umar-issues^2
Fatimah.Alshammari 6 years ago
parent 370b9639af
commit 5a9c337dd6

@ -61,7 +61,7 @@
<div class="centerDiv signupDiv" *ngIf="isAppleStore==false"> <div class="centerDiv signupDiv" *ngIf="isAppleStore==false">
<a>{{ts.trPK('login','signup')}}</a> <a>{{ts.trPK('login','signup')}}</a>
</div> </div>
<div [ngClass]='direction == "rtl"? "gridDiv":"gridDiv-ar"' aria-disabled="true"> <div ng class="gridDiv" aria-disabled="true">
<button class="gridBtn" ion-button (click)="changeLanguage('2')" [ngClass]="{'active':currentLang ==2}">English</button> <button class="gridBtn" ion-button (click)="changeLanguage('2')" [ngClass]="{'active':currentLang ==2}">English</button>
<button class="gridBtn arTxt" ion-button (click)="changeLanguage('1')" [ngClass]="{'active':currentLang ==1}">عربي</button> <button class="gridBtn arTxt" ion-button (click)="changeLanguage('1')" [ngClass]="{'active':currentLang ==1}">عربي</button>
<!-- <button class="gridBtn" ion-button (click)="changeLanguage()" style="background: #dcdcdc !important;color: #ccc6c6 !important;margin: 1px;width: 49%">English</button> <!-- <button class="gridBtn" ion-button (click)="changeLanguage()" style="background: #dcdcdc !important;color: #ccc6c6 !important;margin: 1px;width: 49%">English</button>

@ -53,80 +53,16 @@ img.centerDiv {
// margin-bottom: 10px; // margin-bottom: 10px;
font-size: 14px; font-size: 14px;
// :root[dir="ltr"] { :root[dir="ltr"] {
padding-left: 16px; padding-left: 16px;
padding-right: 0; padding-right: 0;
// }
// :root[dir="rtl"] {
// padding-right: 16px;
// padding-left: 0;
// // margin-bottom: 5px;
// }
button {
font-family: var(--fontFamilyLightEN) !important;
min-width: auto;
ion-app[dir="ltr"] {
float: left;
border-radius: 2px 0px 0px 2px;
font-family: var(--fontFamilyBoldEN) !important;
color: var(--customnavy);
}
ion-app[dir="rtl"] {
float: right;
border-radius: 0px 2px 2px 0px;
color: var(--darkgray);
}
margin: 0px;
padding: 10px;
border: 1px solid var(--cusgray);
box-shadow: none;
-webkit-box-shadow:none;
-moz-box-shadow: none;
background: var(--light);
width: 50%;
} }
button.arTxt { :root[dir="rtl"] {
:root[dir="rtl"] {
float: right;
color: var(--customnavy) !important;
font-family: var(--fontFamilyIOSAR) !important;
font-weight: bold;
border-radius: 2px 0px 0px 2px !important;
}
:root[dir="ltr"] {
float: left;
color: var(--darkgray) !important;
font-family: var(--fontFamilyIOSAR) !important;
border-radius: 0px 2px 2px 0px !important;
}
}
}
.gridDiv-ar {
width: 100%;
height: 40px;
margin-top: 20px;
// margin-bottom: 10px;
font-size: 14px;
// :root[dir="ltr"] {
// padding-left: 16px;
// padding-right: 0;
// }
// :root[dir="rtl"] {
padding-right: 16px; padding-right: 16px;
padding-left: 0; padding-left: 0;
// margin-bottom: 5px; // margin-bottom: 5px;
// } }
button { button {
font-family: var(--fontFamilyLightEN) !important; font-family: var(--fontFamilyLightEN) !important;

@ -24,7 +24,7 @@ import { PushService } from 'src/app/hmg-common/services/push/push.service';
}) })
export class LoginComponent implements OnInit, OnDestroy { export class LoginComponent implements OnInit, OnDestroy {
deviceToken1: any; deviceToken1: any;
direction: string;
constructor( constructor(
public cs: CommonService, public cs: CommonService,
@ -42,7 +42,7 @@ export class LoginComponent implements OnInit, OnDestroy {
public plt: Platform, public plt: Platform,
public pushService: PushService public pushService: PushService
) { ) {
this.direction = TranslatorService.getCurrentLanguageName();
this.events.subscribe('logoutFlage', logoutFlage => { this.events.subscribe('logoutFlage', logoutFlage => {
console.log('login compont logoutFlage: ' + logoutFlage); console.log('login compont logoutFlage: ' + logoutFlage);
// tslint:disable-next-line: triple-equals // tslint:disable-next-line: triple-equals
@ -186,11 +186,6 @@ export class LoginComponent implements OnInit, OnDestroy {
this.currentLang = TranslatorService.getCurrentLanguageCode(); this.currentLang = TranslatorService.getCurrentLanguageCode();
} }
this.currentLang = langNumber; this.currentLang = langNumber;
if (TranslatorService.CURRENT_LANGUAGE == TranslatorService.EN){
this.direction = 'en';
} else {
this. direction = 'ar';
}
} }
public forgetPasswordPage() { public forgetPasswordPage() {
this.cs.openUserForgot(); this.cs.openUserForgot();

@ -1,13 +1,12 @@
<div feedback class="custom-button"> <div feedback class="custom-button">
<div class="iconBox"> <div class="iconBox">
<img *ngIf="title != 'My Team' && title != 'Vacation Rule' && title != 'فريقي' && title != 'قواعد الإجازات' " [src]="'data:image/png;base64,'+icon" class="icon"> <img *ngIf="title != 'My Team' && title != 'Vacation Rule' && title != 'فريقي' && title != 'الإنابة بالإجازات' " [src]="'data:image/png;base64,'+icon" class="icon">
<!-- <img *ngIf="title == 'My Team' || title == 'Vacation Rule'" [src]="icon" class="icon"> --> <!-- <img *ngIf="title == 'My Team' || title == 'Vacation Rule'" [src]="icon" class="icon"> -->
<img *ngIf="title == 'My Team' || title == 'فريقي' " [src]="myTeamIcon" class="icon"> <img *ngIf="title == 'My Team' || title == 'فريقي' " [src]="myTeamIcon" class="icon">
<img *ngIf="title == 'Vacation Rule' || title == 'قواعد الإجازات'" [src]="vacationRuleIcon" class="icon"> <img *ngIf="title == 'Vacation Rule' || title == 'الإنابة بالإجازات'" [src]="vacationRuleIcon" class="icon">
</div> </div>
<div class="titleBox"> <div class="titleBox">
<p class="pClass">{{title}}</p> <p class="pClass">{{title}}</p>
</div> </div>
</div> </div>

@ -86,3 +86,4 @@
<page-trailer [small] = "true"></page-trailer> <page-trailer [small] = "true"></page-trailer>
</div> </div>
</ion-content> </ion-content>

@ -102,6 +102,7 @@ export class TimeCardDetailsComponent implements OnInit {
this.selMenu = this.common.sharedService.getSharedData(MenuResponse.SHARED_DATA, false); this.selMenu = this.common.sharedService.getSharedData(MenuResponse.SHARED_DATA, false);
this.menuType = this.selMenu.List_Menu.MENU_TYPE; this.menuType = this.selMenu.List_Menu.MENU_TYPE;
dayAndHoursReqObj.P_SELECTED_EMPLOYEE_NUMBER = this.selEmp; dayAndHoursReqObj.P_SELECTED_EMPLOYEE_NUMBER = this.selEmp;
dayAndHoursReqObj.P_MENU_TYPE = this.menuType; dayAndHoursReqObj.P_MENU_TYPE = this.menuType;
dayAndHoursReqObj.P_SELECTED_RESP_ID = this.respID; dayAndHoursReqObj.P_SELECTED_RESP_ID = this.respID;

@ -959,7 +959,7 @@
}, },
"time-left": { "time-left": {
"en": "Time Left Today", "en": "Time Left Today",
"ar": "باقي الوقت لليوم" "ar": "الوقت المتبقي"
} }
}, },
"work-list": { "work-list": {
@ -1165,7 +1165,7 @@
"vacation-rule": { "vacation-rule": {
"vacationRule": { "vacationRule": {
"en": "Vacation Rule", "en": "Vacation Rule",
"ar": "قواعد الإجازات" "ar": "الإنابة بالإجازات"
}, },
"apply-for-vacation-rule": { "apply-for-vacation-rule": {
"en": "Apply for vacation Rule", "en": "Apply for vacation Rule",
@ -2534,7 +2534,7 @@
}, },
"today-time-left": { "today-time-left": {
"en": "TODAY'S TIME LEFT", "en": "TODAY'S TIME LEFT",
"ar": "TODAY'S TIME LEFT" "ar": "الوقت المتبقي"
}, },
"shortage-hours": { "shortage-hours": {
"en": "Shortage Hours", "en": "Shortage Hours",
@ -2558,15 +2558,15 @@
}, },
"confirm-alert1": { "confirm-alert1": {
"en": "Are you sure, you want to", "en": "Are you sure, you want to",
"ar": "Are you sure, you want to" "ar": "هل انت متأكد تريد لإنصراف من العمل؟"
}, },
"confirm-alert2": { "confirm-alert2": {
"en": " check out", "en": " check out",
"ar": " check out" "ar": ""
}, },
"confirm-alert3": { "confirm-alert3": {
"en": "You didn't complete today shift", "en": "You didn't complete today shift",
"ar": "You didn't complete today shift" "ar": "وقت العمل لم ينتهي بعد"
}, },
"shift-time": { "shift-time": {
"en": "Shift Time", "en": "Shift Time",

Loading…
Cancel
Save