Merge branch 'arabic-version' of https://hmg.git.cloudforge.com/mohemmionic5 into arabic-version

arabic-version^2
Fatimah.Alshammari 6 years ago
commit d2843a8a86

@ -202,4 +202,4 @@
"android"
]
}
}
}

@ -12,15 +12,19 @@
</div>
<div style="border-bottom: rgb(190, 186, 186) solid 1px;" >
<div *ngIf='direction==="ltr"' style="border-bottom: rgb(190, 186, 186) solid 1px;" >
<img class="mohemmLogo" src="../assets/imgs/menu_mohemm_logo.png" ></div>
<hr>
<div *ngIf='direction ==="rtl"' style="border-bottom: rgb(190, 186, 186) solid 1px;" >
<img class="mohemmLogo-ar" src="../assets/imgs/menu_mohemm_logo.png" ></div>
<hr>
</div>
<div class="centerDiv homeBox" (click)="openPersonalInfo()">
<div class="profileDiv">
<div [ngClass]="direction==='ltr'? 'profileDiv':'profileDiv-ar'">
<!-- <ion-img class="profileImg" src="{{user_image}}"></ion-img> -->
<img class="profileImg" [src]="user_image">
<p class="TxtPlace">{{User_name_Emp}}</p>
@ -62,7 +66,7 @@
</div> -->
<div style="border-bottom: rgb(190, 187, 187) solid 1px;" >
<button class="logout" ion-button (click)="logout();" > {{ts.trPK('home','logout')}}</button>
<button [ngClass]="direction ==='ltr'? 'logout':'logout-ar'" ion-button (click)="logout();" > {{ts.trPK('home','logout')}}</button>
</div>

@ -17,6 +17,16 @@ header
margin-top: -24px !important;
margin-bottom: 11px;
}
.mohemmLogo-ar{
max-width: 46% !important;
border: 0 !important;
margin-right: 70px !important;
margin-top: -24px !important;
margin-bottom: 11px;
}
.closeIcon{
height: 10px !important;
@ -84,6 +94,22 @@ padding: 6px 24px;
}
.logout-ar{
background-color: #22C6B3;
border: none;
color: white;
text-align: center;
text-decoration: none;
display: inline-block;
font-size: 12px;
margin-right: 95px !important;
margin-top: 15px !important;
margin-bottom: 20px !important;
border-radius: 30px;
height: 26px;
padding: 6px 24px;
}
.menuImg{
width: 105px !important;
height: 105px !important;

@ -1,7 +1,7 @@
<ion-header>
<ion-toolbar class="header-toolbar-new">
<ion-buttons slot="start">
<ion-back-button color="light" class="btnBack" defaultHref="/home"></ion-back-button>
<nav-buttons [enableMenu]="false" [enableBack]="true" [navigate]="true"></nav-buttons>
</ion-buttons>
<ion-title color="light" > {{'changePassword,changePassword' | translate}}</ion-title>
</ion-toolbar>

@ -2,8 +2,10 @@
<ion-toolbar class="header-toolbar-new">
<nav-buttons [enableMenu]="true" [enableBack]="false" [navigate]="false"></nav-buttons>
<ion-title>{{'home,dashboard' | translate}}</ion-title>
<div class="profile-image-container" (click)="openProfilePage()">
<img [src]="userImage"/>
<div slot = "start" class="profile-image-container" (click)="openProfilePage()">
</div>
<div slot="end">
<img class="profile-image" [src]="userImage"/>
</div>
</ion-toolbar>
</ion-header>

@ -9,14 +9,22 @@ ion-row {
.profile-image-container{
position: relative;
z-index: 999;
img {
width: 32px;
float: right;
margin-top: -42px;
border-radius: 20px;
height: 32px;
margin-right: 4px;
}
// img {
// width: 32px;
// float: right;
// // margin-top: -42px;
// border-radius: 20px;
// height: 32px;
// // margin-right: 4px;
// }
}
.profile-image{
width: 32px;
float: right;
// margin-top: -42px;
border-radius: 20px;
height: 32px;
// margin-right: 4px;
}
ion-title{
color: white;

@ -140,6 +140,7 @@ export class HomePage implements OnInit {
vacationRuleTitle: string;
public myTeamIcon: string;
public vacationRuleIcon: string;
direction: string;
constructor(
public ts: TranslatorService,
@ -176,6 +177,7 @@ export class HomePage implements OnInit {
}
ngOnInit() {
this.direction = TranslatorService.getCurrentLanguageName();
// this.getUserDetails();
// this.getCount();
// this.events.subscribe('getNotCount', badge => {
@ -648,7 +650,7 @@ getSubordinatesAttStatus() {
}
openPage(subMenu) {
console.log("openPage");
console.log(subMenu);
let selMenu: MenuResponse = new MenuResponse();
selMenu = this.common.sharedService.getSharedData(
MenuResponse.SHARED_DATA,

@ -411,6 +411,7 @@ export class HomeComponent implements OnInit {
if(this.ITGSegment.length != 0 ){
this.setActive(this.ITGSegment[0].code);
}
console.log(this.ITGSegment);
});
}

@ -91,7 +91,7 @@
[value]="gaugeValue"
[label]="gaugeLabel">
</ngx-gauge> -->
<div class="result-graph">
<div [ngClass]="direction == 'en'? 'result-graph':'result-graph-ar'">
<!-- <div class="request-heading">
@ -99,7 +99,7 @@
</div> -->
<div class="result-text-container">
<div [ngClass]="direction == 'en'? 'result-text-container':'result-text-container-ar'">
<h2>{{GetSummaryOfPaymentList.TOTAL_PAY_AMOUNT}}</h2>
@ -141,9 +141,9 @@
<!-- <p>Summary of Payment</p> -->
<div class="hrTitle"> {{ts.trPK('payslip','summary-payment')}} </div>
<div *ngIf="GetSummaryOfPaymentList !=''">
<div *ngIf="GetSummaryOfPaymentList !=''">
<div class="hrTitle"> {{ts.trPK('payslip','summary-payment')}} </div>
<ion-grid class="grids">
<ion-row class="bgcolor">
<ion-col class="colPayslip">
@ -204,8 +204,8 @@
</ion-grid>
</div>
<div class="hrTitle"> {{ts.trPK('payslip','earnings')}} </div>
<div *ngIf="GetEarningsList !=''">
<div class="hrTitle"> {{ts.trPK('payslip','earnings')}} </div>
<ion-grid class="grids">
<ion-row class="bgcolor">
<ion-col class="colPayslip">
@ -227,8 +227,8 @@
</ion-grid>
</div>
<div class="hrTitle"> {{ts.trPK('payslip','deductions')}} </div>
<div *ngIf="GetDeductionsList !=''">
<div class="hrTitle"> {{ts.trPK('payslip','deductions')}} </div>
<ion-grid class="grids">
<ion-row class="bgcolor">
<ion-col class="colPayslip">
@ -258,8 +258,8 @@
</ion-select>
</ion-item> -->
<div *ngIf="GetPaymentInformationList !=''">
<div class="hrTitle"> {{ts.trPK('payslip','payment-information')}} </div>
<div *ngIf="GetPaymentInformationList !=''">
<ion-grid class="grids" >
<ion-row class="rowtables">
<ion-col class="colPayslips">

@ -155,6 +155,12 @@
margin-left: -48px;
margin-right: 3px;
}
.result-graph-ar{
font-size: 14px;
margin-right: -48px;
margin-left: 3px;
}
.headerGrid{
background-color: white !important;
border: 1px solid #cac8c8 !important;
@ -168,6 +174,37 @@
padding-right: 21px;
}
.result-text-container-ar {
padding: 0;
margin: 0;
position: absolute;
left: 54%;
top: 50%;
display: block;
text-align: center;
transform: translate(-50%, -50%);
h2 {
font-size: 25px;
font-family: WorkSans-Bold;
margin: 0 auto;
line-height: 36px;
}
span {
width: 125px;
display: block;
margin: 0 auto;
font-size: 15px;
font-family: workSans-Regular;
}
}
.result-text-container {
padding: 0;
margin: 0;

@ -58,6 +58,7 @@ export class HomeComponent implements OnInit {
tooltips: { enabled: false },
legend: { display: false }};
gaugeType = "full";
direction: string;
// gaugeValue = 11.200;
// gaugeLabel = "";
@ -77,6 +78,7 @@ export class HomeComponent implements OnInit {
ngOnInit() {
this.direction = TranslatorService.getCurrentLanguageName()
// this.selEmp = this.common.sharedService.getSharedData(
// MenuResponse.SHARED_SEL_EMP,
// false

@ -1,7 +1,7 @@
<ion-content class="colorBG">
<div class="header-div">
<ion-buttons slot="start">
<ion-back-button color="light" class="btnBack" defaultHref="/home"></ion-back-button>
<nav-buttons [enableMenu]="false" [enableBack]="true" [navigate]="true"></nav-buttons>
</ion-buttons>
<p class="proTitles">{{ts.trPK('userProfile','title')}}</p>

@ -42,6 +42,9 @@ ion-label{
.profileDiv{
margin: 5px auto !important;
}
.profileDiv-ar{
margin: 16px auto !important;
}
.full-modal{
--height:100%;
--width:100%;

Loading…
Cancel
Save