แก้ไขหน้า แก้ไขกลุ่มสมรรถนะ, modal add ทะเบียนพนักงาน

src/app/components/company-components/employee-registration/sub-employee-registration/sub-employee-registration.component.html

@@ -141,7 +141,7 @@
         <div class="max-h-full overflow-hidden ti-modal-content">
             <div class="ti-modal-header">
                 <h3 class="text-xxl font-bold text-primary">
-                    กำหนดค่าผู้ใช้งานระบบ
+                    ข้อมูลพนักงาน
                 </h3>
                 <div class="flex justify-end">
                     <button type="button" class="hs-dropdown-toggle ti-modal-clode-btn text-danger"
@@ -176,7 +176,7 @@
                 <form class="space-y-3">
                     <div class="sm:grid grid-cols-12 gap-x-6">
                         <label class="col-span-3 ti-form-label text-primary mt-2">รหัสพนักงาน</label>
-                        <input type="email" class="sm:col-span-6 ti-form-input" style="margin-left: 50px;"
+                        <input type="email" class="sm:col-span-6 ti-form-input ltr:pr-11 rtl:pl-11 rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10" style="margin-left: 50px;"
                             placeholder="">
                     </div>
                     <div class="sm:grid grid-cols-12 gap-x-6">
@@ -184,12 +184,12 @@
                         <div class="col-span-4 relative mt-2">
                             <div>
                                 <div class="relative flex rounded-md">
-                                    <input type="text" class="ti-form-input">
+                                    <input type="text" class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10">
                                 </div>
                             </div>
                         </div>
                         <div class="flex col-span-4 relative mt-2">
-                            <input type="password" class="ti-form-input" placeholder="">
+                            <input type="password" class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10" placeholder="">
                         </div>
                     </div>
                     <!-- <input type="email" class="sm:col-span-6 ti-form-input" style="margin-left: 50px;" placeholder=""> -->
@@ -198,7 +198,7 @@
                         <div class="col-span-6 sm:col-span-6 relative">
                             <input type="text" id="hs-leading-button-add-on-with-icon-and-button"
                                 name="hs-leading-button-add-on-with-icon-and-button"
-                                class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-sm ltr:rounded-r-sm rtl:rounded-l-sm focus:z-10"
+                                class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10"
                                 style="margin-left: 50px;">
                             <div class="absolute inset-y-0 flex items-center z-0 ltr:pr-0 rtl:pl-0 cursor-pointer"
                                 style="left: 330px;">
@@ -215,7 +215,7 @@
                         <div class="col-span-6 sm:col-span-6 relative">
                             <input type="text" id="hs-leading-button-add-on-with-icon-and-button"
                                 name="hs-leading-button-add-on-with-icon-and-button"
-                                class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-sm ltr:rounded-r-sm rtl:rounded-l-sm focus:z-10"
+                                class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10"
                                 style="margin-left: 50px;">
                         </div>
                     </div>
@@ -224,7 +224,7 @@
                         <div class="col-span-6 sm:col-span-6 relative">
                             <input type="text" id="hs-leading-button-add-on-with-icon-and-button"
                                 name="hs-leading-button-add-on-with-icon-and-button"
-                                class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-sm ltr:rounded-r-sm rtl:rounded-l-sm focus:z-10"
+                                class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10"
                                 style="margin-left: 50px;">
                             <div class="absolute inset-y-0 flex items-center z-0 ltr:pr-0 rtl:pl-0 cursor-pointer"
                                 style="left: 330px;">
@@ -241,7 +241,7 @@
                         <div class="col-span-6 sm:col-span-6 relative">
                             <input type="text" id="hs-leading-button-add-on-with-icon-and-button"
                                 name="hs-leading-button-add-on-with-icon-and-button"
-                                class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-sm ltr:rounded-r-sm rtl:rounded-l-sm focus:z-10"
+                                class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10"
                                 style="margin-left: 50px;">
                             <div class="absolute inset-y-0 flex items-center z-0 ltr:pr-0 rtl:pl-0 cursor-pointer"
                                 style="left: 330px;">
@@ -258,7 +258,7 @@
                         <div class="col-span-6 sm:col-span-6 relative">
                             <input type="text" id="hs-leading-button-add-on-with-icon-and-button"
                                 name="hs-leading-button-add-on-with-icon-and-button"
-                                class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-sm ltr:rounded-r-sm rtl:rounded-l-sm focus:z-10"
+                                class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10"
                                 style="margin-left: 50px;">
                             <div class="absolute inset-y-0 flex items-center z-0 ltr:pr-0 rtl:pl-0 cursor-pointer"
                                 style="left: 330px;">
@@ -275,7 +275,7 @@
                         <div class="col-span-6 sm:col-span-6 relative">
                             <input type="text" id="hs-leading-button-add-on-with-icon-and-button"
                                 name="hs-leading-button-add-on-with-icon-and-button"
-                                class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-sm ltr:rounded-r-sm rtl:rounded-l-sm focus:z-10"
+                                class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10"
                                 style="margin-left: 50px;">
                             <div class="absolute inset-y-0 flex items-center z-0 ltr:pr-0 rtl:pl-0 cursor-pointer"
                                 style="left: 330px;">
@@ -292,7 +292,7 @@
                         <div class="col-span-6 sm:col-span-6 relative">
                             <input type="text" id="hs-leading-button-add-on-with-icon-and-button"
                                 name="hs-leading-button-add-on-with-icon-and-button"
-                                class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-sm ltr:rounded-r-sm rtl:rounded-l-sm focus:z-10"
+                                class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10"
                                 style="margin-left: 50px;">
                             <div class="absolute inset-y-0 flex items-center z-0 ltr:pr-0 rtl:pl-0 cursor-pointer"
                                 style="left: 330px;">
@@ -309,7 +309,7 @@
                         <div class="col-span-6 sm:col-span-6 relative">
                             <input type="text" id="hs-leading-button-add-on-with-icon-and-button"
                                 name="hs-leading-button-add-on-with-icon-and-button"
-                                class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-sm ltr:rounded-r-sm rtl:rounded-l-sm focus:z-10"
+                                class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10"
                                 style="margin-left: 50px;">
                             <div class="absolute inset-y-0 flex items-center z-0 ltr:pr-0 rtl:pl-0 cursor-pointer"
                                 style="left: 330px;">
@@ -349,7 +349,7 @@
         <div class="max-h-full overflow-hidden ti-modal-content">
             <div class="ti-modal-header">
                 <h3 class="text-xxl font-bold text-primary">
-                    กำหนดค่าผู้ใช้งานระบบ
+                    ข้อมูลพนักงาน
                 </h3>
                 <div class="flex justify-end">
                     <button type="button" class="hs-dropdown-toggle ti-modal-clode-btn text-danger"
@@ -384,7 +384,7 @@
                 <form class="space-y-3">
                     <div class="sm:grid grid-cols-12 gap-x-6">
                         <label class="col-span-3 ti-form-label text-primary mt-2">รหัสพนักงาน</label>
-                        <input type="email" class="sm:col-span-6 ti-form-input" style="margin-left: 50px;"
+                        <input type="email" class="sm:col-span-6 ti-form-input ltr:pr-11 rtl:pl-11 rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10" style="margin-left: 50px;"
                             placeholder="">
                     </div>
                     <div class="sm:grid grid-cols-12 gap-x-6">
@@ -392,12 +392,12 @@
                         <div class="col-span-4 relative mt-2">
                             <div>
                                 <div class="relative flex rounded-md">
-                                    <input type="text" class="ti-form-input">
+                                    <input type="text" class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10">
                                 </div>
                             </div>
                         </div>
                         <div class="flex col-span-4 relative mt-2">
-                            <input type="password" class="ti-form-input" placeholder="">
+                            <input type="password" class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10" placeholder="">
                         </div>
                     </div>
                     <!-- <input type="email" class="sm:col-span-6 ti-form-input" style="margin-left: 50px;" placeholder=""> -->
@@ -406,7 +406,7 @@
                         <div class="col-span-6 sm:col-span-6 relative">
                             <input type="text" id="hs-leading-button-add-on-with-icon-and-button"
                                 name="hs-leading-button-add-on-with-icon-and-button"
-                                class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-sm ltr:rounded-r-sm rtl:rounded-l-sm focus:z-10"
+                                class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10"
                                 style="margin-left: 50px;">
                             <div class="absolute inset-y-0 flex items-center z-0 ltr:pr-0 rtl:pl-0 cursor-pointer"
                                 style="left: 330px;">
@@ -423,7 +423,7 @@
                         <div class="col-span-6 sm:col-span-6 relative">
                             <input type="text" id="hs-leading-button-add-on-with-icon-and-button"
                                 name="hs-leading-button-add-on-with-icon-and-button"
-                                class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-sm ltr:rounded-r-sm rtl:rounded-l-sm focus:z-10"
+                                class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10"
                                 style="margin-left: 50px;">
                         </div>
                     </div>
@@ -432,7 +432,7 @@
                         <div class="col-span-6 sm:col-span-6 relative">
                             <input type="text" id="hs-leading-button-add-on-with-icon-and-button"
                                 name="hs-leading-button-add-on-with-icon-and-button"
-                                class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-sm ltr:rounded-r-sm rtl:rounded-l-sm focus:z-10"
+                                class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10"
                                 style="margin-left: 50px;">
                             <div class="absolute inset-y-0 flex items-center z-0 ltr:pr-0 rtl:pl-0 cursor-pointer"
                                 style="left: 330px;">
@@ -449,7 +449,7 @@
                         <div class="col-span-6 sm:col-span-6 relative">
                             <input type="text" id="hs-leading-button-add-on-with-icon-and-button"
                                 name="hs-leading-button-add-on-with-icon-and-button"
-                                class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-sm ltr:rounded-r-sm rtl:rounded-l-sm focus:z-10"
+                                class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10"
                                 style="margin-left: 50px;">
                             <div class="absolute inset-y-0 flex items-center z-0 ltr:pr-0 rtl:pl-0 cursor-pointer"
                                 style="left: 330px;">
@@ -466,7 +466,7 @@
                         <div class="col-span-6 sm:col-span-6 relative">
                             <input type="text" id="hs-leading-button-add-on-with-icon-and-button"
                                 name="hs-leading-button-add-on-with-icon-and-button"
-                                class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-sm ltr:rounded-r-sm rtl:rounded-l-sm focus:z-10"
+                                class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10"
                                 style="margin-left: 50px;">
                             <div class="absolute inset-y-0 flex items-center z-0 ltr:pr-0 rtl:pl-0 cursor-pointer"
                                 style="left: 330px;">
@@ -483,7 +483,7 @@
                         <div class="col-span-6 sm:col-span-6 relative">
                             <input type="text" id="hs-leading-button-add-on-with-icon-and-button"
                                 name="hs-leading-button-add-on-with-icon-and-button"
-                                class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-sm ltr:rounded-r-sm rtl:rounded-l-sm focus:z-10"
+                                class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10"
                                 style="margin-left: 50px;">
                             <div class="absolute inset-y-0 flex items-center z-0 ltr:pr-0 rtl:pl-0 cursor-pointer"
                                 style="left: 330px;">
@@ -500,7 +500,7 @@
                         <div class="col-span-6 sm:col-span-6 relative">
                             <input type="text" id="hs-leading-button-add-on-with-icon-and-button"
                                 name="hs-leading-button-add-on-with-icon-and-button"
-                                class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-sm ltr:rounded-r-sm rtl:rounded-l-sm focus:z-10"
+                                class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10"
                                 style="margin-left: 50px;">
                             <div class="absolute inset-y-0 flex items-center z-0 ltr:pr-0 rtl:pl-0 cursor-pointer"
                                 style="left: 330px;">
@@ -517,7 +517,7 @@
                         <div class="col-span-6 sm:col-span-6 relative">
                             <input type="text" id="hs-leading-button-add-on-with-icon-and-button"
                                 name="hs-leading-button-add-on-with-icon-and-button"
-                                class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-sm ltr:rounded-r-sm rtl:rounded-l-sm focus:z-10"
+                                class="ti-form-input ltr:pr-11 rtl:pl-11 rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10"
                                 style="margin-left: 50px;">
                             <div class="absolute inset-y-0 flex items-center z-0 ltr:pr-0 rtl:pl-0 cursor-pointer"
                                 style="left: 330px;">

src/app/components/company-components/employee-registration/sub-employee-registration/sub-employee-registration.component.ts

@@ -58,19 +58,9 @@ export class SubEmployeeRegistrationComponent {
 
   // ฟังก์ชันสำหรับการเพิ่ม ลบ หรือแก้ไข ข้อมูล
   addUser() {
-    // ฟังก์ชันสำหรับการเพิ่มผู้ใช้งาน
-    console.log('เพิ่มผู้ใช้งาน');
-  }
 
-  deleteUser() {
-    // ฟังก์ชันสำหรับการลบผู้ใช้งาน
-    console.log('ลบผู้ใช้งาน');
   }
 
-  editUser() {
-    // ฟังก์ชันสำหรับการแก้ไขผู้ใช้งาน
-    console.log('แก้ไขผู้ใช้งาน');
-  }
   currentModal = ""
   constructor(private toastr: ToastrService) { }
   showSuccess() {

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 ">
-    <button type="button" class="ti-btn ti-btn-outline ti-btn-outline-light h-20px m-0 shadow-md text-blue-500" (click)="onBack()">
+    <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> ย้อนกลับ
     </button>
     <div class="text-2xl font-bold py-2 text-primary px-4 ">
         แก้ไขกลุ่มสมรรถนะ
     </div>
 </div>
-
 <div class="py-2 border-b-2 border-collapse ">
-    <label for="input-label" class="ti-form-label ">ระดับพนักงาน</label>
-    <input type="text" id="input-label"
-        class="py-2 px-3  ltr:pr-11 rtl:pl-11 ti-form-input rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10 bg-input-readonly"
-        readonly value="พนักงานระดับ O1-O2">
+    <div class="grid grid-cols-3 gap-6">
+        <div class="col-span-1">
+            <label for="hs-trailing-button-add-on-with-icon" class="ti-form-label">รหัส</label>
+        </div>
+    </div>
+    <div class="grid grid-cols-3 gap-6">
+        <div class="col-span-1">
+            <input type="text" id="input-label"
+                class="py-2 px-3  ltr:pr-11 rtl:pl-11 ti-form-input w-2/3 rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10 bg-input-readonly"
+                readonly value="O1O2">
+        </div>
+    </div>
+    <div class="grid grid-cols-3 gap-6 mt-5">
+        <div class="col-span-1">
+            <label for="hs-trailing-button-add-on-with-icon" class="ti-form-label">ชื่อระดับพนักงาน (ไทย)</label>
+        </div>
+        <div class="col-span-1">
+            <label for="hs-trailing-button-add-on-with-icon" class="ti-form-label">ชื่อระดับพนักงาน (อังกฤษ)</label>
+        </div>
+    </div>
+    <div class="grid grid-cols-3 gap-6">
+        <div class="col-span-1">
+            <input type="text" id="input-label"
+                class="py-2 px-3  ltr:pr-11 rtl:pl-11 ti-form-input w-2/3 rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10 bg-input-readonly"
+                readonly value="พนักงานระดับ O1-O2">
+        </div>
+        <div class="col-span-1">
+            <input type="text" id="input-label"
+                class="py-2 px-3  ltr:pr-11 rtl:pl-11 ti-form-input w-2/3 rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10 bg-input-readonly"
+                readonly value="Employee level 01-02">
+        </div>
+    </div>
 </div>
 
-
 <div class="header-title-type">
     <div class="flex justify-between">
         <div class="flex">
@@ -158,7 +185,8 @@
 
 
 <div id="edit-group-competencies-table-modal-select" class="hs-overlay hidden ti-modal">
-    <div class="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out lg:!max-w-4xl lg:w-full m-3 lg:mx-auto h-[calc(100%-3.5rem)]  items-center">
+    <div
+        class="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out lg:!max-w-4xl lg:w-full m-3 lg:mx-auto h-[calc(100%-3.5rem)]  items-center">
         <div class="max-h-full overflow-hidden ti-modal-content">
             <div class="ti-modal-header">
                 <h3 class="text-xxl font-bold text-primary">

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

@@ -53,7 +53,7 @@
                 <thead>
                     <tr>
                         <ng-container
-                        *ngFor="let item of ['รหัส','ชื่อระดับพนักงาน','Action']; let f = first; let l = last; let i = index">
+                        *ngFor="let item of ['รหัส','ชื่อระดับพนักงาน (ไทย)','Action']; let f = first; let l = last; let i = index">
                             <th scope="col" class="relative px-10px py-10px bg-soft-secondary text-primary"
                                 [class.!text-center]="f||l">
                                 <span class="text-sm">{{ item }}</span>