Merge branch 'master-newdesign' into umar-issues

mekawy-issues
umasoodch 6 years ago
commit c11ff4a409

@ -35,15 +35,7 @@
{{ts.trPK('userProfile','title')}} {{ts.trPK('userProfile','title')}}
</ion-label> </ion-label>
</ion-item> </ion-item>
<ion-item (click)="openChangePassword()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 25px !important;" src="../assets/imgs/lock_icon.png" item-left>
</ion-thumbnail>
<ion-label class="changepassword" >
{{ts.trPK('login','changepassword')}}
<ion-badge class="start-badge main-badge" slot="end" color="danger">{{notBadge}}</ion-badge>
</ion-label>
</ion-item>
<ion-item [hidden]="TeamFlag!='true'" (click)="openMyTeamPage()"> <ion-item [hidden]="TeamFlag!='true'" (click)="openMyTeamPage()">
<ion-thumbnail slot="start" class="menu-thumb"> <ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 14px !important;" src="../assets/imgs/my_team_icon.png" item-left> <img style= "height: 14px !important;" src="../assets/imgs/my_team_icon.png" item-left>
@ -52,6 +44,19 @@
{{ts.trPK('myTeam','myTeam-header')}} {{ts.trPK('myTeam','myTeam-header')}}
</ion-label> </ion-label>
</ion-item> </ion-item>
<!-- <ion-item (click)="openChangePassword()"> -->
<ion-item (click)="openChangePassword()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 25px !important;" src="../assets/imgs/lock_icon.png" item-left>
</ion-thumbnail>
<ion-label class="changepassword" >
{{ts.trPK('login','changepassword')}}
<ion-badge class="start-badge main-badge" slot="end" color="danger">{{notBadge}}</ion-badge>
</ion-label>
</ion-item>
</ion-list> </ion-list>
<div class="" style="text-align:center"> <div class="" style="text-align:center">

@ -46,7 +46,7 @@
[icon]="subMenu.ICON"> [icon]="subMenu.ICON">
</app-services-button> </app-services-button>
</ion-slide> </ion-slide>
<ion-slide *ngIf="i == 2"> <ion-slide *ngIf="i == 0">
<app-services-button <app-services-button
(click)="Vacation_Rule()" (click)="Vacation_Rule()"
[title]="vacationRuleTitle" [title]="vacationRuleTitle"

@ -115,7 +115,7 @@ export class HomePage implements OnInit {
accrualBalancesList: any; accrualBalancesList: any;
public countAllNotification = 0; public countAllNotification = 0;
myTeamTitle: string; myTeamTitle: string;
vacationRuleTitle: string; vacationRuleTitle: string = this.ts.trPK('vacation-rule', 'vacationRule');
public myTeamIcon: string; public myTeamIcon: string;
public vacationRuleIcon: string; public vacationRuleIcon: string;
direction: string; direction: string;

Loading…
Cancel
Save