From 2397fc1482b841e419759ea5254930964aba1bf1 Mon Sep 17 00:00:00 2001 From: ashwaq Date: Mon, 9 Mar 2020 14:59:38 +0300 Subject: [PATCH] fix bug --- .../change-password.component.html | 23 +++++--- .../change-password.component.scss | 4 ++ .../change-password.component.ts | 52 ++++++++++++++++++- .../services/common/common.service.ts | 4 ++ .../worklist-main/worklist-main.component.ts | 1 + 5 files changed, 76 insertions(+), 8 deletions(-) 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 29eb0d85..9e7c2ecb 100644 --- a/Mohem/src/app/authentication/change-password/change-password.component.html +++ b/Mohem/src/app/authentication/change-password/change-password.component.html @@ -27,33 +27,42 @@ - +

{{'changePassword,newPassword' | translate}}

- - + + + - +
- + +
\ No newline at end of file diff --git a/Mohem/src/app/authentication/change-password/change-password.component.scss b/Mohem/src/app/authentication/change-password/change-password.component.scss index baffb4ff..727737ed 100644 --- a/Mohem/src/app/authentication/change-password/change-password.component.scss +++ b/Mohem/src/app/authentication/change-password/change-password.component.scss @@ -29,3 +29,7 @@ width: 315px; } +.disabledButton{ + opacity:.5; + +} 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 455ffffb..c7449268 100644 --- a/Mohem/src/app/authentication/change-password/change-password.component.ts +++ b/Mohem/src/app/authentication/change-password/change-password.component.ts @@ -12,6 +12,7 @@ import { SharedDataService } from 'src/app/hmg-common/services/shared-data-servi import {LoginComponent} from "src/app/authentication/login/login.component"; import { Password } from '../models/password'; import { AuthenticatedUser } from "src/app/hmg-common/services/authentication/models/authenticated-user"; +//import { FormBuilder, FormGroup, Validators } from '@angular/forms'; @Component({ selector: 'app-change-password', @@ -28,6 +29,11 @@ export class ChangePasswordComponent implements OnInit { userData: any = {}; public isExpiredPwd: boolean = false; + public NEW_PASSWORD: boolean = false; + public Confirm_NEW_PASSWORD: boolean = false; + public OLD_PASSWORD: boolean = false; + //public profile_form: FormGroup; + constructor( public cs: CommonService, public authService: AuthenticationService, @@ -36,7 +42,9 @@ export class ChangePasswordComponent implements OnInit { public ts: TranslatorService, public smsService: SmsReaderService, public changeDetector: ChangeDetectorRef, - public sharedData: SharedDataService) { + public sharedData: SharedDataService, + // public formBuilder: FormBuilder, + ) { console.log("change password constructor"); } @@ -48,6 +56,11 @@ export class ChangePasswordComponent implements OnInit { this.P_USER_NAME =data.P_USER_NAME; console.log(this.isExpiredPwd); console.log(this.P_USER_NAME); + + + // this.profile_form = this.formBuilder.group({ + // password: ['', Validators.compose([Validators.minLength(8)])] + // }); // this.authService // .loadAuthenticatedUser() // .subscribe((user: AuthenticatedUser) => { @@ -119,6 +132,43 @@ export class ChangePasswordComponent implements OnInit { } }); } + onChangeCNP(){ +// in UAT Alow to the length of password less than 8 +// so if we ready to go life change it to >= 8 + if (this.P_Confirm_NEW_PASSWORD.length >= 3) { + this.Confirm_NEW_PASSWORD=true; + + }else{ + this.Confirm_NEW_PASSWORD=false; + + } } + +onChangeNP(){ +// in UAT Alow to the length of password less than 8 +// so if we ready to go life change it to >= 8 + if (this.P_NEW_PASSWORD.length >= 3) { + this.NEW_PASSWORD=true; + +}else{ + this.NEW_PASSWORD=false; + +} + +} +onChangeOP(){ +// in UAT Alow to the length of password less than 8 +// so if we ready to go life change it to >= 8 + if (this.P_OLD_PASSWORD.length >= 3) { + this.OLD_PASSWORD=true; + +}else{ + this.OLD_PASSWORD=false; + +} + +} + +} diff --git a/Mohem/src/app/hmg-common/services/common/common.service.ts b/Mohem/src/app/hmg-common/services/common/common.service.ts index 08163c91..17992c66 100644 --- a/Mohem/src/app/hmg-common/services/common/common.service.ts +++ b/Mohem/src/app/hmg-common/services/common/common.service.ts @@ -1211,6 +1211,10 @@ public getMonthNameAr(value: number): string { public openPerformanceevaluation() { this.nav.navigateForward(["/profile/performanceevaluation"]); } + public eitUpdate() { + this.nav.navigateForward(["/eit/eit-update-list"]); + } + public navigatePage(path) { diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts index 916d0c59..5f15674a 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts @@ -542,6 +542,7 @@ export class WorklistMainComponent implements OnInit { EITNotificatonBodyResponse.NOT_WORKLIST ); // this.navCtrl.push("EitUpdateListPage"); + this.common.eitUpdate();// must be test } else if (this.getPassNotificationDetails.REQUEST_TYPE == "ABSENCE") { this.common.sharedService.setSharedData( this.notificationBodyRes,