add fix bug

mekawy-issues
Fatimah.Alshammari 6 years ago
parent a18c30eaa5
commit 7c17cb0913

@ -1,8 +1,16 @@
<ion-header> <!-- <ion-header>
<ion-toolbar class="header-toolbar-new"> <ion-toolbar class="header-toolbar-new">
<ion-title style="color: white;">{{headerTitle}}</ion-title> <ion-title style="color: white;">{{headerTitle}}</ion-title>
<nav-buttons [enableMenu]="false" [enableBack]="true" [navigate]="true"></nav-buttons> <nav-buttons [enableMenu]="false" [enableBack]="true" [navigate]="true"></nav-buttons>
<ion-title style="color: white;">{{headerTitle}}</ion-title> </ion-toolbar>
</ion-header> -->
<ion-header >
<ion-toolbar class="header-toolbar-new">
<ion-title color="light">{{headerTitle}}</ion-title>
<ion-buttons slot="start">
<nav-buttons></nav-buttons>
</ion-buttons>
</ion-toolbar> </ion-toolbar>
</ion-header> </ion-header>

@ -9,12 +9,21 @@
</ion-toolbar> </ion-toolbar>
</ion-header> --> </ion-header> -->
<ion-header> <!-- <ion-header>
<ion-toolbar class="header-toolbar-new"> <ion-toolbar class="header-toolbar-new">
<nav-buttons [enableMenu]="false" [enableBack]="true" [navigate]="true"></nav-buttons> <nav-buttons [enableMenu]="false" [enableBack]="true" [navigate]="true"></nav-buttons>
<ion-title style="color: white;">{{ts.trPK('payslip','monthly-payslip')}}</ion-title> <ion-title style="color: white;">{{ts.trPK('payslip','monthly-payslip')}}</ion-title>
</ion-toolbar> </ion-toolbar>
</ion-header> </ion-header> -->
<ion-header >
<ion-toolbar class="header-toolbar-new">
<ion-title color="light">{{ts.trPK('payslip','monthly-payslip')}}</ion-title>
<ion-buttons slot="start">
<nav-buttons></nav-buttons>
</ion-buttons>
</ion-toolbar>
</ion-header>
<ion-content class="colorBG"> <ion-content class="colorBG">
@ -99,11 +108,11 @@
</div> </div>
<div style="position: relative; <div style="position: relative;
left: 77%; left: 86%;
bottom: 117px; bottom: 117px;
color: black; color: black;
background-color: #22c6b3; background-color: #22c6b3;
width: 20%; height: 6px;"> width: 15%; height: 6px;">
<ion-col> <ion-col>
<ion-row> <ion-row>
<label class="green-label">{{ts.trPK('payslip','earnings-key')}}</label> <label class="green-label">{{ts.trPK('payslip','earnings-key')}}</label>
@ -114,11 +123,11 @@
</ion-col> </ion-col>
</div> </div>
<div style="position: relative; <div style="position: relative;
left: 77%; left: 86%;
bottom: 67px; bottom: 67px;
color: black; color: black;
background-color: #094875; background-color: #094875;
width: 20%; height: 6px;"> width: 15%; height: 6px;">
<ion-col> <ion-col>
<ion-row> <ion-row>
<label class="blue-label">{{ts.trPK('payslip','deductions-key')}}</label> <label class="blue-label">{{ts.trPK('payslip','deductions-key')}}</label>

@ -143,8 +143,10 @@
border-radius: 20px !important; border-radius: 20px !important;
padding-top: 13px; padding-top: 13px;
padding-bottom: 14px; padding-bottom: 14px;
margin-left: 26px; // margin-left: 26px;
margin-right: 28px; // margin-right: 28px;
margin-left: 19px;
margin-right: 19px;
margin-top: -2px; margin-top: -2px;
margin-bottom: 10px; margin-bottom: 10px;
padding-right: 21px; padding-right: 21px;
@ -179,23 +181,23 @@
} }
} }
.green-label{ .green-label{
font-size: 12px; font-size: 10px;
margin-top: -13px; margin-top: -13px;
} }
.green-amount{ .green-amount{
font-size: 17px; font-size: 14px;
font-family: WorkSans-Bold; font-family: WorkSans-Bold;
margin-top: -3px; margin-top: -3px;
} }
.blue-label{ .blue-label{
font-size: 12px; font-size: 10px;
margin-top: -13px; margin-top: -13px;
} }
.blue-amount{ .blue-amount{
font-size: 17px; font-size: 14px;
font-family: WorkSans-Bold; font-family: WorkSans-Bold;
margin-top: -4px; margin-top: -4px;
} }

@ -1,9 +1,21 @@
<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"> <ion-content class="colorBG">
<div class="header-div"> <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-back-button color="light" class="btnBack" defaultHref="/home"></ion-back-button>
</ion-buttons> </ion-buttons> -->
<p class="proTitles">{{ts.trPK('userProfile','title')}}</p> <!-- <p class="proTitles">{{ts.trPK('userProfile','title')}}</p> -->
<div> <div>

@ -8,16 +8,19 @@
background: var(--ion-item-background,var(--ion-background-color,#fff)); background: var(--ion-item-background,var(--ion-background-color,#fff));
} }
.header-toolbar-new{
--background: #22c6b3;
}
.colorBG{ .colorBG{
--background: #f0efef; --background: #f0efef;
} }
.header-div{ .header-div{
text-transform: capitalize; text-transform: capitalize;
background: #22C6B3; background: #22C6B3;
display: block; display: block;
position: relative; position: relative;
height: 160px; height: 113px;
margin-bottom: 60px; margin-bottom: 60px;
} }

@ -113,6 +113,10 @@ private handlePerformanceAppraisalResult(result){
this.sharedData.setSharedData(this.performanceData, PerformanceAppraisalResponse.PERFORMANCE_DATA); this.sharedData.setSharedData(this.performanceData, PerformanceAppraisalResponse.PERFORMANCE_DATA);
//localStorage.setItem("performanceData", this.performanceData) //localStorage.setItem("performanceData", this.performanceData)
this.cs.openPerformanceevaluation(); this.cs.openPerformanceevaluation();
}else{
let msg: string = this.ts.trPK("userProfile", "no-appraisal");
this.cs.presentAlert(msg);
} }
} }
} }

@ -938,6 +938,10 @@
"en": "Performance", "en": "Performance",
"ar": "الاداء" "ar": "الاداء"
}, },
"no-appraisal": {
"en": "No Performance Evaluation",
"ar": "لايوجد تقييم"
},
"changepicture":{ "changepicture":{
"en":"Change Picture", "en":"Change Picture",
"ar":"تغيير الصوره" "ar":"تغيير الصوره"

Loading…
Cancel
Save