diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index 22efebdf..f4f782cc 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -159,6 +159,14 @@ {{ts.trPK('userProfile','title')}} + + + + + + {{ts.trPK('userProfile','performance-evaluation')}} + + diff --git a/Mohem/src/app/authentication/business-card/business-card.component.html b/Mohem/src/app/authentication/business-card/business-card.component.html index 337ac9fb..efa14208 100644 --- a/Mohem/src/app/authentication/business-card/business-card.component.html +++ b/Mohem/src/app/authentication/business-card/business-card.component.html @@ -51,7 +51,8 @@ -->
https://hmgwebservices.com/images/Moheem/CS.jpg -

{{userInfo.name_en}}

+

{{userInfo.name_en}}

+

{{userInfo.name_ar}}

{{jobName}}
{{userInfo.mobile}}
{{userInfo.email}}
diff --git a/Mohem/src/app/authentication/business-card/business-card.component.ts b/Mohem/src/app/authentication/business-card/business-card.component.ts index 9b9217c3..a4763dde 100644 --- a/Mohem/src/app/authentication/business-card/business-card.component.ts +++ b/Mohem/src/app/authentication/business-card/business-card.component.ts @@ -15,6 +15,7 @@ export class BusinessCardComponent implements OnInit { public userInfo: any; public userJobName: any; public jobName: any; + direction: string; constructor( public modalCtrl: ModalController, public ts: TranslatorService, @@ -24,6 +25,8 @@ export class BusinessCardComponent implements OnInit { ngOnInit() { this.userInfo = JSON.parse(localStorage.getItem('bussiness-card-info')); + this.direction = TranslatorService.getCurrentLanguageName(); + console.log(this.userInfo); this.authService .loadAuthenticatedUser() diff --git a/Mohem/src/app/authentication/change-password/change-password.component.html b/Mohem/src/app/authentication/change-password/change-password.component.html index 011785e1..08f78917 100644 --- a/Mohem/src/app/authentication/change-password/change-password.component.html +++ b/Mohem/src/app/authentication/change-password/change-password.component.html @@ -17,9 +17,11 @@

{{'changePassword,newPassword' | translate}}

@@ -27,19 +29,23 @@ diff --git a/Mohem/src/app/authentication/change-password/change-password.component.ts b/Mohem/src/app/authentication/change-password/change-password.component.ts index 0921fdd3..5df74099 100644 --- a/Mohem/src/app/authentication/change-password/change-password.component.ts +++ b/Mohem/src/app/authentication/change-password/change-password.component.ts @@ -33,6 +33,9 @@ export class ChangePasswordComponent implements OnInit { public NEW_PASSWORD: boolean = false; public Confirm_NEW_PASSWORD: boolean = false; public OLD_PASSWORD: boolean = false; + public currentPasswordIcon = 'password'; + public newPasswordIcon = 'password'; + public confirmPasswordIcon = 'password'; public recentPasswordNote = { yellowImg: '../assets/imgs/mohemm-action/info.png', @@ -345,4 +348,26 @@ export class ChangePasswordComponent implements OnInit { } else { return true; } } + showPassword(val) { + if (val === 1) + this.newPasswordIcon = 'password'; + else if (val === 2) { + this.confirmPasswordIcon = 'password' + } + else { + this.currentPasswordIcon = 'password'; + } + } + + hidePassword(val) { + if (val === 1) + this.newPasswordIcon = 'text'; + else if (val === 2) { + this.confirmPasswordIcon = 'text' + } + else { + this.currentPasswordIcon = 'text'; + } + } + } diff --git a/Mohem/src/app/authentication/forgot/forgot.component.html b/Mohem/src/app/authentication/forgot/forgot.component.html index 1c312f0a..0a535673 100644 --- a/Mohem/src/app/authentication/forgot/forgot.component.html +++ b/Mohem/src/app/authentication/forgot/forgot.component.html @@ -25,19 +25,23 @@ @@ -52,6 +56,10 @@

{{isUpperCase.text}}

--> + + +

{{isLetterCase.text}}

+

{{isHasDigit.text}}

diff --git a/Mohem/src/app/authentication/forgot/forgot.component.ts b/Mohem/src/app/authentication/forgot/forgot.component.ts index 70785cba..9d9133e3 100644 --- a/Mohem/src/app/authentication/forgot/forgot.component.ts +++ b/Mohem/src/app/authentication/forgot/forgot.component.ts @@ -22,6 +22,8 @@ export class ForgotComponent implements OnInit { public P_Confirm_NEW_PASSWORD = ''; public P_USER_NAME: string; public logo = 'assets/icon/login/lock.png'; + public newPasswordIcon = "password"; + public confirmPasswordIcon = "password"; public recentPasswordNote = { yellowImg: '../assets/imgs/mohemm-action/info.png', text: this.ts.trPK('login', 'current-password-validation') @@ -261,8 +263,25 @@ export class ForgotComponent implements OnInit { disabledSubmitBtn() { if (this.isLetterCase.isMatch && this.isHasDigit.isMatch && this.isMinLength.isMatch && this.isRepeatedLetter.isMatch && this.P_NEW_PASSWORD !== '' && this.P_NEW_PASSWORD - && this.P_Confirm_NEW_PASSWORD && this.isContainSpecialChar && this.confirmMatchNew.isMatch) { + && this.P_Confirm_NEW_PASSWORD && this.isContainSpecialChar.isMatch && this.confirmMatchNew.isMatch) { return false; } else { return true; } } + + showPassword(val) { + if (val == 1) + this.newPasswordIcon = 'password'; + else { + this.confirmPasswordIcon = 'password' + } + } + + hidePassword(val) { + if (val == 1) + this.newPasswordIcon = 'text'; + else { + this.confirmPasswordIcon = 'text' + } + } + }