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

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

-<div class="flex items-center py-4 border-b-2 border-collapse ">
+<div class="w-full min-height-50px mb-10px justify-between items-center border-b-2 border-collapse">
+    <div class="flex justify-between">
+        <div class="flex">
             <button type="button" class="ti-btn ti-btn-outline ti-btn-outline-light h-20px m-0 shadow-md text-blue-500"
                 (click)="onBack()">
-        <i class="ri-arrow-left-s-line"></i> ย้อนกลับ
+                <i class="ti ti-chevron-left"></i>
+                ย้อนกลับ
             </button>
-    <div class="text-2xl font-bold py-2 text-primary px-4 ">
+            <div class="font-size-18px font-weight-700 align-center font-bold py-2 text-primary px-4">
                 แก้ไขกลุ่มสมรรถนะ
             </div>
+        </div>
+    </div>
 </div>
 <div class="py-2 border-b-2 border-collapse ">
     <div class="grid grid-cols-3 gap-6">

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

-<div class="header-title-type">
-    <div class="flex justify-between">
+<div class="w-full min-height-50px mb-10px justify-between items-center">
     <div class="flex">
         <!-- Content ของ div แรก -->
         <!-- <div class="flex gap-x-6">
@@ -20,7 +19,7 @@
         <div class="px-1">
             <div class="relative shadow-md">
                 <input type="text" id="hs-leading-icon" name="hs-leading-icon"
-                         class="ti-form-input ltr:pl-11 rtl:pr-11 focus:z-10 " placeholder="Search by No. or Name" style="height: 40px;">
+                    class="ti-form-input ltr:pl-11 rtl:pr-11 focus:z-10 " placeholder="Search by No. or Name">
                 <div
                     class="absolute inset-y-0 ltr:left-0 rtl:right-0 flex items-center pointer-events-none z-20 ltr:pl-4 rtl:pr-4">
                     <i class="ri-search-line text-gray"></i>
@@ -28,21 +27,22 @@
             </div>
         </div>
         <div class="px-1">
-                 <button type="button" class="ti-btn ti-btn bg-pink-500/10 text-pink-500 hover:text-white hover:bg-pink-500 ring-offset-white focus:ring-pink-500 dark:focus:ring-offset-white/10 h-10 m-0 shadow-md"
+            <button type="button"
+                class="ti-btn ti-btn bg-pink-500/10 text-pink-500 hover:text-white hover:bg-pink-500 ring-offset-white focus:ring-pink-500 dark:focus:ring-offset-white/10 h-45px m-0 shadow-md"
                 data-hs-overlay="#group-competencies-modal-add">
                 <i class="ti ti-file-plus"></i>
                 import
             </button>
         </div>
         <div class="px-1">
-                 <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-10 m-0 shadow-md">
+            <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>
+
 
 
 <div class="page px-rem">
@@ -223,7 +223,8 @@
                         ย้อนกลับ
                     </button>
                     <a class="ti-btn ti-btn-success" href="javascript:void(0);"
-                      data-hs-overlay="#group-competencies-alert-delete-modal" (click)="addUser();showSuccessDelete()">
+                        data-hs-overlay="#group-competencies-alert-delete-modal"
+                        (click)="addUser();showSuccessDelete()">
                         ลบข้อมูล
                     </a>
                 </div>

src/app/components/competency-assessment/competency-management/indicators-and-curriculum/edit-group-indicators/edit-group-indicators.html

 <div class="w-full min-height-50px mb-10px justify-between items-center">
     <div class="flex justify-between">
         <div class="flex">
-            <button type="button"
-                class="ti-btn text-primary hover:bg-blue-100 focus:ring-blue-500 dark:focus:ring-offset-white/10 h-45px m-0 shadow-md"
+            <button type="button" class="ti-btn ti-btn-outline ti-btn-outline-light h-20px m-0 shadow-md text-blue-500"
                 (click)="onEdit()">
                 <i class="ti ti-chevron-left"></i>
                 ย้อนกลับ