+
-
+
-
+
diff --git a/Mohem/src/app/absence/home/home.component.scss b/Mohem/src/app/absence/home/home.component.scss
index 670bd6c2..ecc1c20a 100644
--- a/Mohem/src/app/absence/home/home.component.scss
+++ b/Mohem/src/app/absence/home/home.component.scss
@@ -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;
}
\ No newline at end of file
diff --git a/Mohem/src/app/absence/home/home.component.ts b/Mohem/src/app/absence/home/home.component.ts
index 05b25d8b..4340f0c9 100644
--- a/Mohem/src/app/absence/home/home.component.ts
+++ b/Mohem/src/app/absence/home/home.component.ts
@@ -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
}
]
diff --git a/Mohem/src/app/profile/edit-profile/edit-profile.component.ts b/Mohem/src/app/profile/edit-profile/edit-profile.component.ts
index db8b9fa7..e13b05eb 100644
--- a/Mohem/src/app/profile/edit-profile/edit-profile.component.ts
+++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.ts
@@ -107,7 +107,7 @@ private handlePerformanceAppraisalResult(result){
this.performanceData=[];
for(let i=0;i
-->
+
+
+