mekawy-issues
Fatimah.Alshammari 6 years ago
parent 04a1007301
commit 694628bc5a

@ -1,10 +1,11 @@
<ion-header>
<ion-toolbar class="header-toolbar-new">
<nav-buttons></nav-buttons>
<ion-title color="light">{{headerTitle}}</ion-title>
<ion-title [ngClass]=" direction === 'en' ? 'title' : 'title-ar'" color="light">{{headerTitle}}</ion-title>
</ion-toolbar>
</ion-header>
<ion-content>
<!-------------------------------Start New design ---------------------------------------->
<ion-grid>

@ -229,7 +229,14 @@
.header-toolbar-new{
--background: #22c6b3;
}
.title{
margin-top: -37px;
margin-left: 85px;
}
.title-ar{
margin-top: -37px;
margin-right: 101px;
}
.confirmEitOkButton{
white-space: normal !important;
text-transform: capitalize !important;

@ -75,7 +75,8 @@ export class FileUploderProfileComponent implements OnInit {
async openFile() {
const actionSheet = await this.actionSheetCtrl.create({
header: 'Change Profile Photo',
// header: 'Change Profile Photo',
header: this.ts.trPK('userProfile', 'changeImg'),
buttons: [{
// text: 'Delete Current Image',
// role: 'destructive',
@ -85,7 +86,8 @@ export class FileUploderProfileComponent implements OnInit {
// this.deleteCurrent();
// }
// },{
text: 'Take Photo',
// text: 'Take Photo',
text: this.ts.trPK('general', 'takePhoto'),
icon: 'camera',
handler: () => {
console.log('Take Photo');
@ -94,7 +96,8 @@ export class FileUploderProfileComponent implements OnInit {
}
}, {
text: 'Choose from Library',
// text: 'Choose from Library',
text: this.ts.trPK('general', 'Choose-from-Library'),
icon: 'images',
handler: () => {
console.log('Favorite clicked');
@ -102,7 +105,8 @@ export class FileUploderProfileComponent implements OnInit {
}
}, {
text: 'Cancel',
// text: 'Cancel',
text: this.ts.trPK('general', 'cancel'),
icon: 'close',
role: 'cancel',
handler: () => {

@ -45,7 +45,7 @@
</ion-col>
<ion-col [size]="7" class="input-container" no-padding>
<ion-input *ngIf="showEmailInput" placeholder="Employee Email" [(ngModel)]="searchEmail" pattern="email"></ion-input>
<ion-input *ngIf="showUserNameOrNameInput" placeholder="Search" [(ngModel)]="searchNameOrUserName"></ion-input>
<ion-input *ngIf="showUserNameOrNameInput" placeholder ="{{ts.trPK('general','search')}}" [(ngModel)]="searchNameOrUserName"></ion-input>
</ion-col>
<ion-col [size]="2" style="background: #ccc;text-align: center;" no-padding (click)="searchEmployee()">
<ion-icon style="margin-top: 10px;font-size: 20px;" class="search-icons" color="light" name="search"></ion-icon>

@ -13,7 +13,7 @@ style="margin-right: -22px;margin-top: -10px;">
<ion-list>
<ion-radio-group>
<ion-list-header style="margin-bottom: 22px !important;">
<p class="Header">More Action</p>
<p class="Header"> {{ts.trPK('general','moreAction')}}</p>
</ion-list-header>
<div *ngFor="let button of actionBtns ">

@ -71,7 +71,7 @@
<div style="margin: 10px; " *ngIf="subordinatesleaveList != undefined && subordinatesleaveList?.length > 0">
Employee will also on leave </div>
{{ts.trPK('worklistMain','employee-on-leave')}} </div>
<ion-item lines="none" class="subOrdinateList" *ngFor="let List of subordinatesleaveList;">
@ -102,12 +102,12 @@
<ion-row class="subOrdinateRow">
<ion-col>
<label class="label" for="">From</label><br />
<label class="label" for=""> {{ts.trPK('worklistMain','from')}}</label><br />
<label class="label" for="">{{List.DATE_START |date}}</label>
</ion-col>
<ion-col>
<label class="label" for="">To</label><br />
<label class="label" for="">{{ts.trPK('worklistMain','to')}}</label><br />
<label class="label" for="">{{List.DATE_END | date}}</label>
</ion-col>
</ion-row>
@ -240,7 +240,7 @@
</ion-card-header> -->
<ion-card-content>
<div style="font-weight: bold;" class="hrTitle">Employee Detail</div>
<div style="font-weight: bold;" class="hrTitle"> {{'userProfile, emp-detail' | translate}}</div>
<div *ngFor="let submitterInfo of submitterInfoRes">
<ion-row class="rowBorder submitterInfo">

@ -3,6 +3,7 @@
<!-- <ion-buttons slot="start">
<ion-back-button color="light" class="btnBack" defaultHref="/home"></ion-back-button>
</ion-buttons> -->
<ion-title color="light" > {{ts.trPK('userProfile','changepicture')}}</ion-title>
<ion-buttons slot="start">
<nav-buttons></nav-buttons>

@ -41,13 +41,15 @@
</ion-item>
<ion-item class="requiredItem">
<ion-label class="label">{{'vacation-rule, start-date' | translate}}</ion-label>
<ion-datetime [(ngModel)]="Sdate" min="1900" max="2100" displayFormat="MM/DD/YYYY hh:mm:ss A"
placeholder="MM/DD/YYYY hh:mm:ss A" required></ion-datetime>
<ion-datetime [(ngModel)]="Sdate" min="1900" max="2100" displayFormat="MM/DD/YYYY hh:mm:ss A"
placeholder="MM/DD/YYYY hh:mm:ss A" required cancelText="{{ts.trPK('general','cancel')}}"
doneText="{{ts.trPK('general','done')}}"></ion-datetime>
</ion-item>
<ion-item class="requiredItem">
<ion-label class="label">{{'vacation-rule, end-date' | translate}}</ion-label>
<ion-datetime [(ngModel)]="Edate" min="1900" max="2100" displayFormat="MM/DD/YYYY hh:mm:ss A"
placeholder="MM/DD/YYYY hh:mm:ss A" required></ion-datetime>
<ion-datetime [(ngModel)]="Edate" min="1900" max="2100" displayFormat="MM/DD/YYYY hh:mm:ss A"
placeholder="MM/DD/YYYY hh:mm:ss A" required cancelText="{{ts.trPK('general','cancel')}}"
doneText="{{ts.trPK('general','done')}}"></ion-datetime>
</ion-item>
<ion-item lines="none" class="requiredItem">
<ion-label>{{'vacation-rule, message-label' | translate}}</ion-label>

@ -118,12 +118,14 @@
<ion-item class="requiredItem selectItem">
<ion-label class="label">{{'vacation-rule, start-date' | translate}}</ion-label>
<ion-datetime [(ngModel)]="Sdate" min="1900" max="2100" displayFormat="MM/DD/YYYY hh:mm:ss A"
placeholder="MM/DD/YYYY hh:mm:ss A" required></ion-datetime>
placeholder="MM/DD/YYYY hh:mm:ss A" required cancelText="{{ts.trPK('general','cancel')}}"
doneText="{{ts.trPK('general','done')}}"></ion-datetime>
</ion-item>
<ion-item class="requiredItem selectItem">
<ion-label class="label">{{'vacation-rule, end-date' | translate}}</ion-label>
<ion-datetime [(ngModel)]="Edate" min="1900" max="2100" displayFormat="MM/DD/YYYY hh:mm:ss A"
placeholder="MM/DD/YYYY hh:mm:ss A" required></ion-datetime>
placeholder="MM/DD/YYYY hh:mm:ss A" required cancelText="{{ts.trPK('general','cancel')}}"
doneText="{{ts.trPK('general','done')}}"></ion-datetime>
</ion-item>
<ion-item lines="none" class="requiredItem selectItem">
<ion-label>{{'vacation-rule, message-label' | translate}}</ion-label>

@ -249,10 +249,22 @@
"en": "Cancel",
"ar": "إلغاء"
},
"takePhoto": {
"en": "Take Photo",
"ar": "أخذ صورة"
},
"Choose-from-Library": {
"en": "Choose from Library",
"ar": " الإختيار من قائمة الصور"
},
"done": {
"en": "Done",
"ar": "تم"
},
"moreAction": {
"en": "More Action",
"ar": "المزيد"
},
"close": {
"en": "Close",
"ar": "إغلق"
@ -994,7 +1006,7 @@
},
"changepicture": {
"en": "Change Picture",
"ar": "تغيير الصوره"
"ar": "تغيير الصورة"
},
"empNo": {
"en": "Employee Number",
@ -1970,6 +1982,10 @@
"en": "Employee Information",
"ar": "معلومات الموظف"
},
"employee-on-leave": {
"en": "Employee will also on leave",
"ar": "الموظف سوف يكون في اجازة ايضا"
},
"info": {
"en": "Info",
"ar": "تفاصيل"

Loading…
Cancel
Save