From aa3b22c65f5c6bb15ad6b2d2abfd15c4adf799ea Mon Sep 17 00:00:00 2001 From: Mazdak Gibran <141390141+mazdakgibran@users.noreply.github.com> Date: Thu, 15 Jan 2026 14:46:59 +0500 Subject: [PATCH 1/2] Update change-password.component.html --- .../change-password.component.html | 57 +++++++++---------- 1 file changed, 26 insertions(+), 31 deletions(-) diff --git a/src/app/user-management/change-password/change-password.component.html b/src/app/user-management/change-password/change-password.component.html index 663e705..7b66156 100644 --- a/src/app/user-management/change-password/change-password.component.html +++ b/src/app/user-management/change-password/change-password.component.html @@ -96,8 +96,8 @@ {{ 'oldPassword' | translate }}* -
-
+
+
-
+
+
{{ 'fieldRequired' | translate }} @@ -120,22 +121,19 @@ {{ 'enterNewPassword' | translate }}* -
- - - - - -
-
+
+
+ + +
+ + +
{{ newPasswordError$ | translate }}
+
@@ -147,22 +145,19 @@ {{ 'confirmPassword' | translate }}* -
- - - - - -
-
+
+
+ + +
+ +
{{ confirmPasswordError$ | translate }}
+
+
From 3ac1eb2bd928c3d99ed5a91593a72a2884fe2158 Mon Sep 17 00:00:00 2001 From: Mazdak Gibran <141390141+mazdakgibran@users.noreply.github.com> Date: Thu, 15 Jan 2026 15:58:19 +0500 Subject: [PATCH 2/2] show username in header --- .../components/header/header.component.html | 10 +++++----- .../shared/components/header/header.component.ts | 15 +++++++-------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/app/shared/components/header/header.component.html b/src/app/shared/components/header/header.component.html index ba7379a..336b23f 100644 --- a/src/app/shared/components/header/header.component.html +++ b/src/app/shared/components/header/header.component.html @@ -44,14 +44,14 @@
-
- +
- +
{{ 'logout' | translate }} diff --git a/src/app/shared/components/header/header.component.ts b/src/app/shared/components/header/header.component.ts index b6dd633..c8503ec 100644 --- a/src/app/shared/components/header/header.component.ts +++ b/src/app/shared/components/header/header.component.ts @@ -1,4 +1,4 @@ -import { Component, HostListener, Inject, PLATFORM_ID } from '@angular/core'; +import { Component, HostListener, Inject, OnInit, PLATFORM_ID } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { SidebarService } from '../../../services/sidebar.service'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; @@ -12,7 +12,7 @@ import { AuthenticationService } from '../../../services/authenticate.service'; templateUrl: './header.component.html', styleUrl: './header.component.scss' }) -export class HeaderComponent { +export class HeaderComponent implements OnInit{ isDropdownVisible: boolean; isVacDropdownVisible: boolean; isNotificationsVisible: boolean; @@ -25,9 +25,9 @@ export class HeaderComponent { }, ]; direction: string = 'ltr'; - userString; - user; - username; + user: any; + userObj: any; + username : string = ''; mismatchedDates: string = ""; dateColor = "black"; date: any; @@ -42,9 +42,6 @@ export class HeaderComponent { this.isDropdownVisible = false; this.isVacDropdownVisible = false; this.isNotificationsVisible = false; - this.userString = this.storageService.getItem('user'); - this.user = JSON.parse(this.userString as string); - this.username = this.user?.username; this.date = new Date().toISOString().split('T')[0]; } ngOnInit(): void { @@ -57,6 +54,8 @@ export class HeaderComponent { this.storageService.setItem('sidebarState', isCollapsed ? 'expanded' : 'collapsed'); } } + this.userObj = JSON.parse(this.storageService.getItem('user') || '{}'); + this.username = this.userObj?.user?.userFullname ?? ''; } ngAfterViewInit(): void {