fixed and revamped first time change password screen logic

GBRSP/UX-1599
atif118-mfsys 7 days ago
parent 72d5d08828
commit 966f0d59bc

@ -30,7 +30,7 @@
</a> </a>
</li> </li>
<li> <li>
<a routerLink="/home/changePassword" routerLinkActive="mm-active" (click)="navigateToChangePassword()" style="cursor: pointer"> <a routerLink="/home/changePassword" routerLinkActive="mm-active" style="cursor: pointer">
<span> {{ 'changePassword' | translate }}</span> <span> {{ 'changePassword' | translate }}</span>
</a> </a>
</li> </li>

@ -100,10 +100,5 @@ export class SideNavComponent {
this.storageService.setItem('currentSubModule', lastRoutePart); this.storageService.setItem('currentSubModule', lastRoutePart);
} }
} }
navigateToChangePassword() {
this.router.navigate(['/home/changePassword'], {
state: { fromMenu: true }
});
}
} }

@ -59,6 +59,7 @@
</div> </div>
</div> </div>
</div> </div>
<div *ngIf="!isFirstLogin" class="full-width-page"> <div *ngIf="!isFirstLogin" class="full-width-page">
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">

@ -41,12 +41,16 @@ passwordType2: string = 'password';
} }
ngOnInit(): void { ngOnInit(): void {
const fromMenu = history.state?.['fromMenu']; this.checkIfFirstTimeChangePasswordOrNot();
if(fromMenu){ }
checkIfFirstTimeChangePasswordOrNot(){
let currentUser: any = JSON.parse(this.storageService.getItem('user')!)
if(currentUser.user.isFirstLogin){
this.isFirstLogin = true;
}
else{
this.isFirstLogin = false; this.isFirstLogin = false;
}else{
const firstLoginFlag = this.storageService.getItem('firstLogin');
this.isFirstLogin = firstLoginFlag === 'true';
} }
} }

Loading…
Cancel
Save