edit issues

MOHEMM-Q3-DEV-LATEST
Fatimah.Alshammari 6 years ago
parent 7c17cb0913
commit 043b57383b

@ -55,12 +55,12 @@
<div class="result-text-container">
<h2>{{totalnumber}}</h2>
<!-- <h2>{{totalnumber}}</h2> -->
<!-- <h2>{{accrualNet + accrualUsed + accrualYearly}}</h2> -->
<span>{{ts.trPK('absenceList','totalNumber')}}</span>
<!--
<span>{{ts.trPK('absenceList','totalNumber')}}</span> -->
</div>
@ -68,13 +68,7 @@
<p-chart #chart class="today-graph" type="doughnut" [data]="data" [options]="options"></p-chart>
</div>
<div style="position: relative;
left: 82%;
bottom: 128px;
color: black;
background-color: #DDB017;
width: 13%;
height: 6px;">
<div class="green">
<ion-col>
<ion-row>
<label class="green-label">{{ts.trPK('absenceList','accrualNet')}}</label>
@ -84,37 +78,25 @@
</ion-row>
</ion-col>
</div>
<div style="position: relative;
left: 59%;
bottom: 131px;
color: black;
background-color: #094875;
width: 13%;
height: 6px;">
<div class="red">
<ion-col>
<ion-row>
<label class="blue-label">{{ts.trPK('absenceList','accrualUsed')}}</label>
<label class="red-label">{{ts.trPK('absenceList','accrualUsed')}}</label>
</ion-row>
<ion-row>
<label class="blue-amount" for="">{{accrualUsed}}</label>
<label class="red-amount" for="">{{accrualUsed}}</label>
</ion-row>
</ion-col>
</div>
<div style="position: relative;
left: 82%;
bottom: 80px;
color: black;
background-color: #CB3232;
width: 13%;
height: 6px;">
<div class="orng">
<ion-col>
<ion-row>
<label class="blue-label">{{ts.trPK('absenceList','accrualYearly')}}</label>
<label class="orng-label">{{ts.trPK('absenceList','accrualYearly')}}</label>
</ion-row>
<ion-row>
<label class="blue-amount" for="">{{accrualYearly}}</label>
<label class="orng-amount" for="">{{accrualYearly}}</label>
</ion-row>
</ion-col>
</div>

@ -195,17 +195,27 @@ margin-top: -13px;
margin-top: -3px;
}
.blue-label{
.red-label{
font-size: 12px;
margin-top: -13px;
}
.blue-amount{
.red-amount{
font-size: 17px;
font-family: WorkSans-Bold;
margin-top: -4px;
margin-top: -3px;
}
.orng-label{
font-size: 12px;
margin-top: -13px;
}
.orng-amount{
font-size: 17px;
font-family: WorkSans-Bold;
margin-top: -3px;
}
.contentEit:before {
position: absolute;
content: "";
@ -215,4 +225,31 @@ margin-top: -13px;
left: 0;
top: 0px;
z-index: 1;
}
.green{
position: relative;
left: 82%;
bottom: 128px;
color: black;
background-color: #1FA269;
width: 13%;
height: 6px;
}
.red{
position: relative;
left: 59%;
bottom: 131px;
color: black;
background-color: #CB3232;
width: 13%;
height: 6px;
}
.orng{
position: relative;
left: 82%;
bottom: 80px;
color: black;
background-color: #DDB017;
width: 13%;
height: 6px;
}

@ -107,10 +107,10 @@ export class HomeComponent implements OnInit {
this.data = {
// labels: ['earingTotal', 'deductionTotal'],
datasets: [
{ data: [this.accrualNet,this.accrualUsed,this.accrualYearly],
{ data: [this.accrualNet,this.accrualYearly,this.accrualUsed],
backgroundColor: [
'#DDB017',
'#094875',
'#1FA269',
'#DDB017',
'#CB3232',],
borderWidth: 2
}
@ -262,11 +262,11 @@ createAbsence() {
this.data = {
// labels: ['earingTotal', 'deductionTotal'],
datasets: [
{ data: [this.accrualNet,this.accrualUsed,this.accrualYearly],
{ data: [this.accrualNet,this.accrualYearly,this.accrualUsed],
backgroundColor: [
'#DDB017',
'#094875',
'#CB3232',],
'#1FA269',
'#DDB017',
'#CB3232',],
borderWidth: 2
}
]

@ -107,7 +107,7 @@ private handlePerformanceAppraisalResult(result){
this.performanceData=[];
for(let i=0;i<this.appraisalArr.length;i++){
this.performanceData.push({name:this.appraisalArr[i].APPRAISAL_YEAR,value :this.appraisalArr[i].APPRAISAL_SCORE});
this.performanceData.push({name:this.appraisalArr[i].APPRAISAL_YEAR,value :parseInt(this.appraisalArr[i].APPRAISAL_SCORE).toFixed()});
}
console.log("PerformanceAppraisalResponse");
this.sharedData.setSharedData(this.performanceData, PerformanceAppraisalResponse.PERFORMANCE_DATA);

@ -10,13 +10,21 @@
</div>
</ion-header> -->
<ion-header >
<ion-toolbar class="header-toolbar-new">
<ion-title color="light">{{ts.trPK('userProfile','title')}}</ion-title>
<ion-buttons slot="start">
<nav-buttons></nav-buttons>
</ion-buttons>
</ion-toolbar>
</ion-header>
<ion-content class="colorBG">
<div class="header-div">
<ion-buttons slot="start">
<!-- <ion-buttons slot="start">
<ion-back-button color="light" class="btnBack" defaultHref="/home"></ion-back-button>
</ion-buttons>
<p class="proTitles">{{ts.trPK('userProfile','title')}}</p>
<p class="proTitles">{{ts.trPK('userProfile','title')}}</p> -->
<!-- <div class="centerDiv profileDiv"> -->
<div class="centerDiv homeBox">

@ -1,12 +1,27 @@
<ion-header >
<ion-toolbar class="header-toolbar-new">
<ion-title color="light">{{ts.trPK('userProfile','performance')}}</ion-title>
<ion-buttons slot="start">
<nav-buttons></nav-buttons>
</ion-buttons>
<!-- <ion-buttons slot="end">
<button class="headerBtn" (click)="AccrualBalances()">
<img class="headerImg" src="../assets/imgs/accubalance.png">
</button>
</ion-buttons> -->
</ion-toolbar>
</ion-header>
<ion-content class="colorBG">
<div class="header-div">
<ion-buttons slot="start">
<!-- <ion-buttons slot="start">
<ion-back-button color="light" class="btnBack" defaultHref="/home"></ion-back-button>
</ion-buttons>
<p class="proTitles">{{ts.trPK('userProfile','performance')}}</p>
<p class="proTitles">{{ts.trPK('userProfile','performance')}}</p> -->
<div class="profilediv">
<img class="profileImg" [src]="user_image">
<!-- <img class="profileImg" [src]="user_image"> -->
</div>
<!-- <ion-img class="profileImg" [src]="imageSrc"></ion-img> -->
@ -15,7 +30,7 @@
<ion-grid>
<div class="grid">
<ion-row>
<p class="Text">Performance Evaluation</p>
<p class="Text">{{ts.trPK('userProfile','performance-evaluation')}}</p>
<div class="gauge">

@ -125,12 +125,14 @@
font-size: 28px !important;
font-weight: bold !important;
margin-top: 7px !important;
margin-left: 72px !important;
margin-left: 90px !important;
}
.percentage{
font-size: 15px !important;
font-size: 20px !important;
margin-top: 15px !important;
margin-left: -7px;
}

@ -68,7 +68,9 @@ export class PerformanceEvaluationComponent implements OnInit {
console.log( this.performanceData[0].color)
}
ngAfterViewInit(){
document.querySelector(".gauge >text").remove();
}
getProfile() {
console.log("getProfile");

@ -1,18 +1,21 @@
<ion-header>
<ion-toolbar class="header-toolbar">
<ion-buttons slot="start">
<ion-toolbar class="header-toolbar-new">
<!-- <ion-buttons slot="start">
<ion-back-button color="light" class="btnBack" defaultHref="/home"></ion-back-button>
</ion-buttons>
</ion-buttons> -->
<ion-title color="light" > {{ts.trPK('userProfile','changepicture')}}</ion-title>
<ion-buttons slot="start">
<nav-buttons></nav-buttons>
</ion-buttons>
<ion-buttons slot="end">
<button style="color: white !important;" class="headerBtn" *ngIf="saveChange != ''" (click)="updateImageProfile();" >
{{ts.trPK('general','save')}}
</button>
</ion-buttons>
</ion-toolbar>
</ion-header>
<ion-content padding>
<div class="profileDiv">
<!-- <ion-img class="imgCircle" src="{{src}}"></ion-img> -->

@ -45,4 +45,8 @@ width: 234px;
//box-shadow: 0px 0px 0px 10px #8c8c8c;
}
}
.header-toolbar-new{
--background: #22c6b3;
}

@ -31,8 +31,8 @@
<ion-row no-wrap>
<div class="stepHeaderDiv">
<label class="stepHeaderLebal">Applay for vacation Rule </label><br>
<label class="stepHeaderLebal">Step 1</label>
<label class="stepHeaderLebal">{{ 'vacation-rule, apply-for-vacation-rule' | translate}} </label><br>
<label class="stepHeaderLebal"> {{ 'vacation-rule, step-1' | translate}}</label>
</div>
<ion-item class="selectItem">
@ -57,7 +57,7 @@
<div *ngIf="notificationTypeShow && !isUpdate" class="divStep">
<div class="stepHeaderDiv">
<label class="stepHeaderLebal">Step 2</label>
<label class="stepHeaderLebal">{{ 'vacation-rule, step-2' | translate}}</label>
</div>
<ion-row >
@ -91,7 +91,7 @@
<div *ngIf="createVacationRuleShow" class="divStep" >
<div class="stepHeaderDiv">
<label class="stepHeaderLebal">Step 3</label>
<label class="stepHeaderLebal">{{ 'vacation-rule, step-3' | translate}}</label>
</div>
<ion-row>
<ion-grid>

@ -1068,6 +1068,22 @@
"en": "Vacation Rule",
"ar": "قواعد الإجازات"
},
"apply-for-vacation-rule": {
"en": "Apply for vacation Rule",
"ar": "التقدم بطلب اجازه"
},
"step-1": {
"en": "Step 1",
"ar": "الخطوه الاولى"
},
"step-2": {
"en": "Step 2",
"ar": "الخطوه الثانيه"
},
"step-3": {
"en": "Step 3",
"ar": "الخطوه الثالثه"
},
"ruleName": {
"en": "Rule Name",
"ar": "اسم القاعدة"

Loading…
Cancel
Save