From 7c17cb09132ba8d980bc70ca7157ec580c4e0eee Mon Sep 17 00:00:00 2001 From: "Fatimah.Alshammari" Date: Thu, 12 Mar 2020 15:48:54 +0300 Subject: [PATCH] add fix bug --- .../app/eit/eit-list/eit-list.component.html | 12 +++++++++-- .../src/app/payslip/home/home.component.html | 21 +++++++++++++------ .../src/app/payslip/home/home.component.scss | 16 +++++++------- .../edit-profile/edit-profile.component.html | 18 +++++++++++++--- .../edit-profile/edit-profile.component.scss | 15 +++++++------ .../edit-profile/edit-profile.component.ts | 4 ++++ Mohem/src/assets/localization/i18n.json | 4 ++++ 7 files changed, 66 insertions(+), 24 deletions(-) diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.html b/Mohem/src/app/eit/eit-list/eit-list.component.html index 43f3d4b8..7c964713 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.html +++ b/Mohem/src/app/eit/eit-list/eit-list.component.html @@ -1,8 +1,16 @@ - + + + + + {{headerTitle}} + + + diff --git a/Mohem/src/app/payslip/home/home.component.html b/Mohem/src/app/payslip/home/home.component.html index cb9a57a0..3fbc44b0 100644 --- a/Mohem/src/app/payslip/home/home.component.html +++ b/Mohem/src/app/payslip/home/home.component.html @@ -9,12 +9,21 @@ --> - + + + + + {{ts.trPK('payslip','monthly-payslip')}} + + + + + @@ -99,11 +108,11 @@
+ width: 15%; height: 6px;"> @@ -114,11 +123,11 @@
+ width: 15%; height: 6px;"> diff --git a/Mohem/src/app/payslip/home/home.component.scss b/Mohem/src/app/payslip/home/home.component.scss index 11086df0..4e9a5280 100644 --- a/Mohem/src/app/payslip/home/home.component.scss +++ b/Mohem/src/app/payslip/home/home.component.scss @@ -143,8 +143,10 @@ border-radius: 20px !important; padding-top: 13px; padding-bottom: 14px; - margin-left: 26px; - margin-right: 28px; + // margin-left: 26px; + // margin-right: 28px; + margin-left: 19px; + margin-right: 19px; margin-top: -2px; margin-bottom: 10px; padding-right: 21px; @@ -179,23 +181,23 @@ } } .green-label{ -font-size: 12px; -margin-top: -13px; + font-size: 10px; + margin-top: -13px; } .green-amount{ - font-size: 17px; + font-size: 14px; font-family: WorkSans-Bold; margin-top: -3px; } .blue-label{ - font-size: 12px; + font-size: 10px; margin-top: -13px; } .blue-amount{ - font-size: 17px; + font-size: 14px; font-family: WorkSans-Bold; margin-top: -4px; } diff --git a/Mohem/src/app/profile/edit-profile/edit-profile.component.html b/Mohem/src/app/profile/edit-profile/edit-profile.component.html index 9163ba2a..c60661c1 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.html +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.html @@ -1,9 +1,21 @@ + + + + {{ts.trPK('userProfile','title')}} + + + + + + + +
- + +
diff --git a/Mohem/src/app/profile/edit-profile/edit-profile.component.scss b/Mohem/src/app/profile/edit-profile/edit-profile.component.scss index 651acf4b..834dd70f 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.scss +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.scss @@ -8,16 +8,19 @@ background: var(--ion-item-background,var(--ion-background-color,#fff)); } +.header-toolbar-new{ + --background: #22c6b3; +} .colorBG{ --background: #f0efef; } .header-div{ - text-transform: capitalize; - background: #22C6B3; - display: block; - position: relative; - height: 160px; - margin-bottom: 60px; + text-transform: capitalize; + background: #22C6B3; + display: block; + position: relative; + height: 113px; + margin-bottom: 60px; } 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 61b0d210..db8b9fa7 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.ts +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.ts @@ -113,6 +113,10 @@ private handlePerformanceAppraisalResult(result){ this.sharedData.setSharedData(this.performanceData, PerformanceAppraisalResponse.PERFORMANCE_DATA); //localStorage.setItem("performanceData", this.performanceData) this.cs.openPerformanceevaluation(); + }else{ + let msg: string = this.ts.trPK("userProfile", "no-appraisal"); + this.cs.presentAlert(msg); + } } } diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 532df045..dae52095 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -938,6 +938,10 @@ "en": "Performance", "ar": "الاداء" }, + "no-appraisal": { + "en": "No Performance Evaluation", + "ar": "لايوجد تقييم" + }, "changepicture":{ "en":"Change Picture", "ar":"تغيير الصوره"