master
Fatimah.Alshammari 6 years ago
parent 5d828cb1de
commit 4719af3b89

@ -10,7 +10,7 @@
<ion-grid>
<ion-row style="margin-top: 20px;margin-left: 12px;">
<ion-col>
<div size="10" class="approvalTitle">{{'general, addAttach' | translate}}</div>
<div size="10" [ngClass]=" direction === 'en' ? 'approvalTitle' : 'approvalTitle-ar'">{{'general, addAttach' | translate}}</div>
</ion-col>
<ion-col style="padding-left: 7%;" size="2">
<div class="fileDiv">
@ -86,7 +86,7 @@
<ion-grid class="">
<div class="approvalTitle">{{'confirmAddEit, comment' | translate}}</div>
<div [ngClass]=" direction === 'en' ? 'approvalTitle' : 'approvalTitle-ar'">{{'confirmAddEit, comment' | translate}}</div>
<ion-item class="submitNote" lines="none">
<!-- <ion-label position="floating" class="boldTxtNav">{{'confirmAddEit, comment' | translate}}</ion-label> -->
<ion-textarea type="text" [(ngModel)]="absComments"></ion-textarea>
@ -94,7 +94,7 @@
</ion-grid>
<ion-grid class="approvalList">
<div class="approvalTitle">{{'confirmAddEit, approverList' | translate}}</div>
<div [ngClass]=" direction === 'en' ? 'approvalTitle' : 'approvalTitle-ar'">{{'confirmAddEit, approverList' | translate}}</div>
<div class="noDataDiv" *ngIf="approversList.length == 0">
<p>{{ 'general, empty' | translate}}</p>
</div>

@ -270,4 +270,16 @@ ion-card-content.confirm-details{
width: 80% !important;
color: white!important;
border-radius: 16px !important;
}
.approvalTitle-ar{
font-weight: bold;
font-size: 16px;
text-align: right;
}
.approvalTitle{
font-weight: bold;
font-size: 16px;
text-align: left;
}

@ -89,9 +89,10 @@ button.item-button.button.button-md.button-clear.button-clear-md {
border: solid var(--gray) 1px;
border-radius: 21px;
// padding-left: 145px !important;
margin-left: 86px;
margin-left: 115px;
// padding-right: 129px;
margin-right: -143px;
// margin-right: -143px;
margin-right: -136px;
}
// {padding-left: unset;
// padding-right: unset;
@ -123,7 +124,7 @@ button.item-button.button.button-md.button-clear.button-clear-md {
height: 60px;
width: 60px;
margin-left: -181px;
margin-right: 269px;
margin-right: 259px;
}

@ -50,8 +50,11 @@
<div >
<!-- <ion-item> -->
<!-- <ion-label class="datelabel">{{request.P_EFFECTIVE_DATE}}</ion-label> -->
<ion-datetime [(ngModel)]="Sdate" class="datetime" displayFormat="DD MMMM YYYY" placeholder="DD MMMM YYYY"
(ionChange)="getAccrualBalance()"></ion-datetime>
<ion-datetime [(ngModel)]="Sdate" class="datetime" displayFormat="DD MMMM YYYY"
placeholder="DD MMMM YYYY" cancelText="{{ts.trPK('general','cancel')}}"
doneText="{{ts.trPK('general','done')}}" (ionChange)="getAccrualBalance()"></ion-datetime>
<!-- <ion-datetime [(ngModel)]="Sdate" class="datetime" displayFormat="DD MMMM YYYY"
placeholder="DD MMMM YYYY" (ionChange)="getAccrualBalance()"></ion-datetime> -->
<ion-icon class="iconCalendar" ios="ios-calendar" md="md-calendar"></ion-icon>
<!-- </ion-item> -->
</div>

@ -152,7 +152,7 @@
width: 320px;
padding-left: 51px;
font-size: 14px;
margin-right: 116px;
margin-right: 75px;
margin-bottom: -30px;
}
@ -258,44 +258,45 @@ margin-top: -13px;
width: 11%;
height: 6px;
}
.div-orng-ar{
position: relative;
bottom: 59px;
color: black;
background-color: #DDB017;
// background-color: #1FA269;
width: 11%;
height: 6px;
right: 9px;
}
.div-red-ar{
position: relative;
bottom: 131px;
color: black;
background-color: #CB3232;
width: 11%;
height: 6px;
right: 92px;
}
.div-red{
position: relative;
left: 59%;
bottom: 146px;
bottom: 59px;
color: black;
// background-color: #DDB017;
background-color: #CB3232;
// background-color: #094875;
width: 11%;
height: 6px;
right: 16px;
}
// .div-red-ar{
// position: relative;
// bottom: 131px;
// color: black;
// background-color: #CB3232;
// width: 11%;
// height: 6px;
// right: 92px;
// }
// .div-red{
// position: relative;
// left: 59%;
// bottom: 146px;
// color: black;
// background-color: #CB3232;
// // background-color: #094875;
// width: 11%;
// height: 6px;
// }
.div-orng{
.div-red{
position: relative;
left: 82%;
bottom: 80px;
color: black;
// background-color: #CB3232;
background-color: #DDB017;
background-color: #CB3232;
// background-color: #DDB017;
width: 11%;
height: 6px;
}
@ -307,5 +308,5 @@ margin-top: -13px;
background-color: #1FA269;
width: 11%;
height: 6px;
right: 10px;
right: 16px;
}

@ -114,7 +114,6 @@ export class HomeComponent implements OnInit {
data: [this.accrualNet,this.accrualUsed],
backgroundColor: [
'#1FA269',
'#DDB017',
'#CB3232',],
borderWidth: 2
}
@ -272,7 +271,6 @@ createAbsence() {
{ data: [this.accrualNet,this.accrualUsed],
backgroundColor: [
'#1FA269',
'#DDB017',
'#CB3232',],
borderWidth: 2
}

@ -15,7 +15,9 @@
<ion-item class='dynamicField'>
<ion-label position='floating' class="colBold requiredClass">{{ts.trPK('submitAbsence','startDate')}} </ion-label>
<ion-datetime (ionChange)="calcDay()" [(ngModel)]="startDate" min="1900" max="2100" displayFormat="MMM/DD/YYYY" placeholder="MM/DD/YYYY" required></ion-datetime>
<ion-datetime (ionChange)="calcDay()" [(ngModel)]="startDate" min="1900" max="2100" displayFormat="MMM/DD/YYYY" placeholder="MM/DD/YYYY" required
cancelText="{{ts.trPK('general','cancel')}}"
doneText="{{ts.trPK('general','done')}}"></ion-datetime>
</ion-item>
<ion-item *ngIf="hoursOrDay!='D'" class='dynamicField'>
<ion-label position='floating' class="colBold requiredClass">{{ts.trPK('submitAbsence','startTime')}} </ion-label>
@ -23,7 +25,9 @@
</ion-item>
<ion-item class='dynamicField'>
<ion-label position='floating' class="colBold requiredClass">{{ts.trPK('submitAbsence','endDate')}}</ion-label>
<ion-datetime (ionChange)="calcDay()" [(ngModel)]="endDate" min="1900" max="2100" displayFormat="MMM/DD/YYYY" placeholder="MM/DD/YYYY" required ></ion-datetime>
<ion-datetime (ionChange)="calcDay()" [(ngModel)]="endDate" min="1900" max="2100" displayFormat="MMM/DD/YYYY" placeholder="MM/DD/YYYY" required
cancelText="{{ts.trPK('general','cancel')}}"
doneText="{{ts.trPK('general','done')}}"></ion-datetime>
</ion-item>
<ion-item *ngIf="hoursOrDay!='D'" class='dynamicField'>

@ -15,7 +15,7 @@
<div class="centerDiv homeBox">
<div class="profileDiv">
<img class="profileImg" [src]="user_image">
<img class="profileImg" [src]="user_image">
<p class="TxtPlace">{{User_name_Emp}}</p>
<p class="TxtPlaces"> {{User_Job_name}}</p>
</div>
@ -26,7 +26,7 @@
</div>
<br>
<ion-list>
<ion-list class="list-en" >
<ion-item (click)="profile()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 24px !important;" src="../assets/imgs/profile_icon.png" item-left>
@ -58,13 +58,13 @@
</ion-item>
</ion-list>
<div class="" style="text-align:center">
<img src="{{companyUrl}}" class="CompanyImg logoImg">
<!-- <p class="companyTxt">{{companyDesc}}</p> -->
</div>
<div class="menuFooter">
<div> <img src="../assets/imgs/CS.png" class="CompanyImg"></div>
<div class="menuFooter" >
<div> <img src="../assets/imgs/CS.png" class="CompanyImg" ></div>
<p class="companyTxt">{{companyDesc}}</p>
</div>
</ion-content>
@ -95,7 +95,7 @@
</div>
<br>
<ion-list>
<ion-list class="list-ar" >
<ion-item (click)="profile()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 24px !important;" src="../assets/imgs/profile_icon.png" item-left>
@ -155,7 +155,7 @@
<!-- <p class="companyTxt">{{companyDesc}}</p> -->
</div>
<div class="menuFooter">
<div> <img src="../assets/imgs/CS.png" class="CompanyImg"></div>
<div> <img src="../assets/imgs/CS.png" class="CompanyImg" ></div>
<p class="companyTxt">{{companyDesc}}</p>
</div>
</ion-content>

@ -61,8 +61,7 @@ header
border-radius: 50% !important;
position: relative;
color: #7f8c8d;
}
.changeImgBtn{
@ -236,6 +235,38 @@ padding: 6px 24px;
margin-bottom: -28px;
}
.list-en{
margin-left: 0;
margin-right: 0;
margin-top: -19px;
margin-bottom: 0;
padding-left: 0;
padding-right: 0;
padding-top: 0px;
padding-bottom: 8px;
}
.list-ar{
margin-left: 0;
margin-right: 0;
margin-top: -19px;
margin-bottom: 0;
padding-left: 0;
padding-right: 0;
padding-top: 0px;
padding-bottom: 8px;
}
// .sidebar-menu .header-div {
// text-transform: capitalize;
// height: 100px;
// position: relative;
// display: block;
// margin-bottom: -28px;
// }
.list-md .item-block .item-inner,
.list-ios .item-block .item-inner {
border-color: var(--primary);
@ -279,6 +310,7 @@ button.menu-item.item.item-block.item-ios {
width: 100%;
}
.menuFooter div {
width: 80px;
// height: 80px;
@ -286,16 +318,28 @@ button.menu-item.item.item-block.item-ios {
}
.menuFooter .CompanyImg {
width: 100%;
height: 100%;
// .menuFooter .CompanyImg {
// width: 100%;
// height: 100%;
// }
.menuFooter .CompanyImg{
width: 80%;
height: 80%;
margin-bottom: -21px;
}
// .logoImg{
// width: 120px;
// position: relative;
// }
.logoImg{
width: 120px;
position: relative;
width: 77px;
position: relative;
margin-top: -1px;
}
.companyTxt {
font-size: 12px;
color: var(--customnavy);
@ -316,16 +360,31 @@ font-weight: bolder !important;
font-weight: bolder !important;
}
.profileDiv-ar{
margin: 5px auto !important;
}
.profileImg{
width: 160px;
height: 160px;
display: -webkit-inline-box;
display: inline-flex;
overflow: hidden;
background: transparent;
border-radius: 70% !important;
position: relative;
top: 7px;
// .profileImg{
// width: 160px;
// height: 160px;
// display: -webkit-inline-box;
// display: inline-flex;
// overflow: hidden;
// background: transparent;
// border-radius: 70% !important;
// position: relative;
// top: 7px;
// }
.profileImg{
width: 140px;
height: 140px;
display: -webkit-inline-box;
display: inline-flex;
overflow: hidden;
background: transparent;
border-radius: 70% !important;
position: relative;
top: 3px;
}

@ -10,7 +10,7 @@
<ion-grid>
<ion-row style="margin-top: 20px;margin-left: 12px;">
<ion-col>
<div size="10" class="approvalTitle">{{'general, addAttach' | translate}}</div>
<div size="10" [ngClass]=" direction === 'en' ? 'approvalTitle' : 'approvalTitle-ar'" >{{'general, addAttach' | translate}}</div>
</ion-col>
<ion-col style="padding-left: 7%;" size="2">
<div class="fileDiv">
@ -86,7 +86,7 @@
<ion-grid class="">
<div class="approvalTitle">{{'confirmAddEit, comment' | translate}}</div>
<div [ngClass]=" direction === 'en' ? 'approvalTitle' : 'approvalTitle-ar'">{{'confirmAddEit, comment' | translate}}</div>
<ion-item class="submitNote" lines="none">
<!-- <ion-label position="floating" class="boldTxtNav">{{'confirmAddEit, comment' | translate}}</ion-label> -->
<ion-textarea type="text" [(ngModel)]="eitComments"></ion-textarea>
@ -94,7 +94,7 @@
</ion-grid>
<ion-grid class="approvalList">
<div class="approvalTitle">{{'confirmAddEit, approverList' | translate}}</div>
<div [ngClass]=" direction === 'en' ? 'approvalTitle' : 'approvalTitle-ar'">{{'confirmAddEit, approverList' | translate}}</div>
<div class="noDataDiv" *ngIf="approversList?.length == 0">
<p>{{ 'general, empty' | translate}}</p>
</div>

@ -240,4 +240,16 @@
width: 80% !important;
color: white!important;
border-radius: 16px !important;
}
}
.approvalTitle-ar{
font-weight: bold;
font-size: 16px;
text-align: right;
}
.approvalTitle{
font-weight: bold;
font-size: 16px;
text-align: left;
}

@ -14,15 +14,26 @@
<div style="color: black;">
<div class="result-graph">
<div >
<ion-datetime [(ngModel)]="Sdate" class="datetime" displayFormat="DD MMMM YYYY" placeholder="DD MMMM YYYY"
(ionChange)="getAccrualBalance()"></ion-datetime>
<!-- <ion-datetime
[placeholder]="Select"
display-format="DD/MM/YYYY"
[min]="1900"
[max]="2100"
[(ngModel)]="dateTo"
doneText="Done"
cancelText="Cancel"
></ion-datetime> -->
<ion-datetime [(ngModel)]="Sdate" class="datetime" [placeholder]="Select"displayFormat="DD MMMM YYYY"
cancelText="{{ts.trPK('general','cancel')}}" doneText="{{ts.trPK('general','done')}}"
(ionChange)="getAccrualBalance()"></ion-datetime>
<!-- <ion-datetime [(ngModel)]="Sdate" class="datetime" displayFormat="DD MMMM YYYY" placeholder="DD MMMM YYYY"
(ionChange)="getAccrualBalance()"></ion-datetime> -->
<ion-icon class="iconCalendar" ios="ios-calendar" md="md-calendar"></ion-icon>
</div>
<div style=" border-bottom: 1px solid #a7a4a4; margin-bottom: 12px;
margin-top: -10px; margin-right: -9px;"></div>
<!-- <div class="result-text-container">
</div> -->

@ -14,6 +14,7 @@
<div class="result-text-container">
<h2>{{totalEmployees}}</h2>
<span>{{ts.trPK('myTeam','total')}} <br> {{ts.trPK('myTeam','team-members')}}</span>
</div>
<p-chart class="today-graph" type="doughnut" [data]="data" [options]="options"></p-chart>
</div>

@ -88,9 +88,9 @@ button.item-button.button.button-md.button-clear.button-clear-md {
border: solid var(--gray) 1px;
border-radius: 21px;
// padding-left: 145px !important;
margin-left: 86px;
padding-right: 129px;
margin-right: -143px;
margin-left: 123px;
// padding-right: 129px;
margin-right: -136px;
}
.filterBtn{
@ -111,8 +111,8 @@ button.item-button.button.button-md.button-clear.button-clear-md {
border-radius: 50%;
height: 60px;
width: 60px;
margin-left: -181px;
margin-right: 269px;
margin-left: -183px;
margin-right: 260px;
}

@ -1,7 +1,7 @@
<ion-content>
<div class="search-header" (click)="dismissModal()">
<h2>{{ts.trPK('general','advanced-search')}}</h2>
<ion-icon slot="icon-only" name="md-close"></ion-icon>
<ion-icon [ngClass]=" direction === 'en' ? '' : 'cancel-ar'" slot="icon-only" name="md-close"></ion-icon>
</div>

@ -26,6 +26,10 @@
margin-bottom: 20px;
}
}
.cancel-ar{
margin-right: 239px;
}
.search-button{
background: #3dcab3;
height: 50px;

@ -16,11 +16,14 @@ export class WorklistAdvancedSearchComponent implements OnInit {
public selectedValue = '';
public notificationType = '';
public itemType = '';
public direction: string;
constructor(
public modalController: ModalController,
public ts: TranslatorService
) { }
) {
this.direction = TranslatorService.getCurrentLanguageName();
}
ngOnInit() {}

@ -12,7 +12,7 @@
border-bottom-left-radius: -10px !important;
padding-top: 8px;
padding-bottom: 8px;
margin-left: 18px;
margin-left: 8px;
font-size: 12px !important;
}
.colPayslips{
@ -34,6 +34,7 @@
font-size: 13px !important;
// font-weight: bold !important;
font-family: WorkSans-Bold;
margin-left: 8px;
}
.earingTotH{
text-align: right;

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

@ -41,6 +41,10 @@ button.item-button.button.button-md.button-clear.button-clear-md {
// margin-right: 7%;
// width: 100%;
// }
.ion-item-ar{
margin-top: 5%;
margin-right: -6%;
}
.ionItem{
border: #e4e4e4 solid;
/* margin: 6px; */
@ -108,13 +112,12 @@ 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;
margin-left: 115px;
margin-right: -132px;
}
.filterBtn{
@ -131,8 +134,8 @@ button.item-button.button.button-md.button-clear.button-clear-md {
border-radius: 50%;
height: 60px;
width: 60px;
margin-left: -167px;
margin-right: 247px;
margin-left: -201px;
margin-right: 282px;
}
*{

@ -15,7 +15,7 @@
},
"login": {
"en": "Login",
"ar": "الدخول"
"ar": "تسجيل الدخول"
},
"username": {
"en": "User Name",
@ -52,7 +52,7 @@
},
"changepassword": {
"en": "Change Password",
"ar": "غير كلمة السر"
"ar": "تغيير كلمة المرور"
},
"announcement":{
"en":"Announcement",
@ -899,7 +899,7 @@
},
"worklist": {
"en": "Work List",
"ar": "قائمة العمل"
"ar": "الطلبات المعلقة"
},
"pending-request":{
"en":"Penading Request",
@ -908,7 +908,7 @@
},
"missing-swipes":{
"en":"Missing Swipes",
"ar":"البصمات المفقوده"
"ar":"فقدان البصمة"
},
"leave-balance":{
"en":"Leave Balance",
@ -1036,7 +1036,7 @@
},
"busG": {
"en": "Business Group",
"ar": "مجموعة العمل"
"ar": "الإدارة"
},
"phone-no": {
"en": "Phone Number",
@ -1060,7 +1060,7 @@
},
"payrol": {
"en": "Payroll",
"ar": "كشف الرواتب"
"ar": "المشروع"
},
"orgEmail": {
"en": "Organization Email Address",
@ -1155,7 +1155,7 @@
"en": "Monthly Attendance"
},
"monthly-attendance-calendar": {
"ar": "تقويم الحضور الشهري",
"ar": "سجل الحضور الشهري",
"en": "Monthly Attendance Calendar"
},
"completed": {
@ -1515,15 +1515,15 @@
},
"myTeam-header": {
"en": "My Team",
"ar": "فريقى"
"ar": "فريقي"
},
"total": {
"en": "TOTAL",
"ar": "المجموع"
"ar": "عدد"
},
"team-members": {
"en": "TEAM MEMBERS",
"ar": "اعضاء الفريق"
"ar": " اعضاء الفريق"
},
"team-stats": {
"en": "Team Statistics",

Loading…
Cancel
Save