mekawy-issues
Fatimah.Alshammari 6 years ago
parent 35781357d3
commit 0a0c583053

@ -19,11 +19,11 @@
</ion-item>
<ion-item lines="none">
<ion-button class="filterBtn" button-type="clear" (click)="getreplacmentemployee()" item-end>
<ion-button [ngClass]="direction == 'en'? 'filterBtn':'filterBtn-ar'" button-type="clear" (click)="getreplacmentemployee()" item-end>
<ion-icon slot="icon-only" color="white" name="search"></ion-icon>
</ion-button>
<ion-input class="filterInput" [(ngModel)]="inputSearch" placeholder='{{"general, search" | translate}}'></ion-input>
<ion-input [ngClass]="direction == 'en'? 'filterInput':'filterInput-ar'" [(ngModel)]="inputSearch" placeholder='{{"general, search" | translate}}'></ion-input>
<!-- <button ion-button icon-only (click)="getreplacmentemployee()" clear type="button" item-end>
<ion-icon name="search"></ion-icon>

@ -80,13 +80,50 @@ button.item-button.button.button-md.button-clear.button-clear-md {
border: solid var(--gray) 1px;
border-radius: 21px;
padding-left: 10px !important;
}
}
.filterInput-ar{
// border: solid var(--gray) 1px;
// border-radius: 21px;
// padding-left: 10px !important;
border: solid var(--gray) 1px;
border-radius: 21px;
padding-left: 145px !important;
margin-left: 86px;
padding-right: 129px;
margin-right: -143px;
}
// {padding-left: unset;
// padding-right: unset;
// -webkit-padding-start: var(--padding-start);
// padding-inline-start: var(--padding-start);
// -webkit-padding-end: var(--padding-end);
// padding-inline-end: var(--padding-end);
// margin-left: -53x;
// margin-right: 37px;}
.filterBtn{
background: var(--newgreen);
--background: var (--newgreen);
border-radius: 50%;
height: 60px;
width: 60px;
}
.filterBtn-ar{
// background: var(--newgreen);
// --background: var (--newgreen);
// border-radius: 50%;
// height: 60px;
// width: 60px;
background: var(--newgreen);
--background: var (--newgreen);
border-radius: 50%;
height: 60px;
width: 60px;
margin-left: -181px;
margin-right: 269px;
}

@ -39,7 +39,7 @@ export class AbsenceReplacementListComponent implements OnInit {
getpassResAttr: any = [];
active: any;
demoeAttach:any=[];
public direction: string;
constructor(public worklistService: WorklistService, private cs: CommonService, private ts: TranslatorService, public workListMainService: WorklistMainService, public modalCtrl: ModalController) {
this.P_PAGE_NUM = 1;
this.P_PAGE_LIMIT = 50;
@ -52,7 +52,7 @@ export class AbsenceReplacementListComponent implements OnInit {
// }
this.WorkListReplacmentEmployeeObj.P_PAGE_NUM = this.P_PAGE_NUM;
this.WorkListReplacmentEmployeeObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT;
this.direction = TranslatorService.getCurrentLanguageName();
// this.WorkListActionObj = new WorkListActionRequest();
// this.WorkListActionObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID;//26919060;
// this.WorkListActionObj.P_FORWARD_TO_USER_NAME = "";

@ -138,14 +138,21 @@
margin-left: -70px !important;
}
.today-graph-ar{
display: block !important;
height: 196px;
width: 385px;
padding-left: 51px;
// display: block !important;
// height: 196px;
// width: 385px;
// padding-left: 51px;
/* margin-left: -70px !important; */
// font-size: 14px;
// margin-left: -48px;
// margin-right: 63px;
// margin-bottom: -30px;
display: block !important;
height: 175px;
width: 320px;
padding-left: 51px;
font-size: 14px;
margin-left: -48px;
margin-right: 63px;
margin-right: 116px;
margin-bottom: -30px;
}
@ -201,9 +208,9 @@ margin-top: -13px;
}
.green-amount{
font-size: 17px;
font-size: 15px;
font-family: WorkSans-Bold;
margin-top: -3px;
margin-top: 0px;
}
.red-label{
@ -212,9 +219,9 @@ margin-top: -13px;
}
.red-amount{
font-size: 17px;
font-size: 15px;
font-family: WorkSans-Bold;
margin-top: -3px;
margin-top: 0px;
}
.orng-label{
@ -223,9 +230,9 @@ margin-top: -13px;
}
.orng-amount{
font-size: 17px;
font-size: 15px;
font-family: WorkSans-Bold;
margin-top: -3px;
margin-top: 0px;
}
.contentEit:before {
position: absolute;
@ -243,7 +250,7 @@ margin-top: -13px;
bottom: 128px;
color: black;
background-color: #1FA269;
width: 13%;
width: 11%;
height: 6px;
}
.div-green-ar{
@ -251,7 +258,7 @@ margin-top: -13px;
bottom: 59px;
color: black;
background-color: #1FA269;
width: 13%;
width: 11%;
height: 6px;
right: 9px;
@ -261,11 +268,9 @@ margin-top: -13px;
bottom: 131px;
color: black;
background-color: #CB3232;
// background-color: #094875;
// background-color: #DDB017;
width: 13%;
width: 11%;
height: 6px;
right: 78px;
right: 102px;
}
.div-red{
position: relative;
@ -274,7 +279,7 @@ margin-top: -13px;
color: black;
background-color: #CB3232;
// background-color: #094875;
width: 13%;
width: 11%;
height: 6px;
}
@ -285,7 +290,7 @@ margin-top: -13px;
color: black;
// background-color: #CB3232;
background-color: #DDB017;
width: 13%;
width: 11%;
height: 6px;
}
.div-orng-ar{
@ -294,7 +299,7 @@ margin-top: -13px;
color: black;
// background-color: #CB3232;
background-color: #DDB017;
width: 13%;
width: 11%;
height: 6px;
right: 10px;
}

@ -3,7 +3,7 @@
<ion-buttons slot="start">
<nav-buttons (backClick)="goback()" [navigate]="false"></nav-buttons>
</ion-buttons>
<ion-title>EMPLOYEE DETAIL</ion-title>
<ion-title>{{ts.trPK('userProfile','emp-detail')}}</ion-title>
</ion-toolbar>
</ion-header>
@ -26,7 +26,7 @@
<a [ngClass]="employee.EMPLOYEE_MOBILE_NUMBER == '' ? 'disable-phone action-button-icon' : 'action-button-icon'" href="tel:{{employee.EMPLOYEE_MOBILE_NUMBER}}">
<img src="../assets/imgs/call_icon.png">
</a>
<span>Call</span>
<span>{{ts.trPK('vacation-rule','call')}}</span>
</div>
</ion-col>
<ion-col [size]="4" (click)="getMenuEntries(employee)">
@ -34,7 +34,7 @@
<span class="action-button-icon">
<img src="../assets/imgs/create_request_icon.png">
</span>
<span>Create Request</span>
<span>{{ts.trPK('vacation-rule','create-request')}}</span>
</div>
</ion-col>
<ion-col [size]="4" style="opacity:0.3;">
@ -42,7 +42,7 @@
<span class="action-button-icon">
<img src="../assets/imgs/message_icon.png">
</span>
<span>Message</span>
<span>{{ts.trPK('vacation-rule','message-label')}}</span>
</div>
</ion-col>
</ion-row>
@ -56,17 +56,17 @@
<ion-segment-button
value="Attendance"
[ngClass]="activeSegment == 'Attendance' ? 'active-Segment' : 'normal-Segment'" >
<ion-label>Attendance</ion-label>
<ion-label>{{ts.trPK('attendance','attendance')}}</ion-label>
</ion-segment-button>
<ion-segment-button
value="Team Members"
[ngClass]="activeSegment == 'Team Members' ? 'active-Segment' : 'normal-Segment'">
<ion-label>Team Members</ion-label>
<ion-label>{{ts.trPK('myTeam','team-members')}}</ion-label>
</ion-segment-button>
<ion-segment-button
value="About"
[ngClass]="activeSegment == 'About' ? 'active-Segment' : 'normal-Segment'">
<ion-label>About</ion-label>
<ion-label> {{ts.trPK('general','about')}}</ion-label>
</ion-segment-button>
</ion-segment>
</div>
@ -207,7 +207,7 @@
<div *ngIf="isSearch">
<ion-row class="search-container">
<ion-col style="float: left;" size=[6] (click)="clearSearchTwo()">
<span style="margin-left: 5px;">Clear Search</span>
<span style="margin-left: 5px;">{{ts.trPK('work-list','clear-search')}}</span>
<ion-icon name="close" ></ion-icon>
</ion-col>
</ion-row>
@ -231,43 +231,43 @@
<div class="employee-information-indetail" *ngIf="activeSegment === 'About'">
<ion-row>
<ion-col [size]="6" style="border-right: 1px solid #ccc;">
<h2>Employee ID</h2>
<h2>{{ts.trPK('userProfile','empNo')}}</h2>
<p>{{employee.EMPLOYEE_NUMBER}}</p>
</ion-col>
<ion-col [size]="6">
<h2>Category</h2>
<h2>{{ts.trPK('userProfile','category')}}</h2>
<p>{{employee.EMPLOYMENT_CATEGORY_MEANING}}</p>
</ion-col>
<ion-col [size]="12">
<h2>Address</h2>
<h2>{{ts.trPK('userProfile','Address')}}</h2>
<p>{{employee.LOCATION_NAME}}</p>
</ion-col>
<ion-col [size]="12">
<h2>Phone Number</h2>
<h2>{{ts.trPK('userProfile','phone-no')}}</h2>
<p>{{employee.EMPLOYEE_MOBILE_NUMBER}}</p>
</ion-col>
<ion-col [size]="12">
<h2>Business Group</h2>
<h2>{{ts.trPK('userProfile','busG')}}</h2>
<p>{{employee.ORGANIZATION_NAME}}</p>
</ion-col>
<ion-col [size]="12">
<h2>Job</h2>
<h2>{{ts.trPK('userProfile','job')}}</h2>
<p>{{employee.JOB_NAME}}</p>
</ion-col>
<ion-col [size]="12">
<h2>Payroll</h2>
<h2>{{ts.trPK('userProfile','payrol')}}</h2>
<p>{{employee.PAYROLL_NAME}}</p>
</ion-col>
<ion-col [size]="12">
<h2>Organization Email Address</h2>
<h2>{{ts.trPK('userProfile','orgEmail')}}</h2>
<p>{{employee.EMPLOYEE_EMAIL_ADDRESS}}</p>
</ion-col>
<ion-col [size]="12">
<h2>Position</h2>
<h2>{{ts.trPK('userProfile','position')}}</h2>
<p>{{employee.POSITION_NAME}}</p>
</ion-col>
<ion-col [size]="12" style="border-bottom: none;">
<h2>Grade</h2>
<h2>{{ts.trPK('userProfile','grade')}}</h2>
<p>{{employee.GRADE_NAME}}</p>
</ion-col>
</ion-row>

@ -229,6 +229,16 @@ ion-title{
color: gray;
}
.activeArrow-ar{
height: 20px;
width: 20px;
color: #22c6b3;
}
.disabledArrow-ar{
height: 20px;
width: 20px;
color: gray;
}
.result-graph {
position: relative;
background: white;

@ -18,12 +18,13 @@
</ion-select>
</ion-item>
<ion-item lines="none">
<ion-button class="filterBtn" button-type="clear" (click)="getreplacmentemployee()" item-end>
<ion-button [ngClass]="direction == 'en'? 'filterBtn':'filterBtn-ar'" button-type="clear" (click)="getreplacmentemployee()" item-end>
<ion-icon slot="icon-only" color="white" name="search"></ion-icon>
</ion-button>
<ion-input class="filterInput" [(ngModel)]="inputSearch" placeholder='{{"general, search" | translate}}'></ion-input>
<ion-input [ngClass]="direction == 'en'? 'filterInput':'filterInput-ar'" [(ngModel)]="inputSearch" placeholder='{{"general, search" | translate}}'></ion-input>
<!-- <button ion-button icon-only (click)="getreplacmentemployee()" clear type="button" item-end>
<ion-icon name="search"></ion-icon>

@ -81,6 +81,18 @@ button.item-button.button.button-md.button-clear.button-clear-md {
border-radius: 21px;
padding-left: 10px !important;
}
.filterInput-ar{
// border: solid var(--gray) 1px;
// border-radius: 21px;
// padding-left: 10px !important;
border: solid var(--gray) 1px;
border-radius: 21px;
padding-left: 145px !important;
margin-left: 86px;
padding-right: 129px;
margin-right: -143px;
}
.filterBtn{
background: var(--newgreen);
--background: var (--newgreen);
@ -88,6 +100,20 @@ button.item-button.button.button-md.button-clear.button-clear-md {
height: 60px;
width: 60px;
}
.filterBtn-ar{
// background: var(--newgreen);
// --background: var (--newgreen);
// border-radius: 50%;
// height: 60px;
// width: 60px;
background: var(--newgreen);
--background: var (--newgreen);
border-radius: 50%;
height: 60px;
width: 60px;
margin-left: -181px;
margin-right: 269px;
}

@ -39,7 +39,7 @@ export class WorkListReplacementRollComponent implements OnInit {
active: any;
demoeAttach:any=[];
messageSuccess: boolean =false;
public direction: string;
constructor(public worklistService: WorklistService, private cs: CommonService, private ts: TranslatorService, public workListMainService: WorklistMainService, public modalCtrl: ModalController) {
this.P_PAGE_NUM = 1;
this.P_PAGE_LIMIT = 50;
@ -60,6 +60,7 @@ export class WorkListReplacementRollComponent implements OnInit {
this.WorkListActionObj.P_COMMENTS = "";
this.WorkListActionObj.RespondAttributeList =[];// this.getpassResAttr;
this.WorkListActionObj.P_APPROVER_INDEX = null;
this.direction = TranslatorService.getCurrentLanguageName();
}
ngOnInit() {

@ -24,10 +24,10 @@
</ion-item>
<ion-item lines="none">
<ion-button class="filterBtn" button-type="clear" button-type="clear" (click)="SearchReplacementList()">
<ion-button [ngClass]="direction == 'en'? 'filterBtn':'filterBtn-ar'" button-type="clear" button-type="clear" (click)="SearchReplacementList()">
<ion-icon slot="icon-only" color="white" name="search"></ion-icon>
</ion-button>
<ion-input class="filterInput" [(ngModel)]="searchKey" placeholder="{{'vacation-rule, search-employee' | translate}}"></ion-input>
<ion-input [ngClass]="direction == 'en'? 'filterInput':'filterInput-ar'" [(ngModel)]="searchKey" placeholder="{{'vacation-rule, search-employee' | translate}}"></ion-input>
</ion-item>

@ -108,6 +108,15 @@ button.item-button.button.button-md.button-clear.button-clear-md {
border-radius: 21px;
padding-left: 10px !important;
}
.filterInput-ar{
border: solid var(--gray) 1px;
border-radius: 21px;
padding-left: 100px !important;
margin-left: 86px;
padding-right: 129px;
margin-right: -139px;
}
.filterBtn{
background: var(--newgreen);
--background: var (--newgreen);
@ -116,7 +125,15 @@ button.item-button.button.button-md.button-clear.button-clear-md {
width: 60px;
}
.filterBtn-ar{
background: var(--newgreen);
--background: var (--newgreen);
border-radius: 50%;
height: 60px;
width: 60px;
margin-left: -167px;
margin-right: 247px;
}
*{
box-sizing: border-box;

@ -29,8 +29,11 @@ export class ReplacementListComponent implements OnInit {
isAbs: boolean = false;
isSave: boolean = false;
active: any;
constructor(public vacationRuleService: VacationRuleServiceService, public ts: TranslatorService, public cs: CommonService, public modalController: ModalController) { }
public direction: string;
constructor(public vacationRuleService: VacationRuleServiceService, public ts: TranslatorService, public cs: CommonService, public modalController: ModalController)
{
this.direction = TranslatorService.getCurrentLanguageName();
}
ngOnInit() { }

@ -1025,6 +1025,10 @@
"en": "Business Group",
"ar": "مجموعة العمل"
},
"phone-no": {
"en": "Phone Number",
"ar": "رقم الجوال"
},
"job": {
"en": "Job",
"ar": "الوظيفة"
@ -1033,6 +1037,10 @@
"en": "Location Name",
"ar": "اسم الموقع"
},
"emp-detail": {
"en": "Employee Detail",
"ar": "بيانات الموظف"
},
"address": {
"en": "Address",
"ar": "العنوان"
@ -1195,6 +1203,14 @@
"en": "Rule Information",
"ar": "معلومات القاعدة"
},
"create-request": {
"en": "Create Request",
"ar": "انشاء طلب"
},
"call": {
"en": "Call",
"ar": "مكالمه"
},
"deleteVR": {
"en": "Are you sure you want to delete this rule?",
"ar": "هل تريد فعلا حذف هذه القاعدة؟"
@ -1812,7 +1828,7 @@
},
"title":{
"en": "Replacement Roll",
"ar":"استبدال لفة"
"ar":"تفويض موظف"
},
"searchForReplacment":{
"en": "Search for an employee",

Loading…
Cancel
Save