From 80ab9a5c8004826fd7282cb9d500e0cb1a128a43 Mon Sep 17 00:00:00 2001 From: "Fatimah.Alshammari" Date: Thu, 5 Mar 2020 09:35:32 +0300 Subject: [PATCH] general --- .../src/app/absence/home/home.component.html | 8 +- .../src/app/absence/home/home.component.scss | 31 ++++---- Mohem/src/app/absence/home/home.component.ts | 14 ++-- .../date-info-modal.component.html | 4 +- .../date-info-modal.component.scss | 16 ++++ Mohem/src/app/payslip/home/home.component.ts | 2 +- .../edit-profile/edit-profile.component.html | 18 ++--- .../edit-profile/edit-profile.component.scss | 24 +++++- .../edit-profile/edit-profile.component.ts | 3 +- .../src/app/profile/home/home.component.html | 14 +++- .../src/app/profile/home/home.component.scss | 5 ++ Mohem/src/app/profile/home/home.component.ts | 3 +- .../performance-evaluation.component.html | 4 +- .../performance-evaluation.component.scss | 6 ++ .../performance-evaluation.component.ts | 79 ++++++++++--------- .../profile-image.component.html | 8 +- .../profile-image.component.scss | 4 +- Mohem/src/assets/localization/i18n.json | 12 +++ 18 files changed, 168 insertions(+), 87 deletions(-) diff --git a/Mohem/src/app/absence/home/home.component.html b/Mohem/src/app/absence/home/home.component.html index 7e438e1c..b2898b2b 100644 --- a/Mohem/src/app/absence/home/home.component.html +++ b/Mohem/src/app/absence/home/home.component.html @@ -1,6 +1,6 @@ - {{ts.trPK('absenceList','absenceList')}} + {{ts.trPK('home','leave-balance')}} @@ -68,7 +68,7 @@ -
+
@@ -78,7 +78,7 @@
-
+
@@ -89,7 +89,7 @@
-
+
diff --git a/Mohem/src/app/absence/home/home.component.scss b/Mohem/src/app/absence/home/home.component.scss index fdeaca6a..c3675a2e 100644 --- a/Mohem/src/app/absence/home/home.component.scss +++ b/Mohem/src/app/absence/home/home.component.scss @@ -227,7 +227,7 @@ margin-top: -13px; top: 0px; z-index: 1; } - .div-orng{ + .div-green{ position: relative; left: 82%; bottom: 128px; @@ -236,7 +236,17 @@ margin-top: -13px; width: 13%; height: 6px; } - .div-blue-ar{ + .div-green-ar{ + position: relative; + bottom: 59px; + color: black; + background-color: #1FA269; + width: 13%; + height: 6px; + right: 9px; + + } + .div-red-ar{ position: relative; bottom: 131px; color: black; @@ -247,7 +257,7 @@ margin-top: -13px; height: 6px; right: 78px; } - .div-blue{ + .div-red{ position: relative; left: 59%; bottom: 131px; @@ -257,17 +267,8 @@ margin-top: -13px; width: 13%; height: 6px; } - .div-orng-ar{ - position: relative; - bottom: 59px; - color: black; - background-color: #1FA269; - width: 13%; - height: 6px; - right: 9px; - - } - .div-red{ + + .div-orng{ position: relative; left: 82%; bottom: 80px; @@ -277,7 +278,7 @@ margin-top: -13px; width: 13%; height: 6px; } - .div-red-ar{ + .div-orng-ar{ position: relative; bottom: 139px; color: black; diff --git a/Mohem/src/app/absence/home/home.component.ts b/Mohem/src/app/absence/home/home.component.ts index 6fca2c82..5075bd6d 100644 --- a/Mohem/src/app/absence/home/home.component.ts +++ b/Mohem/src/app/absence/home/home.component.ts @@ -108,10 +108,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 } @@ -263,11 +263,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/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html index 66354835..983bcdc4 100644 --- a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html +++ b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html @@ -24,10 +24,10 @@

{{day}}

-

{{nameMonth}}

+

{{nameMonth}}

-

{{year}}

+

{{year}}

{{ts.trPK('attendance','present')}}

diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss index dd3a9524..c078c749 100644 --- a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss +++ b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss @@ -197,6 +197,22 @@ height: 360px !important; margin-top: -43px; margin-left: 27px; } + + .p2-ar{ font-weight: bold !important; + font-size: 17px !important; + margin-bottom: 43px !important; + margin-top: 0px !important; + color: black !important; + font-weight: bold !important; + margin-right: 33px; + } + .p3-ar{ /* margin-bottom: -72px !important; */ + color: black !important; + font-weight: bold !important; + font-size: 19px; + margin-top: -43px; + margin-right: 27px; + } .p4{ margin-bottom: 56px !important; margin-top: -26px !important; color: black !important; diff --git a/Mohem/src/app/payslip/home/home.component.ts b/Mohem/src/app/payslip/home/home.component.ts index 9fa024f2..66942158 100644 --- a/Mohem/src/app/payslip/home/home.component.ts +++ b/Mohem/src/app/payslip/home/home.component.ts @@ -58,7 +58,7 @@ export class HomeComponent implements OnInit { tooltips: { enabled: false }, legend: { display: false }}; gaugeType = "full"; - direction: string; + // gaugeValue = 11.200; // gaugeLabel = ""; 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 9ce9f3d3..47abf5dd 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.html +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.html @@ -26,16 +26,16 @@
- -
+ +
- -
+ +
- -
+ +
@@ -47,7 +47,7 @@
-

Years of Services

+

{{ts.trPK('userProfile','Years of Services')}}

@@ -58,7 +58,7 @@ {{ts.trPK('userProfile','edit-profile')}} - + @@ -69,7 +69,7 @@ {{ts.trPK('userProfile','performance-evaluation')}} - +
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..2fa4ab18 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.scss +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.scss @@ -106,6 +106,18 @@ font-size: 12px; color: white; } + .service-ar{ + font-size: 28px; + color: white; + letter-spacing: 1px; + font-weight: bold; + margin-right: 26px; + } + .services-ar{ + font-size: 14px; + color: white; + margin-right: 25px; + } .list{ margin-left: 14px; @@ -150,4 +162,14 @@ margin-top: 4px; } - \ No newline at end of file + .arrow{ + width: 20px; + height: 22px !important; + } + .arrow-ar{ + float: left; + font-size: 25px; + color: grey; + -webkit-transform: rotate(180deg); + transform: rotate(180deg); + } \ No newline at end of file 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 946dce11..a97d76ee 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.ts +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.ts @@ -20,7 +20,7 @@ export class EditProfileComponent implements OnInit { User_name_Emp: string = ""; User_Job_name: string; - + public direction: string; private menu: MenuController; setImage:any; // imageSrc: any = "../assets/imgs/profile.png"; @@ -41,6 +41,7 @@ export class EditProfileComponent implements OnInit { ) { + this.direction = TranslatorService.getCurrentDirection(); // this.events.subscribe("img-change", displayImg => { // console.log("app compont: "+displayImg); // this.user_image = this.sanitizer.bypassSecurityTrustUrl("data:Image/*;base64,"+displayImg); diff --git a/Mohem/src/app/profile/home/home.component.html b/Mohem/src/app/profile/home/home.component.html index dc6f6451..c9982711 100644 --- a/Mohem/src/app/profile/home/home.component.html +++ b/Mohem/src/app/profile/home/home.component.html @@ -10,13 +10,21 @@
--> + + + {{ts.trPK('userProfile','title')}} + + + + +
- +
@@ -32,7 +40,7 @@
-
+
diff --git a/Mohem/src/app/profile/home/home.component.scss b/Mohem/src/app/profile/home/home.component.scss index 4be2aac3..c508d39d 100644 --- a/Mohem/src/app/profile/home/home.component.scss +++ b/Mohem/src/app/profile/home/home.component.scss @@ -50,6 +50,11 @@ ion-col.colBold, ion-col.colBold > label{ top: 80%; left: 65%; } + .changeImgBtn-ar{ + position: absolute; + top: 80%; + left: 74%; + } .profileImg{ width: 160px; height: 160px; diff --git a/Mohem/src/app/profile/home/home.component.ts b/Mohem/src/app/profile/home/home.component.ts index 2e192b1f..4894cbb2 100644 --- a/Mohem/src/app/profile/home/home.component.ts +++ b/Mohem/src/app/profile/home/home.component.ts @@ -14,6 +14,7 @@ export class HomeComponent implements OnInit { personalInfo: any; setImage:any; imageSrc: any = "../assets/imgs/profile.png"; + public direction: string; // user_image: any = "../assets/imgs/profile.png"; constructor( public ts: TranslatorService, @@ -24,7 +25,7 @@ export class HomeComponent implements OnInit { ) { - + this.direction = TranslatorService.getCurrentDirection(); this.events.subscribe("img-change", displayImg => { // alert("1 - profile home : "+displayImg); //this.user_image = "data:image/png;base64"+displayImg; 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 447ba6d0..256fd5d8 100644 --- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html +++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html @@ -25,9 +25,9 @@
-

Performance Evaluation

+

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

-
+
{ - // console.log("app compont: "+displayImg); - // this.user_image = this.sanitizer.bypassSecurityTrustUrl("data:Image/*;base64,"+displayImg); - - // }); - - - } + // private events: Events, + // private sanitizer: DomSanitizer, + + ) { + this.direction = TranslatorService.getCurrentDirection(); + // this.events.subscribe("img-change", displayImg => { + // console.log("app compont: "+displayImg); + // this.user_image = this.sanitizer.bypassSecurityTrustUrl("data:Image/*;base64,"+displayImg); + + // }); - colorScheme = { - domain: ['#22C6B3', '#094875','#3CB9D5','#1FA269','#0D155E'] - }; - + } + + + colorScheme = { + domain: ['#22C6B3', '#094875', '#3CB9D5', '#1FA269', '#0D155E'] + }; + ngOnInit() { - - + + this.getProfile(); - + this.performanceData = this.cs.sharedService.getSharedData( PerformanceAppraisalResponse.PERFORMANCE_DATA, true ); console.log(this.performanceData.length); - //i % 2 == 0 - this.length=this.performanceData.length; + //i % 2 == 0 + this.length = this.performanceData.length; - for(let i=0;i text").remove(); + } getProfile() { console.log("getProfile"); @@ -79,11 +83,12 @@ export class PerformanceEvaluationComponent implements OnInit { if (user) { this.personalInfo = user; this.user_image = user.EMPLOYEE_IMAGE - ? "data:image/png;base64," + user.EMPLOYEE_IMAGE - : "../assets/imgs/profile.png"; - + ? "data:image/png;base64," + user.EMPLOYEE_IMAGE + : "../assets/imgs/profile.png"; + + + } + }); + } - }}); -} - } 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..22e79717 100644 --- a/Mohem/src/app/profile/profile-image/profile-image.component.html +++ b/Mohem/src/app/profile/profile-image/profile-image.component.html @@ -1,9 +1,11 @@ - + + {{ts.trPK('userProfile','changepicture')}} - + + - {{ts.trPK('userProfile','changepicture')}} +