Merge branch 'DEV' of https://mygit.myhr.co.th/angular/myAppraisal into DEV

src/app/authentication/login-page/login-page.component.ts

@@ -13,7 +13,7 @@ export class LoginPageComponent {
   public showPassword = false;
   disabled = '';
   active: any;
-
+  errorUser = false
   constructor(@Inject(DOCUMENT)
   private document: Document,
     private elementRef: ElementRef,
@@ -103,17 +103,22 @@ export class LoginPageComponent {
       this.authservice.loginWithUserPass(this.loginForm.controls['username'].value,
         this.loginForm.controls['password'].value).subscribe({
           next: response => {
-            if(response){
+            if (response) {
+              this.errorUser = false
               sessionStorage.setItem("accessToken", response.accessToken)
               sessionStorage.setItem("refreshToken", response.refreshToken)
               this.router.navigate(['/self-evaluation']);
-          }
+            } else {
+              this.errorUser = true
+            }
           }, error: error => {
             this.error = 'Please check email and passowrd';
+            this.errorUser = true
           }
         })
     } else {
       this.error = 'Please check email and passowrd';
+      this.errorUser = true
     }
   }
 

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

@@ -74,9 +74,13 @@
                           </div>
                         </div> -->
                         <!-- End Checkbox -->
+                        <div *ngIf="errorUser" class="bg-danger/10 border border-danger/10 alert text-danger m-0"
+                          role="alert">
+                          กรุณาตรวจสอบชื่อสมาชิกและรหัสผ่าน
+                        </div>
                         <button type="submit" (click)="Submit()"
                           class="py-2 px-3 inline-flex justify-center items-center gap-2 rounded-sm border border-transparent font-semibold bg-primary text-white hover:bg-primary focus:outline-none focus:ring-0 focus:ring-primary focus:ring-offset-0 transition-all text-sm dark:focus:ring-offset-white/10">เข้าสู่ระบบ</button>
-                        <div class="text-center">
+                        <!-- <div class="text-center">
                           <p class="mt-3 text-sm text-gray-600 dark:text-white/70">
                             คุณมีบัญชีเเล้วหรือยัง?
                             <a class="text-primary decoration-2 hover:underline font-medium"
@@ -84,7 +88,7 @@
                               กรุณาลงทะเบียนที่นี่ หากคุณยังไม่มีบัญชีเข้าใช้
                             </a>
                           </p>
-                        </div>
+                        </div> -->
                       </div>
                     </form>
                   </div>

src/app/components/company-components/account-settings/manage-user/manage-user.component.html

@@ -145,12 +145,12 @@
                             Clear
                         </button>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="ti-modal-body padding-16px pt-0 overflow-y-0">

src/app/components/company-components/account-settings/set-a-password/set-a-password.component.html

@@ -144,12 +144,12 @@
                             Clear
                         </button>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="ti-modal-body padding-16px pt-0 overflow-y-0">

src/app/components/company-components/account-settings/user-settings/user-settings.component.html

@@ -203,12 +203,12 @@
                             Clear
                         </button>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="ti-modal-body padding-16px pt-0 overflow-y-0">

src/app/components/company-components/company-registration/branch-business-unit/department-list/department-list.component.html

@@ -41,12 +41,12 @@
                     Print
                 </button>
             </div>
-            <div class="px-1">
+            <!-- <div class="px-1">
                 <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                     <i class="ti ti-book fs-l"></i>
                     Help
                 </button>
-            </div>
+            </div> -->
         </div>
     </div>
 </div>
@@ -177,12 +177,12 @@
                             Clear
                         </button>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="ti-modal-body">
@@ -280,12 +280,12 @@
                             Clear
                         </button>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="ti-modal-body">

src/app/components/company-components/company-registration/branch-business-unit/department-register/department-register.component.html

@@ -39,12 +39,12 @@
                     Print
                 </button>
             </div>
-            <div class="px-1">
+            <!-- <div class="px-1">
                 <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                     <i class="ti ti-book fs-l"></i>
                     Help
                 </button>
-            </div>
+            </div> -->
         </div>
     </div>
 </div>
@@ -171,18 +171,19 @@
                             Clear
                         </button>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="ti-modal-body padding-16px pt-0 overflow-y-0">
                 <label for="input-label" class="ti-form-label mt-2rem">ฝ่าย<span class="text-danger">*</span></label>
                 <input type="text" id="input-label" class="ti-form-input w-1/2" [(ngModel)]="bu1.bu1id">
-                <label for="detail_th" class="ti-form-label mt-2rem">รายละเอียดฝ่าย (ไทย)<span class="text-danger">*</span></label>
+                <label for="detail_th" class="ti-form-label mt-2rem">รายละเอียดฝ่าย (ไทย)<span
+                        class="text-danger">*</span></label>
                 <input type="text" id="detail_th" class="ti-form-input h-16" [(ngModel)]="bu1.tdesc">
                 <label for="detail_eng" class="ti-form-label mt-2rem">รายละเอียดฝ่าย (อังกฤษ)</label>
                 <input type="text" id="detail_eng" class="ti-form-input h-16" [(ngModel)]="bu1.edesc">
@@ -238,19 +239,20 @@
                             Clear
                         </button>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="ti-modal-body ">
                 <label for="input-label" class="ti-form-label mt-2rem">ฝ่าย<span class="text-danger">*</span></label>
                 <input type="text" id="input-label" class="ti-form-input w-1/2 bg-input-readonly"
                     [(ngModel)]="bu1.bu1id" readonly>
-                <label for="detail_th" class="ti-form-label mt-2rem">รายละเอียดฝ่าย (ไทย)<span class="text-danger">*</span></label>
+                <label for="detail_th" class="ti-form-label mt-2rem">รายละเอียดฝ่าย (ไทย)<span
+                        class="text-danger">*</span></label>
                 <input type="text" id="detail_th" class="ti-form-input h-16" [(ngModel)]="bu1.tdesc">
                 <label for="detail_eng" class="ti-form-label mt-2rem">รายละเอียดฝ่าย (อังกฤษ)</label>
                 <input type="text" id="detail_eng" class="ti-form-input h-16" [(ngModel)]="bu1.edesc">

src/app/components/company-components/company-registration/branch-business-unit/section-registration/section-registration.component.html

@@ -40,12 +40,12 @@
                     Print
                 </button>
             </div>
-            <div class="px-1">
+            <!-- <div class="px-1">
                 <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                     <i class="ti ti-book fs-l"></i>
                     Help
                 </button>
-            </div>
+            </div> -->
         </div>
     </div>
 </div>
@@ -176,12 +176,12 @@
                             Clear
                         </button>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="ti-modal-body">
@@ -283,12 +283,12 @@
                             Clear
                         </button>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="ti-modal-body">

src/app/components/company-components/company-registration/branch-business-unit/sub-department-four/sub-department-four.component.html

@@ -41,12 +41,12 @@
                     Print
                 </button>
             </div>
-            <div class="px-1">
+            <!-- <div class="px-1">
                 <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                     <i class="ti ti-book fs-l"></i>
                     Help
                 </button>
-            </div>
+            </div> -->
         </div>
     </div>
 </div>
@@ -176,12 +176,12 @@
                             Clear
                         </button>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="ti-modal-body">
@@ -283,12 +283,12 @@
                             Clear
                         </button>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="ti-modal-body">

src/app/components/company-components/company-registration/branch-business-unit/sub-department-one/sub-department-one.component.html

@@ -41,12 +41,12 @@
                     Print
                 </button>
             </div>
-            <div class="px-1">
+            <!-- <div class="px-1">
                 <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                     <i class="ti ti-book fs-l"></i>
                     Help
                 </button>
-            </div>
+            </div> -->
         </div>
     </div>
 </div>
@@ -178,12 +178,12 @@
                             Clear
                         </button>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="ti-modal-body">
@@ -285,12 +285,12 @@
                             Clear
                         </button>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="ti-modal-body">

src/app/components/company-components/company-registration/branch-business-unit/sub-department-three/sub-department-three.component.html

@@ -41,12 +41,12 @@
                     Print
                 </button>
             </div>
-            <div class="px-1">
+            <!-- <div class="px-1">
                 <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                     <i class="ti ti-book fs-l"></i>
                     Help
                 </button>
-            </div>
+            </div> -->
         </div>
     </div>
 </div>
@@ -176,12 +176,12 @@
                             Clear
                         </button>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="ti-modal-body">
@@ -283,12 +283,12 @@
                             Clear
                         </button>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="ti-modal-body">

src/app/components/company-components/company-registration/branch-business-unit/sub-department-two/sub-department-two.component.html

@@ -41,12 +41,12 @@
                     Print
                 </button>
             </div>
-            <div class="px-1">
+            <!-- <div class="px-1">
                 <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                     <i class="ti ti-book fs-l"></i>
                     Help
                 </button>
-            </div>
+            </div> -->
         </div>
     </div>
 </div>
@@ -176,12 +176,12 @@
                             Clear
                         </button>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="ti-modal-body">
@@ -284,12 +284,12 @@
                             Clear
                         </button>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="ti-modal-body">

src/app/components/company-components/company-registration/company-registration-page/company-registration-page.component.html

@@ -58,12 +58,12 @@
                     Delete
                 </button>
             </div>
-            <div class="px-1">
+            <!-- <div class="px-1">
                 <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                     <i class="ti ti-book fs-l"></i>
                     Help
                 </button>
-            </div>
+            </div> -->
         </div>
     </div>
 </div>
@@ -202,12 +202,12 @@
                             Clear
                         </button>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="ti-modal-body padding-16px pt-0 overflow-y-0">

src/app/components/company-components/day-type-registry/day-type-registry.component.html

@@ -239,12 +239,12 @@
                             Clear
                         </button>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="ti-modal-body padding-16px pt-0 overflow-y-0">

src/app/components/company-components/job-description/employee-categories/employee-categories.component.html

@@ -205,12 +205,12 @@
                             Clear
                         </button>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="ti-modal-body" style="margin-top: 40px;">

src/app/components/company-components/job-description/employee-group-unit/employee-group-unit.component.html

@@ -203,12 +203,12 @@
                             Clear
                         </button>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="ti-modal-body ">

src/app/components/company-components/job-description/employee-level/employee-level.component.html

@@ -201,12 +201,12 @@
               Clear
             </button>
           </div>
-          <div class="px-1">
+          <!-- <div class="px-1">
             <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
               <i class="ti ti-book fs-l"></i>
               Help
             </button>
-          </div>
+          </div> -->
         </div>
       </div>
       <div class="ti-modal-body" style="margin-top: 40px;">

src/app/components/company-components/job-description/position/position-unit.component.html

@@ -203,12 +203,12 @@
                             Clear
                         </button>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="ti-modal-body ">

src/app/components/competency-assessment/competency-management/group-competencies/edit-group-competencies/edit-group-competencies.component.html

@@ -247,12 +247,12 @@
                             </div>
                         </div>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
                 <div class="overflow-auto table-bordered" style="border-radius: 5px;">
                     <div class="overflow-auto border">

src/app/components/competency-assessment/competency-management/group-competencies/group-competencies.component.html

@@ -21,12 +21,12 @@
                     import
                 </button>
             </div>
-            <div class="px-1">
+            <!-- <div class="px-1">
                 <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                     <i class="ti ti-book fs-l"></i>
                     Help
                 </button>
-            </div>
+            </div> -->
         </div>
     </div>
 

src/app/components/competency-assessment/competency-management/set-approvers/set-approvers.component.html

@@ -158,12 +158,12 @@
                             Clear
                         </button>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="ti-modal-body mt-1">
@@ -326,12 +326,12 @@
                             </div>
                         </div>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
                 <div class="overflow-auto table-bordered" style="border-radius: 5px;">
                     <div class="overflow-auto border">

src/app/components/competency-assessment/course-registration/development-course/development-course.component.html

@@ -236,12 +236,12 @@
                             Clear
                         </button>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="ti-modal-body mt-1">

src/app/components/competency-assessment/evaluation-cycle-manager/define-document-form/define-document-form.component.html

@@ -15,12 +15,12 @@
                     </div>
                 </div>
             </div>
-            <div class="px-1">
+            <!-- <div class="px-1">
                 <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                     <i class="ti ti-book fs-l"></i>
                     Help
                 </button>
-            </div>
+            </div> -->
         </div>
     </div>
 </div>
@@ -183,12 +183,12 @@
                             Clear
                         </button>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="ti-modal-body padding-16px pt-0 overflow-y-0">

src/app/components/competency-assessment/evaluation-cycle-manager/evaluation-cycle/evaluation-cycle.component.html

@@ -242,12 +242,12 @@
               Clear
             </button>
           </div>
-          <div class="px-1">
+          <!-- <div class="px-1">
             <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
               <i class="ti ti-book fs-l"></i>
               Help
             </button>
-          </div>
+          </div> -->
         </div>
       </div>
       <div class="ti-modal-body padding-16px pt-0 overflow-y-0">

src/app/components/competency-assessment/grade-registration/grade-management/sub-grade-registration/sub-grade-registration.component.html

@@ -174,12 +174,12 @@
                             Clear
                         </button>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="ti-modal-body">

src/app/components/competency-assessment/name-registration/competency-topic/competency-topic.component.html

@@ -196,12 +196,12 @@
                             Clear
                         </button>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="ti-modal-body mt-1">
@@ -309,12 +309,12 @@
                             </div>
                         </div>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
                 <div class="overflow-auto table-bordered" style="border-radius: 5px;">
                     <div class="overflow-auto border">
@@ -449,12 +449,12 @@
                             </div>
                         </div>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
                 <div class="overflow-auto table-bordered" style="border-radius: 5px;">
                     <div class="overflow-auto border">

src/app/components/competency-assessment/name-registration/type-registration/type-registration.component.html

@@ -196,12 +196,12 @@
                             Clear
                         </button>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="ti-modal-body" style="padding-top: 0px;">

src/app/components/competency-assessment/tool-register/assessment-tool/assessment-tool.component.html

@@ -236,12 +236,12 @@
                             Clear
                         </button>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="ti-modal-body" style="padding-top: 0px;">

src/app/components/dashboard/dashboard.module.ts

@@ -157,6 +157,8 @@ import { PmsEvaluationCycleService } from 'src/app/shared/services/pms-evaluatio
 import { PmsEvaluationAssessmentService } from 'src/app/shared/services/pms-evaluation-assessment.service';
 import { TimeAttendanceComponent } from '../performance-management-evaluation/time-attendance/time-attendance.component';
 import { PmsWorkingTimeService } from 'src/app/shared/services/pms-working-time.service';
+import { EvaluationIdpService } from 'src/app/shared/services/evaluation-Idp.service';
+import { EmpStatusService } from 'src/app/shared/services/emp-status.service';
 
 export const MY_DATE_FORMATS = {
   parse: {
@@ -344,6 +346,8 @@ export class CustomDateAdapter extends NativeDateAdapter {
     PmsEvaluationCycleService,
     PmsEvaluationAssessmentService,
     PmsWorkingTimeService,
+    EvaluationIdpService,
+    EmpStatusService,
     {
       provide: HTTP_INTERCEPTORS,
       useClass: HttpRequestInterceptor,

src/app/components/job-detail-components/command-structure/sub-command-structure/sub-command-structure.component.html

@@ -34,12 +34,12 @@
                             Delete
                         </button>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
         </div>

src/app/components/job-detail-components/job-competency/sub-job-competency/sub-job-competency.component.html

@@ -33,12 +33,12 @@
                             Delete
                         </button>
                     </div> -->
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
         </div>

src/app/components/job-detail-components/job-detail-management/import-data/import-data.component.html

@@ -40,12 +40,12 @@
                             Delete
                         </button>
                     </div> -->
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
         </div>

src/app/components/job-detail-components/job-detail/work-detail/work-detail.component.html

@@ -33,12 +33,12 @@
                             Delete
                         </button>
                     </div> -->
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
         </div>

src/app/components/job-detail-components/job-position-indicators/sub-job-position-indicators/sub-job-position-indicators.component.html

@@ -33,12 +33,12 @@
                             Delete
                         </button>
                     </div> -->
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
         </div>

src/app/components/job-detail-components/job-qualifications/sub-job-qualifications/sub-job-qualifications.component.html

@@ -33,12 +33,12 @@
                             Delete
                         </button>
                     </div> -->
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
         </div>

src/app/components/performance-evaluation/supervisor-evaluation/supervisor-evaluation.component.html

@@ -104,7 +104,7 @@
                                             </td>
                                             <td style="font-size: 12px;">{{item.apsassessy.position.tdesc}}</td>
                                             <td class="text-center">
-                                                <div class="flex">
+                                                <div class="flex justify-center">
                                                     <button type="button" class="ti-btn rounded-sm "
                                                         *ngFor="let type of item.typeList"
                                                         [class.ti-btn-soft-secondary]="type.statusType == 'employee'"
@@ -117,10 +117,16 @@
                                                 </div>
                                             </td>
                                             <td class="text-center">
-                                                <!-- <button type="button" class="ti-btn rounded-sm ti-btn-soft-dark"
-                                                    style="height: 15px; width: 45px; font-size: 12px; display: flex; align-items: center; justify-content: center;margin-left:4px;">
-                                                    IDP
-                                                </button> -->
+                                                <div class="flex justify-center">
+                                                    <button type="button" class="ti-btn rounded-sm"
+                                                        [class.ti-btn-soft-secondary]="item.statusIdp.statusType == 'employee'"
+                                                        [class.ti-btn-soft-warning]="item.statusIdp.statusType != 'employee'&&item.statusIdp.statusType != 'Boss_finish'"
+                                                        [class.ti-btn-soft-success]="item.statusIdp.statusType == 'Boss_finish'"
+                                                        style="height: 15px; width: 45px; font-size: 12px; display: flex; align-items: center; justify-content: center;margin-left:4px;"
+                                                        (click)="selectSubordinate(item,'',subordinate.select?.evaluationRoundId);pageEvalution='idp'">
+                                                        IDP
+                                                    </button>
+                                                </div>
                                             </td>
                                             <td class="text-center">
                                                 <!-- <button type="button" class="ti-btn rounded-sm ti-btn-soft-success"
@@ -190,14 +196,17 @@
 </ng-container>
 
 <ng-container *ngIf="pageEvalution=='idp'">
-    <app-idp-evalution (sendPageEvalution)="pageEvalution=$event"></app-idp-evalution>
+    <app-idp-evalution [pathTitle]="['การประเมินผล', 'ประเมินโดยหัวหน้า','ประเมิน']"
+        (sendReturnPath)="getBossList();pageEvalution='' ; pathTitle =  ['การประเมินผล', 'ประเมินโดยหัวหน้า']"
+        [evaluationRoundId]="formEvaluation.evaluationRoundId" [evaluaterId]="formEvaluation.evaluaterId"
+        [evaluateeId]="formEvaluation.evaluateeId"></app-idp-evalution>
 </ng-container>
 <ng-container *ngIf="pageEvalution=='pms'">
     <app-pms-evalution (sendPageEvalution)="pageEvalution=$event"></app-pms-evalution>
 </ng-container>
 <ng-container *ngIf="pageEvalution=='evaluation'">
     <app-evaluation [pathTitle]="['การประเมินผล', 'ประเมินโดยหัวหน้า','ประเมิน']"
-        (sendReturnPath)="pageEvalution='' ; pathTitle =  ['การประเมินผล', 'ประเมินโดยหัวหน้า']"
+        (sendReturnPath)="getBossList();pageEvalution='' ; pathTitle =  ['การประเมินผล', 'ประเมินโดยหัวหน้า']"
         [evaluationRoundId]="formEvaluation.evaluationRoundId" [evaluaterId]="formEvaluation.evaluaterId"
         [evaluateeId]="formEvaluation.evaluateeId"
         [competencyTypeId]="formEvaluation.competencyTypeId"></app-evaluation>

src/app/components/performance-evaluation/supervisor-evaluation/supervisor-evaluation.component.ts

@@ -67,7 +67,7 @@ export class SupervisorEvaluationComponent {
     this.page = Array.from({ length: Math.ceil(this.subordinateFilter().length / 10) }, (_, i) => i + 1);
   }
   selectSubordinate(data: Masfromevaluationassessment, competencyTypeId: string, evaluationRoundId?: string) {
-    if (data && competencyTypeId && evaluationRoundId) {
+    if (data && evaluationRoundId) {
       this.formEvaluation.evaluateeId = data.apsassessy.employeeId
       this.formEvaluation.competencyTypeId = competencyTypeId
       this.formEvaluation.evaluationRoundId = evaluationRoundId

src/app/components/performance-management-evaluation/assessment-management/assigning-approvers/assigning-approvers.component.html

@@ -151,12 +151,12 @@
                             Clear
                         </button>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="ti-modal-body mt-1">
@@ -319,12 +319,12 @@
                             </div>
                         </div>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
                 <div class="overflow-auto table-bordered" style="border-radius: 5px;">
                     <div class="overflow-auto border">

src/app/components/performance-management-evaluation/evaluation-cycle-performance/document-form/document-form.component.html

@@ -11,12 +11,12 @@
                     </div>
                 </div>
             </div>
-            <div class="px-1">
+            <!-- <div class="px-1">
                 <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                     <i class="ti ti-book fs-l"></i>
                     Help
                 </button>
-            </div>
+            </div> -->
         </div>
 </div>
 
@@ -163,12 +163,12 @@
                             Clear
                         </button>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="ti-modal-body padding-16px pt-0 overflow-y-0">

src/app/components/performance-management-evaluation/evaluation-cycle-performance/management-evaluation-cycle/management-evaluation-cycle.component.html

@@ -241,12 +241,12 @@
               Clear
             </button>
           </div>
-          <div class="px-1">
+          <!-- <div class="px-1">
             <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
               <i class="ti ti-book fs-l"></i>
               Help
             </button>
-          </div>
+          </div> -->
         </div>
       </div>
       <div class="ti-modal-body padding-16px pt-0 overflow-y-0">

src/app/components/performance-management-evaluation/evaluation-factors/define-evaluation-factors/define-evaluation-factors.component.html

@@ -36,12 +36,12 @@
                     Clear
                 </button>
             </div>
-            <div class="px-1">
+            <!-- <div class="px-1">
                 <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                     <i class="ti ti-book fs-l"></i>
                     Help
                 </button>
-            </div>
+            </div> -->
         </div>
     </div>
 </div>

src/app/components/performance-management-evaluation/name-registration-perfomance/assessment-topics/assessment-topics.component.html

@@ -193,12 +193,12 @@
               Clear
             </button>
           </div>
-          <div class="px-1">
+          <!-- <div class="px-1">
             <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
               <i class="ti ti-book fs-l"></i>
               Help
             </button>
-          </div>
+          </div> -->
         </div>
       </div>
       <div class="ti-modal-body padding-16px pt-0 overflow-y-0">

src/app/components/performance-management-evaluation/name-registration-perfomance/assessment-types/assessment-types.component.html

@@ -192,12 +192,12 @@
                             Clear
                         </button>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="ti-modal-body padding-16px pt-0 overflow-y-0">

src/app/components/performance-management-evaluation/pms-grade-registration/pms-grade-management/pms-sub-grade-registration/pms-sub-grade-registration.component.html

@@ -176,12 +176,12 @@
                             Clear
                         </button>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="ti-modal-body">

src/app/components/performance-management-evaluation/time-attendance/time-attendance.component.html

@@ -214,12 +214,12 @@
                             Clear
                         </button>
                     </div>
-                    <div class="px-1">
+                    <!-- <div class="px-1">
                         <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
                             <i class="ti ti-book fs-l"></i>
                             Help
                         </button>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="ti-modal-body padding-16px pt-0 overflow-y-0">

src/app/shared/model/appraisal-subordinate.model.ts

@@ -15,6 +15,10 @@ export interface Masfromevaluationassessment {
     gread: string
     sumScore: number
     typeList: TypeList[]
+    statusIdp: {
+        shortName: string,
+        statusType: string
+    }
 }
 
 export interface MasfromStatusType {

src/app/shared/model/employee.model.ts

@@ -111,6 +111,7 @@ export interface EmployeeModel {
     thFullName: string
     engFullName: string
     pl: PLModel
+    resigndate: string
 }
 
 export class MyEmployeeModel implements EmployeeModel {
@@ -200,6 +201,7 @@ export class MyEmployeeModel implements EmployeeModel {
     thFullName: string
     engFullName: string
     pl: PLModel
+    resigndate: string
     constructor(data?: Partial<EmployeeModel>) {
         this.employeeId = data?.employeeId || ""
         this.prefix = new MyPrefixModel(data?.prefix || {})
@@ -287,7 +289,7 @@ export class MyEmployeeModel implements EmployeeModel {
         this.thFullName = data?.thFullName || ""
         this.engFullName = data?.engFullName || ""
         this.pl = new MyPLModel(data?.workarea || {})
-
+        this.resigndate = data?.resigndate || ""
     }
 }
 

src/app/shared/model/status.model.ts

@@ -9,11 +9,11 @@ export class MyStatusModel implements StatusModel {
     statusType: string
     tdesc: string
     edesc: string
-    constructor(data: Partial<StatusModel>) {
-        this.statusCode = data.statusCode || ""
-        this.statusType = data.statusType || ""
-        this.tdesc = data.tdesc || ""
-        this.edesc = data.edesc || ""
+    constructor(data?: Partial<StatusModel>) {
+        this.statusCode = data?.statusCode || ""
+        this.statusType = data?.statusType || ""
+        this.tdesc = data?.tdesc || ""
+        this.edesc = data?.edesc || ""
     }
 }
 

src/app/shared/services/emp-status.service.ts

+import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { environment } from 'src/environments/environment';
+import { StatusModel } from '../model/status.model';
+
+@Injectable({
+    providedIn: 'root'
+})
+export class EmpStatusService {
+    api = "/emp-status"
+    urlApi = environment.baseUrl + this.api
+    constructor(private http: HttpClient) {
+    }
+    getList(): Observable<StatusModel[]> {
+        return this.http.get<StatusModel[]>(this.urlApi + "/lists")
+    }
+}
\ No newline at end of file

src/app/shared/services/evaluation-Idp.service.ts

+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { environment } from 'src/environments/environment';
+import { AlertModel } from '../model/alert.model';
+import { IdpFormModel } from '../model/idp-form.model';
+@Injectable({
+  providedIn: 'root'
+})
+export class EvaluationIdpService {
+  api = "/evaluation-Idp"
+  urlApi = environment.baseUrl + this.api
+  constructor(private http: HttpClient) {
+  }
+  getFormIdp(evaluationRoundId: string, employeeId: string): Observable<IdpFormModel> {
+    return this.http.get<IdpFormModel>(this.urlApi + "/" + evaluationRoundId + "/" + employeeId)
+  }
+  postIdp(body: IdpFormModel): Observable<AlertModel> {
+    return this.http.post<AlertModel>(this.urlApi + "/", body)
+  }
+}
\ No newline at end of file

src/assets/css/style.css

@@ -25006,3 +25006,6 @@ div:where(.swal2-container) div:where(.swal2-validation-message) {
   border-width: 0 1px 0 0;
   height: 100%;
 }
+\!.bg-white {
+  background-color: white !important;
+}
\ No newline at end of file