diff --git a/Mohem/src/app/absence/home/home.component.html b/Mohem/src/app/absence/home/home.component.html index 86fd1dcc..1c00a688 100644 --- a/Mohem/src/app/absence/home/home.component.html +++ b/Mohem/src/app/absence/home/home.component.html @@ -55,12 +55,12 @@
-

{{totalnumber}}

+ - - {{ts.trPK('absenceList','totalNumber')}} +
@@ -68,13 +68,7 @@ -
+
@@ -84,37 +78,25 @@
-
+
- + - +
-
+
- + - +
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 --> + + + {{ts.trPK('userProfile','title')}} + + + + +
- +
diff --git a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html index 3d11570b..4215ff2a 100644 --- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html +++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html @@ -1,12 +1,27 @@ + + + {{ts.trPK('userProfile','performance')}} + + + + + + + +
- +
- +
@@ -15,7 +30,7 @@
-

Performance Evaluation

+

{{ts.trPK('userProfile','performance-evaluation')}}

diff --git a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss index aee2712f..2e9a2658 100644 --- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss +++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss @@ -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; } diff --git a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts index efc55d7b..6a462682 100644 --- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts +++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts @@ -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"); diff --git a/Mohem/src/app/profile/profile-image/profile-image.component.html b/Mohem/src/app/profile/profile-image/profile-image.component.html index 04bfb165..59845218 100644 --- a/Mohem/src/app/profile/profile-image/profile-image.component.html +++ b/Mohem/src/app/profile/profile-image/profile-image.component.html @@ -1,18 +1,21 @@ - - + + {{ts.trPK('userProfile','changepicture')}} + + + - +
diff --git a/Mohem/src/app/profile/profile-image/profile-image.component.scss b/Mohem/src/app/profile/profile-image/profile-image.component.scss index c4bcb781..6bfd9ea8 100644 --- a/Mohem/src/app/profile/profile-image/profile-image.component.scss +++ b/Mohem/src/app/profile/profile-image/profile-image.component.scss @@ -45,4 +45,8 @@ width: 234px; //box-shadow: 0px 0px 0px 10px #8c8c8c; -} \ No newline at end of file +} + +.header-toolbar-new{ + --background: #22c6b3; + } \ No newline at end of file diff --git a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html index b526fb7f..b30a2627 100644 --- a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html +++ b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html @@ -31,8 +31,8 @@
-
- +
+
@@ -57,7 +57,7 @@
- +
@@ -91,7 +91,7 @@
- +
diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index dae52095..a50b4002 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -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": "اسم القاعدة"