Merge branch 'UAT' of https://mygit.myhr.co.th/angular/mySkill-x into UAT

# Conflicts:
#	src/app/components/performance-evaluation/pms-form-employee/pms-form-employee.component.html

src/app/authentication/login-page/login-page2.component.scss

@@ -7,7 +7,7 @@
     height: 100%;
     width: 100%;
     content: var(--tw-content);
-    background-image: url('/assets/img/loginform/bg_signup.png');
+    background-image: url('/assets/img/menu-bg-images/mySkillX_login_pic007.png');
     background-size: cover;
     background-repeat: no-repeat;
     // background-position: center;

src/app/components/performance-evaluation/pms-form-employee/pms-form-employee.component.html

@@ -28,7 +28,7 @@
                 <div class="flex flex-row gap-2"
                   [ngStyle]="{'justify-content': compentency.data.pms.gradeScore?'space-between':'center'}">
                   <div [ngClass]="{'w-full': !compentency.data.pms.gradeScore,'w-1/2':compentency.data.pms.gradeScore}">
-                    <img src="./assets/img/users/defaultperson.jpg"
+                    <img [src]="evaluationForm=='sup'?'./assets/img/users/woman2.PNG':'./assets/img/users/man.PNG'"
                       class="w-24 h-24 rounded-full ring-4 ring-white/10 mx-auto" id="profile-img" alt="profile-img" />
                   </div>
                   <div *ngIf="compentency.data.pms.gradeScore" class="w-1/2 flex flex-col justify-center"

src/app/shared/components/header/header.component.html

@@ -686,7 +686,7 @@
             <div class="header-profile hs-dropdown ti-dropdown" data-hs-dropdown-placement="bottom-right">
               <button id="dropdown-profile" type="button"
                 class="hs-dropdown-toggle ti-dropdown-toggle gap-2 p-0 flex-shrink-0 h-8 w-8 rounded-full shadow-none focus:ring-gray-400 text-xs dark:focus:ring-white/10">
-                <img *ngIf="employeeProfile?.picture && employeeProfile.picture !== ''; else defaultImage"
+                <!-- <img *ngIf="employeeProfile?.picture && employeeProfile.picture !== ''; else defaultImage"
                     class="inline-block rounded-full ring-2 h-full !ring-transparent"
                     [src]="employeeProfile.picture"
                     alt="Image Description" 
@@ -697,7 +697,11 @@
                     class="inline-block rounded-full ring-2 h-full !ring-transparent"
                     src="./assets/img/users/defaultperson.jpg"
                     alt="Image Description" />
-                </ng-template>
+                </ng-template> -->
+                <img
+                    class="inline-block rounded-full ring-2 h-full !ring-transparent"
+                    src="./assets/img/users/man.PNG"
+                    alt="Image Description" />
               </button>
 
               <div class="hs-dropdown-menu ti-dropdown-menu border-0 w-[20rem]" aria-labelledby="dropdown-profile">
@@ -705,7 +709,7 @@
                   <div class="ltr:mr-3 rtl:ml-3">
                     <!-- <img class="avatar shadow-none rounded-full h-full !ring-transparent" src="./assets/img/users/profile2.jpg"
                       alt="profile-img" /> -->
-                      <img *ngIf="employeeProfile?.picture && employeeProfile.picture !== ''; else defaultImage"
+                      <!-- <img *ngIf="employeeProfile?.picture && employeeProfile.picture !== ''; else defaultImage"
                         class="inline-block rounded-full ring-2 h-12 w-12 !ring-transparent"
                         [src]="employeeProfile.picture"
                         alt="Image Description" 
@@ -716,7 +720,11 @@
                         class="inline-block rounded-full ring-2 h-12 w-12 !ring-transparent"
                         src="./assets/img/users/defaultperson.jpg"
                         alt="Image Description" />
-                    </ng-template>
+                    </ng-template> -->
+                    <img
+                    class="inline-block rounded-full ring-2 h-full !ring-transparent"
+                    src="./assets/img/users/man.PNG"
+                    alt="Image Description" />
                   </div>
                   <div>
                     <p class="ti-dropdown-header-title !text-white">