merge all branches

umar-issues
Mohamed Mekawy 6 years ago
commit 73099ddcc9

@ -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 class="gridDiv" 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>

@ -27,6 +27,7 @@ import { KeyboardStatusModel } from 'src/app/hmg-common/services/keyboard/keyboa
export class LoginComponent implements OnInit, OnDestroy { export class LoginComponent implements OnInit, OnDestroy {
deviceToken1: any; deviceToken1: any;
constructor( constructor(
public cs: CommonService, public cs: CommonService,
public authService: AuthenticationService, public authService: AuthenticationService,
@ -44,6 +45,7 @@ export class LoginComponent implements OnInit, OnDestroy {
public pushService: PushService, public pushService: PushService,
public keyboardService: KeyboardService public keyboardService: KeyboardService
) { ) {
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

@ -1,10 +1,9 @@
<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">

@ -88,4 +88,6 @@
<!-- <div class="fixed-shift-timer" [ngClass]=" direction === 'en' ? 'fixed-shift-time-en' : 'fixed-shift-time-ar'" *ngIf="isCheckedIn === false"> <!-- <div class="fixed-shift-timer" [ngClass]=" direction === 'en' ? 'fixed-shift-time-en' : 'fixed-shift-time-ar'" *ngIf="isCheckedIn === false">
<fab-button (trigger)="getDeviceLocation()"></fab-button> <fab-button (trigger)="getDeviceLocation()"></fab-button>
<page-trailer [small] = "true"></page-trailer> <page-trailer [small] = "true"></page-trailer>
<<<<<<< HEAD
</div> --> </div> -->

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

@ -2573,7 +2573,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",
@ -2597,15 +2597,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