diff --git a/Mohem/src/app/app.component.ts b/Mohem/src/app/app.component.ts index c4c8a5cd..97d796fa 100644 --- a/Mohem/src/app/app.component.ts +++ b/Mohem/src/app/app.component.ts @@ -189,7 +189,7 @@ export class AppComponent implements OnInit { } public profile() { - this.cs.openEditProfile(); + this.cs.openProfile(); this.menu.toggle(); } diff --git a/Mohem/src/app/app.scss b/Mohem/src/app/app.scss index 2dd0d349..08bb1e93 100644 --- a/Mohem/src/app/app.scss +++ b/Mohem/src/app/app.scss @@ -30,4 +30,9 @@ } .start-badge{ right:16px; +} + +.my-custom-modal-css .modal-wrapper { + width: 90%; + height: 55%; } \ No newline at end of file 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 32b4dd9d..86ee5a08 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.html +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.html @@ -1,121 +1,153 @@ + [headerText]="'userProfile, title' | translate">
- - - -
- - +
- +
- +
-

{{User_name_Emp}}

-

{{User_Job_name}}

+

{{personalInfo.EMPLOYEE_NAME}}

-
- - -
- - - - - - - - - - - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - -
-
- - - - - - - - - - - - -
+ +
+
- +
+
-
- -
-

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

-
+ + + + +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - {{ts.trPK('userProfile','edit-profile')}} - - - - - - - - - - - {{ts.trPK('userProfile','performance-evaluation')}} - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + +
\ No newline at end of file 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 4d784a03..85728b60 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.scss +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.scss @@ -1,216 +1,130 @@ +ion-col.colBold, ion-col.colBold > label{ + font-weight:bold; +} - -.list-ios { - // margin-left: 0; - // margin-right: 0; - // margin-top: 32px; - // margin-bottom: 32px; - // background: var(--ion-item-background,var(--ion-background-color,#fff)); - margin-left: 0; - margin-right: 0; - margin-top: -15px; - margin-bottom: 32px; - border: 1px solid #d8d8d8; - background: var(--ion-item-background, var(--ion-background-color, #fff)); - border-radius: 10px; - padding-top: 60px; +.colorBG{ +--background: #f0efef; +} +.header-div{ + text-transform: capitalize; + background: #269DB8; + display: block; + position: relative; + height: 160px; + margin-bottom: 60px; } -.header-toolbar-new{ - --background: #269DB8; +// .profileCont{ +// background-color: #d9d7d7 !important; + + +.menubutton { +background: #f0ecec; +min-height: 39px; +width: 35px !important; +height: 20px; +border-radius: 50%; } -.colorBG{ - --background: #f0efef; - } - .header-div{ - text-transform: capitalize; - background: #269DB8; - display: block; + +.changeIcon{ + /* background: #c1c1c1; */ + width: 21px; + /* height: 26px; */ + border-radius: 50% !important; position: relative; - height: 113px; - margin-bottom: 60px; - } + color: #7f8c8d; + height: 35px; + +} +.changeImgBtn{ + position: absolute; + top: 80%; + left: 65%; +} +.changeImgBtn-ar{ + position: absolute; + top: 80%; + left: 66%; +} .profileImg{ width: 160px; - height: 160px; - display: -webkit-inline-box; - display: inline-flex; - overflow: hidden; - /* background: transparent; */ - border-radius: 78% !important; - position: relative; - top: 34px; - // background: white; - background: transparent; - margin-left: -3px; + height: 160px; + display: -webkit-inline-box; + display: inline-flex; + overflow: hidden; + // background: transparent; + border-radius: 69% !important; + position: relative; + top: 34px; + // background: white; + background: transparent; +} +.Text { + margin: 0; + padding: 0; + text-align: center; + font-weight: bolder; + color: black; + font-size: 16px; + margin-top: 34px; + text-align: center; } -.proTitles { - margin: 0; - padding: 0; - font-size: 16px; - text-align: center; - font-weight: bolder; - color: white; - margin-top: -33px; - } - - .Text { - margin: 0; - padding: 0; - text-align: center; - font-weight: bolder; - color: black; - font-size: 16px; - margin-top: 34px; - margin-bottom: 10px; - text-align: center; - } - - - - ion-thumbnail.menu-thumb{ - width:20px; - height:20px; - // margin-top: 5px !important; - } - - .profile{ - color: black !important; - // font-weight: bolder !important; - - } - - .gridService-en{ - margin-top: 87px; - border-radius: 10px; - margin-bottom: -49px; - margin-left: 30px; - margin-right: 30px; - } - .gridService-ar{ - margin-top: 87px; - border-radius: 10px; - margin-bottom: -49px; - margin-left: 17px; - margin-right: 17px; - } - - .columns{ - // margin: 10px; - // background: #0B4775; - // border-radius: 27px; - // padding-left: 30px; - // padding-right: 6px; - // padding-top: 19px; - // padding-bottom: 26px; - } - .columns-ar{ - // margin: 10px; - // background: #0B4775; - // border-radius: 27px; - // padding-left: 7px; - // padding-right: 3px; - // padding-top: 19px; - // padding-bottom: 26px; - } - - .service{ - font-size: 28px; - // font-weight: bolder; - color: white; - letter-spacing: 1px; - font-weight: bold; - } - .services{ - - 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: 20px; - color: white; - margin-right: 25px; - } - - .list{ - margin-left: 14px; - margin-right: 14px; - border-radius: 10px; - // background: white; - border:#bebbbb !important; - padding: 2px; - } - .p{ - color: black !important; - font-size: medium; - text-align: center; - border-bottom: rgb(190, 187, 187) solid 1px; - } - .itemline{ - border-bottom: rgb(190, 187, 187) solid 1px; - } - .itemlins{ - border-bottom: rgb(190, 187, 187) solid 1px; - margin-bottom: 209px; +.line{ + + padding-top: 0px !important; + /* margin-bottom: 0px; */ + /* margin: 0px; */ + border-right: 1px #c5c2c2 solid !important; + line-height: 10px !important; +} +.proTitles { + margin: 0; + padding: 0; + font-size: 16px; + text-align: center; + font-weight: bolder; + color: white; + margin-top: -33px; +} + + +.profileGrid{ + border: #bebbbb solid 1px; + border-radius: 9px; + padding: 0px; + margin-top: 54px; + margin-left: 10px; + margin-right: 10px; + margin-bottom: 10px; + color: black; + // font-weight: bold; + background: white; - } - .empName { - margin: 0; - padding: 0; - text-align: center; - font-weight: bolder; - color: black; - font-size: 16px; - margin-top: 38px; - - } - .empJob{ - - margin: 0; - padding: 0; - text-align: center; - color: black; - font-size: 16px; - margin-top: 4px; - - } - .arrow{ - width: 20px; - height: 22px !important; - } - .arrow-ar{ - float: left; - font-size: 25px; - color: grey; - -webkit-transform: rotate(180deg); - transform: rotate(180deg); - } - - .verticalLine { - width:1%; - height:50px; - background:white; - margin-top: 100%; - // margin-left: 10%; } -.service-row-en{ - width: 79%; - margin: -12px 0px 0px 35px; + + + +.lebl{ + + color: black; + font-size: 14px !important; + font-weight: bold !important; + padding-top: 9px; + padding-left: 5px; + } -.service-row-ar{ - width: 95%; - margin: -12px 0px 35px 0px; +.rowBolds{ + color: black !important; + font-size: 14px !important; + /* padding: 6px !important; */ + padding-bottom: 9px; + padding-left: 5px; + padding-top: 4px; + } \ 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 16b4fe15..c59b712d 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.ts +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.ts @@ -1,14 +1,11 @@ import { Component, OnInit } from '@angular/core'; -import { Platform, Events, MenuController } from '@ionic/angular'; import { CommonService } from 'src/app/hmg-common/services/common/common.service'; import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; import { AuthenticationService } from 'src/app/hmg-common/services/authentication/authentication.service'; import { AuthenticatedUser } from 'src/app/hmg-common/services/authentication/models/authenticated-user'; -import { PerformanceAppraisalResponse } from 'src/app/hmg-common/services/dashbored/performance-appraisal.response'; -import { DashboredService } from 'src/app/hmg-common/services/dashbored/dashbored.service'; -import { SharedDataService } from 'src/app/hmg-common/services/shared-data-service/shared-data.service'; +import { Events } from '@ionic/angular'; import { DomSanitizer } from '@angular/platform-browser'; -// import { DomSanitizer } from '@angular/platform-browser'; + @Component({ @@ -17,47 +14,35 @@ import { DomSanitizer } from '@angular/platform-browser'; styleUrls: ['./edit-profile.component.scss'], }) 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"; - user_image: any = '../assets/imgs/profile.png'; personalInfo: any; - appraisalArr :any =[]; - public performanceData: any=[]; - public static PERFORMANCE_DATA = 'perAppData'; - + setImage:any; + imageSrc: any = '../assets/imgs/profile.png'; + public direction: string; + // user_image: any = "../assets/imgs/profile.png"; constructor( public ts: TranslatorService, public cs: CommonService, public authService: AuthenticationService, - public DS :DashboredService, - public sharedData: SharedDataService, - public events: Events, + private events: Events, private sanitizer: DomSanitizer, - // 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); - - }); + ) { + this.direction = TranslatorService.getCurrentDirection(); + this.events.subscribe('img-change', displayImg => { + // alert("1 - profile home : "+displayImg); + //this.user_image = "data:image/png;base64"+displayImg; + this.setImage = this.sanitizer.bypassSecurityTrustUrl('data:Image/*;base64,'+displayImg); + this.imageSrc = this.sanitizer.bypassSecurityTrustUrl('data:Image/*;base64,'+displayImg); + + }); + } ngOnInit() { - this.getProfile(); + this.getProfile(); } - getProfile() { console.log('getProfile'); this.authService @@ -65,60 +50,27 @@ export class EditProfileComponent implements OnInit { .subscribe((user: AuthenticatedUser) => { if (user) { this.personalInfo = user; - this.User_name_Emp=this.personalInfo.EMPLOYEE_NAME; - this.User_Job_name=this.personalInfo.JOB_NAME; - if(this.cs.getUpdateImage().status){ - this.user_image =this.sanitizer.bypassSecurityTrustUrl('data:image/png;base64,'+this.cs.getUpdateImage().img); - }else{ - this.user_image = user.EMPLOYEE_IMAGE - ? 'data:image/png;base64,' + user.EMPLOYEE_IMAGE - : '../assets/imgs/profile.png'; - } console.log('name: '+ this.personalInfo.EMPLOYEE_NAME); console.log('user name: '+ user.EMPLOYEE_NAME); - console.log('name: '+ this.personalInfo.JOB_NAME); - console.log('job name: '+ user.JOB_NAME); - - }}); -} - -openEditprofile(){ - this.cs.openProfile(); -} - -openPerormance(){ - this.showPerformanceAppraisal(); - -} - -showPerformanceAppraisal(){ - this.DS.getPerformanceAppraisal(()=>{ - this.showPerformanceAppraisal(); - }).subscribe((result: PerformanceAppraisalResponse) => { - this.handlePerformanceAppraisalResult(result); - - }); -} - -private handlePerformanceAppraisalResult(result){ - if (this.cs.validResponse(result)) { - if (this.cs.hasData(result.GetPerformanceAppraisalList)) { - this.appraisalArr =result.GetPerformanceAppraisalList; - this.performanceData=[]; - - for(let i=0;i + -
-
-
- - -
- - -
-

{{personalInfo.EMPLOYEE_NAME}}

+
+
+
+ - - -
- + - -
-
- - - - - -
- - -
- - + +
+ + + + + + + + - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - + + + + - - + + + +
+
+
- - - - - - - - - - +
- - - - - - - - - + + + +

{{ts.trPK('userProfile','personal-informaion')}}

+
+
+ +

{{ts.trPK('userProfile','category')}}

+
+

part-time

+
+ +

{{ts.trPK('userProfile','address')}}

+
+

DR.Sulaiman Alhabib Medical Group

+
+ +

{{ts.trPK('userProfile','phone-no')}}

+
+

0567845661

+
+ +

{{ts.trPK('userProfile','busG')}}

+
+

CORP Cloud Solutions

+
+ +

{{ts.trPK('userProfile','payrol')}}

+
+

Cloud Solutions Payroll

+
+
+
- - - - - - - - - - - + + + + + + +

{{ts.trPK('general','basic-details')}}

+
+
- - - - - - - - - - + + + +
+
+
+ +

{{ts.trPK('general','full-name')}}

+
+

ENAD HILAL NASSER MOHAMMED

+
+ +

{{ts.trPK('general','marital-status')}}

+
+

Married

+
+ +

{{ts.trPK('general','birth_date')}}

+
+

01-FEB-1991

+
+ +

{{ts.trPK('general','civil-identity-number')}}

+
+

2093486013

+
+
- - - - - - - - - - - + + +

{{ts.trPK('general','basic-details')}}

+
- - - - - - - - - - + +

{{ts.trPK('general','effective-date')}}

+
- - - - - - - - - - - + +
-
+ +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + + + + + + + + + + + +

{{ts.trPK('general','other')}}

+
+ + +
+ + +
+ + +
+ + +
+ + +
+ +
+
+ + + + + + + +

{{ts.trPK('general','main-address')}}

+
+
+ + + + +
+
+ +

{{ts.trPK('general','address')}}

+
+

Riyadh

+
+ +

{{ts.trPK('general','street')}}

+
+

-

+
+ +

{{ts.trPK('general','area')}}

+
+

-

+
+ +

{{ts.trPK('general','p-o-box')}}

+
+

22617

+
+ +

{{ts.trPK('general','city')}}

+
+

Riyadh

+
+ +

{{ts.trPK('general','postal-code')}}

+
+

11416

+
+
+ + + +

{{ts.trPK('general','address')}}

+
+ + +

{{ts.trPK('general','effective-date')}}

+
+ +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+
+ + + - -
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + +
+
+
+ + +
+ +
+

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

+
+ + + + + + + + {{ts.trPK('userProfile','edit-profile')}} + + + + + + + + + + + {{ts.trPK('userProfile','performance-evaluation')}} + + + + +
+
--> + + + + + + + Cancel + + + + Update + + + + + \ No newline at end of file diff --git a/Mohem/src/app/profile/home/home.component.scss b/Mohem/src/app/profile/home/home.component.scss index e8143682..f23b9670 100644 --- a/Mohem/src/app/profile/home/home.component.scss +++ b/Mohem/src/app/profile/home/home.component.scss @@ -1,130 +1,1041 @@ -ion-col.colBold, ion-col.colBold > label{ - font-weight:bold; +.list-ios { + // margin-left: 0; + // margin-right: 0; + // margin-top: 32px; + // margin-bottom: 32px; + // background: var(--ion-item-background,var(--ion-background-color,#fff)); + margin-left: 0; + margin-right: 0; + margin-top: -15px; + margin-bottom: 32px; + border: 1px solid #d8d8d8; + background: var(--ion-item-background, var(--ion-background-color, #fff)); + border-radius: 10px; + padding-top: 60px; } -.colorBG{ +.header-toolbar-new { + --background: #269db8; +} +.colorBG { --background: #f0efef; - } -.header-div{ - text-transform: capitalize; - background: #269DB8; +} +.header-div { + text-transform: capitalize; + background: #269db8; + display: block; + position: relative; + height: 113px; + margin-bottom: 60px; +} + +.profileImg { + width: 160px; + height: 160px; + display: -webkit-inline-box; + display: inline-flex; + overflow: hidden; + /* background: transparent; */ + border-radius: 78% !important; + position: relative; + top: 34px; + // background: white; + background: transparent; + margin-left: -3px; +} + +.proTitles { + margin: 0; + padding: 0; + font-size: 16px; + text-align: center; + font-weight: bolder; + color: white; + margin-top: -33px; +} + +.Text { + margin: 0; + padding: 0; + text-align: center; + font-weight: bolder; + color: black; + font-size: 16px; + margin-top: 34px; + margin-bottom: 10px; + text-align: center; +} + +ion-thumbnail.menu-thumb { + width: 20px; + height: 20px; + // margin-top: 5px !important; +} + +.profile { + color: black !important; + // font-weight: bolder !important; +} + +.gridService-en { + // margin-top: 87px; + // border-radius: 10px; + margin-bottom: -49px; + // margin-left: 30px; + // margin-right: 30px; +} +.gridService-ar { + // margin-top: 87px; + // border-radius: 10px; + margin-bottom: -49px; + // margin-left: 17px; + // margin-right: 17px; +} + +.columns { + // margin: 10px; + // background: #0B4775; + // border-radius: 27px; + // padding-left: 30px; + // padding-right: 6px; + // padding-top: 19px; + // padding-bottom: 26px; +} +.columns-ar { + // margin: 10px; + // background: #0B4775; + // border-radius: 27px; + // padding-left: 7px; + // padding-right: 3px; + // padding-top: 19px; + // padding-bottom: 26px; +} + +.service { + font-size: 12px; + // font-weight: bolder; + color: white; + // letter-spacing: 1px; + font-weight: bold; +} +.services { + 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: 20px; + color: white; + margin-right: 25px; +} + +.list { + margin-left: 14px; + margin-right: 14px; + border-radius: 10px; + // background: white; + border: #bebbbb !important; + padding: 2px; +} +.p { + color: black !important; + font-size: medium; + text-align: center; + border-bottom: rgb(190, 187, 187) solid 1px; +} +.itemline { + border-bottom: rgb(190, 187, 187) solid 1px; +} +.itemlins { + border-bottom: rgb(190, 187, 187) solid 1px; + margin-bottom: 209px; +} +.empName { + margin: 0; + padding: 0; + text-align: center; + font-weight: bolder; + color: black; + font-size: 16px; + margin-top: 38px; +} +.empJob { + margin: 0; + padding: 0; + text-align: center; + color: black; + font-size: 16px; + margin-top: 4px; +} +.arrow { + width: 20px; + height: 22px !important; +} +.arrow-ar { + float: left; + font-size: 25px; + color: grey; + -webkit-transform: rotate(180deg); + transform: rotate(180deg); +} + +.verticalLine { + width: 1%; + height: 50px; + background: white; + margin-top: 100%; + // margin-left: 10%; +} + +.service-row-en { + width: 79%; + margin: -12px 0px 0px 35px; +} +.service-row-ar { + width: 95%; + margin: -12px 0px 35px 0px; +} + +ion-content { + --ion-background-color: whitesmoke; +} +ion-title { + color: white; + position: absolute; + top: 0; + text-align: center; + left: 15%; + right: 15%; + font-size: 0.5cm; + font-weight: bold; + height: 100%; + font-family: WorkSans-Regular; +} +.contentBg { + padding: 0px 20px; +} + +.contentBg:before { + position: absolute; + content: ""; + background: #269db8; + height: 140px; + width: 100%; + left: 0; + top: 0px; + z-index: 1; +} + +.user-info { + text-align: center; + margin-bottom: 15px; + .user-image-container { + position: relative; + width: 100%; + height: 24px; + justify-content: space-between; + display: flex; + margin: 0 auto; + align-items: center; + } + // position: relative; + // width: 80px; + // height: 80px; + // display: block; + // margin: 0 auto; + // &:before{ + // position: absolute; + // content: ""; + // width: 20px; + // height: 20px; + // border-radius: 20px; + // border: 1px solid white; + // top: 0; + // right: 0; + // background-color: red; + // z-index: 9; + // } + // &.present:before{ + // background-color: green !important; + // } +} + +@media screen and (min-width: 1px) and (max-width: 767px) { + .user-image { + position: relative; display: block; + width: 30%; + height: 100%; + border-radius: 80px; + /* border: 1px solid #ccc; */ + margin-top: -125px; + } +} +@media screen and (min-width: 768px) and (max-width: 1024px) { + .user-image { position: relative; - height: 160px; - margin-bottom: 60px; + display: block; + width: 30%; + height: 100%; + border-radius: 80px; + margin-bottom: 371px; } +} +h1 { + margin: 0; + padding: 0; + font-family: WorkSans-Bold; + font-size: 18px; + margin-bottom: 4px; +} +span { + font-size: 11px; + display: block; + // color: #888 +} -// .profileCont{ -// background-color: #d9d7d7 !important; +$actionBtnSize: 36px; +.user-actions { + text-align: center; + .action-button { + font-size: 11px; + font-weight: bold; + // white-space: nowrap; + // color: #888; + .action-button-icon { + width: $actionBtnSize; + height: $actionBtnSize; + border-radius: $actionBtnSize; + margin: 0 auto; + display: block; + background-color: #269db8; + line-height: $actionBtnSize; + margin-bottom: 3px; + img { + margin: 0 auto; + vertical-align: middle; + } + } + } +} +.employee-information-indetail { + background: white; + margin-top: 15px; + border-radius: 20px; + margin-bottom: 15px; + border-radius: 20px; + border: 1px solid #ccc; + ion-col { + padding: 15px; + // border-bottom: 1px solid #ccc; + } + h2 { + font-size: 13px; + // font-family: WorkSans-Bold; + margin: 0; + font-weight: bold; + color: rgb(128, 124, 124); + } + p { + font-size: 13px; + margin: 0; + font-family: WorkSans-Bold; + // margin-bottom: 10px; + } +} +.segments-container { + border-radius: 100px; + overflow: hidden; + margin-top: 15px; + background: white; + color: black; +} -.menubutton { - background: #f0ecec; - min-height: 39px; - width: 35px !important; - height: 20px; - border-radius: 50%; -} - - .changeIcon{ - /* background: #c1c1c1; */ - width: 21px; - /* height: 26px; */ - border-radius: 50% !important; - position: relative; - color: #7f8c8d; - height: 35px; - - - } - - .changeImgBtn{ +@media screen and (min-width: 1px) and (max-width: 767px) { + .active-Segment { + width: 11%; + max-width: 11%; + min-width: 11%; + height: 30% !important; + min-height: 36px; + padding-right: -10px; + border-radius: 50% !important; + margin-right: 22px; + margin-left: 22px; + background-color: #269db8; + } +} +@media screen and (min-width: 768px) and (max-width: 1024px) { + .active-Segment { + width: 11%; + max-width: 11%; + min-width: 11%; + height: 56% !important; + min-height: 68px; + padding-right: -10px; + border-radius: 50% !important; + margin-right: 62px; + margin-left: 45px; + background: #269db8 !important; + padding-left: 17px; + } +} + +@media screen and (min-width: 1px) and (max-width: 767px) { + .normal-Segment { + width: 11%; + max-width: 11%; + min-width: 11%; + height: 30% !important; + min-height: 36px; + padding-right: -10px; + border-radius: 50% !important; + margin-right: 22px; + margin-left: 22px; + background: #414040 !important; + } +} +@media screen and (min-width: 768px) and (max-width: 1024px) { + .normal-Segment { + width: 11%; + max-width: 11%; + min-width: 11%; + height: 56% !important; + min-height: 68px; + padding-right: -10px; + border-radius: 50% !important; + margin-right: 62px; + margin-left: 45px; + background: #414040 !important; + padding-left: 17px; + } +} + +@media screen and (min-width: 1px) and (max-width: 767px) { + .imgSize { position: absolute; - top: 80%; - left: 65%; + /* right: 15px; */ + top: 0; + bottom: 0; + left: 7px; + margin: auto; + height: 18px; } - .changeImgBtn-ar{ +} +@media screen and (min-width: 768px) and (max-width: 1024px) { + .imgSize { position: absolute; - top: 80%; - left: 66%; - } -.profileImg{ - width: 160px; - height: 160px; - display: -webkit-inline-box; - display: inline-flex; - overflow: hidden; - // background: transparent; - border-radius: 69% !important; + top: 0; + bottom: 0; + left: 9px; + margin: auto; + height: 28px; + } +} + +.colum-container { + padding: 15px; + border-bottom: 1px solid #ccc; +} +.img { + width: 100px; + height: 100px; + display: inline-flex; + overflow: hidden; + border-radius: 78% !important; + position: relative; + /* top: 34px; */ + background: transparent; + margin-left: 119%; +} +.img-ar { + width: 100px; + height: 100px; + display: inline-flex; + overflow: hidden; + border-radius: 78% !important; + position: relative; + /* top: 34px; */ + background: transparent; + margin-right: 119%; +} +///////////////////////// Team Members css //////////////////////@extend + +.filters-row { + margin-top: 10px; +} + +.search-dropdown { + background: #269db8; + ion-select { + .select-text { + margin-left: -10px; + } + .select-icon { + .select-icon-inner { + opacity: 1; + color: white; + margin-top: -1px; + } + } + } +} + +.input-container { + background: white; + ion-input { + border-bottom-color: transparent; + } +} + +.search-container { + margin-top: 15px; + ion-col { + background: white; + border-radius: 12px; + padding-right: 10px; + flex: none; + ion-icon { + margin-right: 3px; + font-size: 14px; + margin-left: 3px; + vertical-align: middle; + } + span { + font-size: 12px; + vertical-align: middle; + } + } +} + +/////////////////////////////////////////////////////// Attendance /////////////////////// +.header { + // margin-top: 20px; + margin-top: 1px; +} + +.slidPrev { + margin-left: 10px; + background: transparent; +} + +.slidNext { + background: transparent; + margin-top: -1px; + margin-left: 43px; +} +.activeArrow { + height: 20px; + width: 20px; + color: #269db8; +} +.disabledArrow { + height: 20px; + width: 20px; + color: gray; +} + +.activeArrow-ar { + height: 20px; + width: 20px; + color: #269db8; + margin-right: 275px; +} +.disabledArrow-ar { + height: 20px; + width: 20px; + color: gray; + /* margin-left: 136px; */ + margin-right: -251px; +} + +@media screen and (min-width: 1px) and (max-width: 767px) { + .result-graph { position: relative; - top: 34px; - // background: white; - background: transparent; + background: white; + // margin-top: 20px; + padding-bottom: 20px; + border-radius: 20px; + z-index: 1; + margin-bottom: 10px; + margin-top: 56px; + border-radius: 20px; + border: 1px solid #ccc; + padding-top: 12px; + width: 90%; + left: 5%; + } + .result-graph-ar { + position: relative; + background: white; + // margin-top: 20px; + padding-bottom: 20px; + border-radius: 20px; + z-index: 1; + margin-bottom: 10px; + margin-top: 56px; + border-radius: 20px; + border: 1px solid #ccc; + padding-top: 12px; + width: 90%; + right: 5%; + } } - .Text { - margin: 0; - padding: 0; - text-align: center; - font-weight: bolder; - color: black; - font-size: 16px; - margin-top: 34px; - text-align: center; +@media screen and (min-width: 768px) and (max-width: 1024px) { + .result-graph { + position: relative; + background: white; + // margin-top: 20px; + padding-bottom: 20px; + border-radius: 20px; + z-index: 1; + margin-bottom: 10px; + margin-top: 89px; + border-radius: 20px; + border: 1px solid #ccc; + padding-top: 114px !important; + width: 90%; + left: 5%; + } + + .result-graph-ar { + position: relative; + background: white; + // margin-top: 20px; + padding-bottom: 20px; + border-radius: 20px; + z-index: 1; + margin-bottom: 10px; + margin-top: 89px; + border-radius: 20px; + border: 1px solid #ccc; + padding-top: 114px !important; + width: 90%; + right: 5%; + } +} +.result-graph-attendence { + position: relative; + background: white; + // margin-top: 20px; + padding-bottom: 20px; + border-radius: 20px; + z-index: 1; + margin-bottom: 10px; + margin-top: 10px; + border-radius: 20px; + border: 1px solid #ccc; +} + +.request-heading { + text-align: left; + display: block; + padding-top: 8px; + margin-bottom: 10px; + margin-left: 10px; +} +.request-heading-ar { + text-align: right; + display: block; + padding-top: 8px; + margin-bottom: 10px; + margin-right: 12px; +} + +.result-text-container { + padding: 0; + margin: 0; + position: absolute; + left: 85%; + top: 50%; + display: block; + text-align: center; + transform: translate(-50%, -50%); + h2 { + font-size: 38px; + font-family: WorkSans-Bold; + margin: 0 auto; + line-height: 36px; } + span { + width: 125px; + display: block; + margin: 0 auto; + font-size: 12px; + font-family: workSans-Regular; + } +} +.today-graph { + // width: 100%; + max-height: 4cm; + display: block; + height: 132px; + width: 264px; + margin-left: 154px; +} + +.green-label { + font-size: 12px; + margin-top: -13px; +} + +.green-amount { + font-size: 17px; + font-family: WorkSans-Bold; + margin-top: -3px; +} + +.blue-label { + font-size: 12px; + margin-top: -13px; +} - .line{ +.blue-amount { + font-size: 17px; + font-family: WorkSans-Bold; + margin-top: -4px; +} + +.labelGrid { + background-color: white !important; + border-radius: 20px !important; + height: 88px !important; + border: 1px solid #d6d4d4; + position: relative; + padding: 10px; - padding-top: 0px !important; - /* margin-bottom: 0px; */ - /* margin: 0px; */ - border-right: 1px #c5c2c2 solid !important; - line-height: 10px !important; - + label { + font-size: 9px; + line-height: 11px !important; + display: block; } - .proTitles { + h2 { + font-size: 25px; + font-weight: bold; + display: block; + text-align: right; margin: 0; - padding: 0; - font-size: 16px; - text-align: center; - font-weight: bolder; - color: white; - margin-top: -33px; + position: absolute; + bottom: 0; + left: 0; + width: 100%; + padding: 10px; } +} +.bodyGrid { + margin-top: 7px !important; + margin-left: 15px !important; + margin-right: 15px !important; + background-color: white !important; + border-radius: 20px !important; + height: 321px !important; + border: 1px solid #d6d4d4 !important; +} - .profileGrid{ - border: #bebbbb solid 1px; - border-radius: 9px; - padding: 0px; - margin-top: 54px; - margin-left: 10px; - margin-right: 10px; - margin-bottom: 10px; - color: black; - // font-weight: bold; - background: white; +.attendance-information { + background: white; + border-radius: 20px; + padding: 9px; + font-weight: bolder; + // border-right: 1px solid rgb(221, 221, 221); + @media screen and (min-width: 300px) and (max-width: 359px) { + h2 { + padding: 0; + margin: 0; + font-size: 14px; + } + span { + font-size: 9px; + } } - + @media screen and (min-width: 360px) { + h2 { + padding: 0; + margin: 0; + font-size: 14px; + } + span { + font-size: 11px; + margin-bottom: 3px; + } + } +} + +.month-year-span { + font-size: 16px; + // font-family: WorkSans-Bold; + font-weight: bold; +} + +.green-label-container { + // border-top: 5px solid #269DB8; + // padding: 1px 0px; + // margin: 15px 0px + width: 12px; + height: 12px; + padding-right: -10px; + border-radius: 100%; + background-color: #269db8; +} + +.blue-label-container { + // border-top: 5px solid #292F42; + // padding: 1px 0px; + // margin: 15px 0px + width: 12px; + height: 12px; + padding-right: -10px; + border-radius: 100%; + background-color: #292f42; + margin-top: 30px; +} +.span-one { + // display: block; + // font-size: 12px; + // color: black; + display: block; + font-size: 12px; + color: black; + margin-left: 6px; + margin-top: -2px; + font-weight: bold; +} +.span-two { + // display: block; + // font-size: 22px; + display: block; + font-size: 12px; + color: black; + margin-left: 6px; + margin-top: -2px; + font-weight: bold; + font-family: WorkSans-Bold; +} - - .lebl{ +.spa-one { + // display: block; + // font-size: 12px; + // color: black; + display: block; + font-size: 12px; + color: black; + margin-left: 6px; + margin-top: 28px; + font-weight: bold; +} +.spa-two { + // display: block; + // font-size: 22px; + display: block; + font-size: 12px; + color: black; + margin-left: 6px; + margin-top: 28px; + font-weight: bold; + font-family: WorkSans-Bold; +} +.graph-container { + margin-left: -50px; + position: relative; + margin-right: 50px; +} +.label-container { + position: absolute; + // width: 20%; + // right: 30px; + top: 50%; + margin-top: -27px; + left: 20px; +} +.attendance-summary .attendance-information { + span { + height: 32px; + display: block; + line-height: 14px; + } + h2 { + // text-align: right; + // font-family: WorkSans-Bold; + font-weight: bolder; + font-size: 13px; + } +} - color: black; - font-size: 14px !important; - font-weight: bold !important; - padding-top: 9px; - padding-left: 5px; - +.calendar-container { + background: white; + margin-bottom: 100px; + margin-top: 10px; + border-radius: 20px; + border: 1px solid #ccc; + padding-bottom: 25px; + span { + text-align: left; + display: block; + padding-top: 8px; + margin-bottom: 10px; + margin-left: 10px; + } +} +.calendar-container-ar { + background: white; + margin-bottom: 100px; + margin-top: 20px; + border-radius: 20px; + span { + text-align: right; + display: block; + padding-top: 8px; + margin-bottom: 6px; + margin-right: 12px; } - .rowBolds{ - color: black !important; - font-size: 14px !important; - /* padding: 6px !important; */ - padding-bottom: 9px; - padding-left: 5px; - padding-top: 4px; +} + +.Boldtext { + font-size: 13px; + font-family: WorkSans-Bold; + color: black !important; + display: block !important; + // line-height: 0px !important; +} + +.attendence { + position: relative; + background: white; + border-radius: 20px; + border: 1px solid #ccc; +} + +.attendence-text { + margin-bottom: 1px; + margin-left: 10px; + font-family: WorkSans-Bold; + font-size: 16px; +} +.stats { + color: #289db8; + font-size: 9px; + margin-right: 5px; + font-family: "WorkSans-Bold"; +} + +.text { + font-size: 16px; + font-weight: bolder; + font-family: "WorkSans-Bold"; + margin-top: 27px; +} + +.number { + width: 20px; + height: 20px; + padding-right: -10px; + border-radius: 100%; + background-color: #269db8; + z-index: 9; + margin-top: 26px; +} - } \ No newline at end of file +.numberEmp { + color: white; + font-size: 13px; + font-weight: bolder; + margin-left: 6px; +} + +.slider-container { + padding-bottom: 20px; +} + +.filters-row { + margin-top: 10px; + margin-left: 20px; +} + +.disable-filter { + pointer-events: none; + opacity: 0.3; +} + +.header-background-style-card { + padding-top: 1px; + background: #269db8; + height: 15%; +} + +.text-years { + text-align: center; + width: 58px; +} + +.grid-card { + right: 5px; + position: relative; + display: block; + z-index: 5; + width: 103%; +} + +.grid-card-ar { + left: 5px; + position: relative; + display: block; + z-index: 5; + width: 103%; +} + +.changeImgBtn { + position: absolute; + left: 60%; + bottom: 150%; +} +.changeImgBtn-ar { + position: absolute; + left: 60%; + bottom: 150%; +} +.menubutton { + background: #f0ecec; + min-height: 25px; + width: 24px !important; + height: 20px; + border-radius: 50%; +} + +.changeIcon { + bottom: 6px; + width: 10px; + border-radius: 50% !important; + position: relative; + color: #7f8c8d; + height: 35px; +} + +.card-style-details-info { + background: white; + // margin-top: 20px; + padding-bottom: 20px; + border-radius: 20px; + z-index: 1; + margin-bottom: 10px; + margin-top: 56px; + border-radius: 20px; + border: 1px solid #ccc; + padding-top: 12px; + width: 90%; + left: 5%; +} + +.login-input { + border: none; +} diff --git a/Mohem/src/app/profile/home/home.component.ts b/Mohem/src/app/profile/home/home.component.ts index befdf290..805a3499 100644 --- a/Mohem/src/app/profile/home/home.component.ts +++ b/Mohem/src/app/profile/home/home.component.ts @@ -1,45 +1,68 @@ import { Component, OnInit } from '@angular/core'; +import { Platform, Events, MenuController, ModalController } from '@ionic/angular'; import { CommonService } from 'src/app/hmg-common/services/common/common.service'; import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; import { AuthenticationService } from 'src/app/hmg-common/services/authentication/authentication.service'; import { AuthenticatedUser } from 'src/app/hmg-common/services/authentication/models/authenticated-user'; -import { Events } from '@ionic/angular'; +import { PerformanceAppraisalResponse } from 'src/app/hmg-common/services/dashbored/performance-appraisal.response'; +import { DashboredService } from 'src/app/hmg-common/services/dashbored/dashbored.service'; +import { SharedDataService } from 'src/app/hmg-common/services/shared-data-service/shared-data.service'; import { DomSanitizer } from '@angular/platform-browser'; +import { EditDetailProfileComponent } from '../modal/edit-detail-profile/edit-detail-profile.component'; @Component({ selector: 'app-home', templateUrl: './home.component.html', styleUrls: ['./home.component.scss'] }) export class HomeComponent implements OnInit { - personalInfo: any; - setImage:any; - imageSrc: any = '../assets/imgs/profile.png'; + + + User_name_Emp: string = ''; + User_Job_name: string; public direction: string; - // user_image: any = "../assets/imgs/profile.png"; + private menu: MenuController; + setImage: any; + // imageSrc: any = "../assets/imgs/profile.png"; + user_image: any = '../assets/imgs/profile.png'; + personalInfo: any; + appraisalArr: any = []; + public performanceData: any = []; + public static PERFORMANCE_DATA = 'perAppData'; + + public personalInfoSegment = true; + public basicDetailsSegment = false; + public addressSegment = false; + + public editBasic = false; + public editAddress = false; + constructor( public ts: TranslatorService, public cs: CommonService, public authService: AuthenticationService, - private events: Events, + public DS: DashboredService, + public sharedData: SharedDataService, + public events: Events, private sanitizer: DomSanitizer, - + public modalController: ModalController + // private events: Events, + // private sanitizer: DomSanitizer, ) { this.direction = TranslatorService.getCurrentDirection(); this.events.subscribe('img-change', displayImg => { - // alert("1 - profile home : "+displayImg); - //this.user_image = "data:image/png;base64"+displayImg; - this.setImage = this.sanitizer.bypassSecurityTrustUrl('data:Image/*;base64,'+displayImg); - this.imageSrc = this.sanitizer.bypassSecurityTrustUrl('data:Image/*;base64,'+displayImg); - + console.log('app compont: ' + displayImg); + this.user_image = this.sanitizer.bypassSecurityTrustUrl('data:Image/*;base64,' + displayImg); + }); - + } ngOnInit() { this.getProfile(); } + getProfile() { console.log('getProfile'); this.authService @@ -47,28 +70,122 @@ export class HomeComponent implements OnInit { .subscribe((user: AuthenticatedUser) => { if (user) { this.personalInfo = user; - console.log('name: '+ this.personalInfo.EMPLOYEE_NAME); - console.log('user name: '+ user.EMPLOYEE_NAME); - - if(this.cs.getUpdateImage().status){ - // this.imageSrc = this.sanitizer.bypassSecurityTrustUrl("data:Image/*;base64,"+this.cs.getUpdateImage().img); - this.imageSrc =this.sanitizer.bypassSecurityTrustUrl('data:image/png;base64,'+this.cs.getUpdateImage().img); - }else{ - this.imageSrc = user.EMPLOYEE_IMAGE - ? 'data:image/png;base64,' + user.EMPLOYEE_IMAGE - : this.imageSrc; - console.log('2-'+user); - } - } - else { - console.log('3-'+user); + this.User_name_Emp = this.personalInfo.EMPLOYEE_NAME; + this.User_Job_name = this.personalInfo.JOB_NAME; + if (this.cs.getUpdateImage().status) { + this.user_image = this.sanitizer.bypassSecurityTrustUrl('data:image/png;base64,' + this.cs.getUpdateImage().img); + } else { + this.user_image = user.EMPLOYEE_IMAGE + ? 'data:image/png;base64,' + user.EMPLOYEE_IMAGE + : '../assets/imgs/profile.png'; + } + console.log(user); + console.log(this.personalInfo); + console.log('name: ' + this.personalInfo.EMPLOYEE_NAME); + console.log('user name: ' + user.EMPLOYEE_NAME); + console.log('name: ' + this.personalInfo.JOB_NAME); + console.log('job name: ' + user.JOB_NAME); + + } }); } + openEditprofile() { + this.cs.openProfile(); + } + + openPerormance() { + this.showPerformanceAppraisal(); + + } + + showPerformanceAppraisal() { + this.DS.getPerformanceAppraisal(() => { + this.showPerformanceAppraisal(); + }).subscribe((result: PerformanceAppraisalResponse) => { + this.handlePerformanceAppraisalResult(result); - public ChangeImage() { - this.cs.openChangeImagePage(); + }); + } + + private handlePerformanceAppraisalResult(result) { + if (this.cs.validResponse(result)) { + if (this.cs.hasData(result.GetPerformanceAppraisalList)) { + this.appraisalArr = result.GetPerformanceAppraisalList; + this.performanceData = []; + + for (let i = 0; i < this.appraisalArr.length; i++) { + this.performanceData.push({ name: this.appraisalArr[i].APPRAISAL_YEAR, value: parseInt(this.appraisalArr[i].APPRAISAL_SCORE).toFixed() }); + } + console.log('PerformanceAppraisalResponse'); + 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); + + } + } + } + + selectedSegment(segmentData){ + switch (segmentData){ + case "personal": + this.personalInfoSegment = true; + this.basicDetailsSegment = false; + this.addressSegment = false; + this.editBasic = false; + this.editAddress = false; + break; + case "basic": + this.personalInfoSegment = false; + this.basicDetailsSegment = true; + this.addressSegment = false; + this.editBasic = false; + this.editAddress = false; + break; + case "address": + this.personalInfoSegment = false; + this.basicDetailsSegment = false; + this.addressSegment = true; + this.editBasic = false; + this.editAddress = false; + break; + } + } + + allowEdit(allowVal){ + switch(allowVal){ + case 1: + this.editBasic = true; + break; + case 2: + this.editAddress = true; + break; + } + } + + disableEdit(disableVal){ + switch(disableVal){ + case 1: + this.editBasic = false; + break; + case 2: + this.editAddress = false; + break; + } + + } + + + async presentModal() { + const modal = await this.modalController.create({ + component: EditDetailProfileComponent, + cssClass: 'my-custom-modal-css' + }); + return await modal.present(); } } diff --git a/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.html b/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.html new file mode 100644 index 00000000..b6dbd408 --- /dev/null +++ b/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.html @@ -0,0 +1,39 @@ + + +

+ {{ts.trPK('general','type-of-change')}}

+
+ + + + + + +

{{ts.trPK('general','correct-or-complete')}}

+ +
+ + + +

{{ts.trPK('general','new-info')}}

+
+ +
+ +
+
+ + + + + + {{ts.trPK('userProfile','cancel-text')}} + + + + {{ts.trPK('general','next')}} + + + + +
\ No newline at end of file diff --git a/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.scss b/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.scss new file mode 100644 index 00000000..38c1b5ac --- /dev/null +++ b/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.scss @@ -0,0 +1,3 @@ +ion-label{ + white-space: normal; +} \ No newline at end of file diff --git a/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.spec.ts b/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.spec.ts new file mode 100644 index 00000000..588a31d3 --- /dev/null +++ b/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.spec.ts @@ -0,0 +1,27 @@ +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { EditDetailProfileComponent } from './edit-detail-profile.component'; + +describe('EditDetailProfileComponent', () => { + let component: EditDetailProfileComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ EditDetailProfileComponent ], + schemas: [CUSTOM_ELEMENTS_SCHEMA], + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(EditDetailProfileComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.ts b/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.ts new file mode 100644 index 00000000..13dc6ec2 --- /dev/null +++ b/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.ts @@ -0,0 +1,30 @@ +import { Component, OnInit } from '@angular/core'; +import { ModalController } from '@ionic/angular'; +import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; + +@Component({ + selector: 'app-edit-detail-profile', + templateUrl: './edit-detail-profile.component.html', + styleUrls: ['./edit-detail-profile.component.scss'], +}) +export class EditDetailProfileComponent implements OnInit { + + + constructor( + public modalController: ModalController, + public ts: TranslatorService, + ) { } + + colorRadio = "#269db8" + + ngOnInit() {} + + dismiss() { + // using the injected ModalController this page + // can "dismiss" itself and optionally pass back data + this.modalController.dismiss({ + 'dismissed': true + }); + } + +} diff --git a/Mohem/src/app/profile/profile.module.ts b/Mohem/src/app/profile/profile.module.ts index c1bd6191..c77c723e 100644 --- a/Mohem/src/app/profile/profile.module.ts +++ b/Mohem/src/app/profile/profile.module.ts @@ -15,6 +15,7 @@ import {EditProfileComponent} from './edit-profile/edit-profile.component'; import {ProfileImageComponent} from './profile-image/profile-image.component' import {PerformanceEvaluationComponent} from './performance-evaluation/performance-evaluation.component' import { from } from 'rxjs'; +import { EditDetailProfileComponent } from './modal/edit-detail-profile/edit-detail-profile.component'; const routes: Routes = [ { @@ -70,9 +71,9 @@ const routes: Routes = [ IonicModule, HmgCommonModule, NgxChartsModule, - RouterModule.forChild(routes) ], - declarations: [ProfilePage , HomeComponent,ProfileImageComponent,EditProfileComponent,PerformanceEvaluationComponent] + declarations: [ProfilePage ,EditDetailProfileComponent, HomeComponent,ProfileImageComponent,EditProfileComponent,PerformanceEvaluationComponent], + entryComponents:[EditDetailProfileComponent] }) export class ProfilePageModule {} diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 1379abef..5c39b1f6 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -361,6 +361,10 @@ "en": "Nationality", "ar": "الجنسية" }, + "religion":{ + "en":"Religion", + "ar":"الديانة" + }, "empty": { "en": "Sorry no data avaiable", "ar": "لا يوجد بيانات" @@ -427,7 +431,7 @@ }, "other": { "en": "Other", - "ar": "أخري" + "ar": "أخرى" }, "provide-missing": { "en": "Please provide required information", @@ -956,6 +960,50 @@ "appreciate-service": { "en": "We appreciate you for completing the service of", "ar": "نحن نقدر لك استكمال خدمة" + }, + "basic-details":{ + "en":"Basic Details", + "ar":"المعلومات الاساسية" + }, + "full-name":{ + "en":"Full Name", + "ar":"الاسم كامل" + }, + "marital-status":{ + "en":"Marital Status", + "ar":"الاحالة الاجتماعية" + }, + "civil-identity-number":{ + "en":"Civil identity number", + "ar":"رقم الهوية المدنية" + }, + "effective-date":{ + "en":"Effective Date", + "ar":"تاريخ الفعالية " + }, + "gender":{ + "en":"Gender", + "ar":"النوع" + }, + "education-level":{ + "en":"Education Level", + "ar":"المستوى التعليمي" + }, + "main-address":{ + "en":"Main Address", + "ar":"العنوان الرئيسي" + }, + "correct-or-complete":{ + "en":"correct or complete the current details", + "ar":"تعديل او اكمال التفاصيل الحالية" + }, + "new-info":{ + "en":"enter new Information because of a real change to the current details (e.g because of a change in marital status)", + "ar":"أدخل معلومات جديدة بسبب تغيير حقيقي في التفاصيل الحالية (على سبيل المثال بسبب تغيير في الحالة الاجتماعية)" + }, + "type-of-change":{ + "en":" Select the type of change you want to make.", + "ar":" حدد نوع التغيير الذي تريد القيام به." } }, "home": { @@ -1242,6 +1290,62 @@ "successChange": { "en": "Profile Photo changed successfully ", "ar": "تم تغيير الصورة الشخصية بنجاح" + }, + "personal-informaion":{ + "en":"Personal Informaion", + "ar":"المعلومات الشخصية" + }, + "family-name":{ + "en":"Family Name", + "ar":"اسم العائلة" + }, + "preferred-name":{ + "en":"Preferred Name", + "ar":"الاسم المفضل" + }, + "previous-family-name":{ + "en":"Previous Family Name", + "ar":"اسم العائلة السابق" + }, + "father-name":{ + "en":"Father Name<", + "ar":"اسم الاب" + }, + "grand-father-name":{ + "en":"GrandFather Name", + "ar":"اسم الجد" + }, + "arabic-first-name":{ + "en":"Arabic First Name", + "ar":"الاسم الاول بالعربي" + }, + "arabic-father-name":{ + "en":"Arabic Father Name", + "ar":"اسم الاب بالعربي" + }, + "arabic-grand-father-name":{ + "en":"Arabic GrandFather Name", + "ar":"اسم الجد بالعربي" + }, + "street":{ + "en":"Street", + "ar":"شارع" + }, + "area":{ + "en":"Area", + "ar":"المنطقة" + }, + "p-o-box":{ + "en":"P.O Box", + "ar":"صندوق البريد" + }, + "city":{ + "en":"City", + "ar":"المدينة" + }, + "postal-code":{ + "en":"Postal Code", + "ar":"الرمز البريدي" } }, "changePassword": { diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index e47b5f2f..f2d975f2 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -1584,4 +1584,4 @@ ion-segment-button { background: #fff; width: 75%; margin: auto; - } \ No newline at end of file + }