wording

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

@@ -55,7 +55,7 @@
                     <thead>
                         <tr>
                             <ng-container
-                                *ngFor="let item of ['รหัสพนักงาน','รายละเอียด(ไทย) ','รายละเอียด(อังกฤษ)','การจัดการ']; let f = first; let l = last; let i = index">
+                                *ngFor="let item of ['รหัสตำแหน่ง','รายละเอียด(ไทย) ','รายละเอียด(อังกฤษ)','การจัดการ']; let f = first; let l = last; let i = index">
                                 <th scope="col" class="relative px-10px py-10px bg-soft-secondary text-primary !text-center">
                                     <span class="font-size-12px font-weight-700">{{ item }}</span>
                                     <div class="absolute top-1/2 transform -translate-y-1/2 right-0" *ngIf="!l">
@@ -393,4 +393,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file

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

@@ -38,8 +38,30 @@ export class EditGroupIndicators implements OnInit {
         { code: "O", nameShow: "O", name: "O" },
       ]], curriculum: [{ code: "1", name: "1" }, { code: "asdasdasdasdasdasdasdasdasdasddsdasdasdasdasdasdasdasdasdasdsad", name: "asdasdasdasdasdasdasdasdasdasddsdasdasdasdasdasdasdasdasdasdsad" }, { code: "3", name: "3" }]
     },
-    { code: "2", behaviorIndicators: [], assessmentTools: [], curriculum: [] },
-    { code: "3", behaviorIndicators: [], assessmentTools: [], curriculum: [] }
+    {
+      code: "1", behaviorIndicators: ["asdasdasdasdasdasdasdasdasdasddsdasdasdasdasdasdasdasdasdasdsad", "2", "3"], assessmentTools: [[
+        { code: "O", nameShow: "O", name: "O" },
+        { code: "A", nameShow: "A", name: "A" },
+        { code: "D", nameShow: "D", name: "D" },
+        { code: "O", nameShow: "O", name: "O" },
+        { code: "A", nameShow: "A", name: "A" },
+        { code: "D", nameShow: "D", name: "D" }
+      ],[],[
+        { code: "O", nameShow: "O", name: "O" },
+      ]], curriculum: [{ code: "1", name: "1" }, { code: "asdasdasdasdasdasdasdasdasdasddsdasdasdasdasdasdasdasdasdasdsad", name: "asdasdasdasdasdasdasdasdasdasddsdasdasdasdasdasdasdasdasdasdsad" }, { code: "3", name: "3" }]
+    },
+    {
+      code: "1", behaviorIndicators: ["asdasdasdasdasdasdasdasdasdasddsdasdasdasdasdasdasdasdasdasdsad", "2", "3"], assessmentTools: [[
+        { code: "O", nameShow: "O", name: "O" },
+        { code: "A", nameShow: "A", name: "A" },
+        { code: "D", nameShow: "D", name: "D" },
+        { code: "O", nameShow: "O", name: "O" },
+        { code: "A", nameShow: "A", name: "A" },
+        { code: "D", nameShow: "D", name: "D" }
+      ],[],[
+        { code: "O", nameShow: "O", name: "O" },
+      ]], curriculum: [{ code: "1", name: "1" }, { code: "asdasdasdasdasdasdasdasdasdasddsdasdasdasdasdasdasdasdasdasdsad", name: "asdasdasdasdasdasdasdasdasdasddsdasdasdasdasdasdasdasdasdasdsad" }, { code: "3", name: "3" }]
+    },
   ]
   dataSelect?: DataModel
   assessmentToolsSelect: number = -1
@@ -109,4 +131,4 @@ export class EditGroupIndicators implements OnInit {
       return match;
     });
   }
-}
+}
\ No newline at end of file

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

@@ -166,7 +166,7 @@
                 <label for="input-label" class="ti-form-label">ระดับพนักงาน</label>
                 <input type="text" id="input-label" class="ti-form-input w-1/2 bg-input-readonly" readonly
                     value="พนักงานระดับ 01-02">
-                <label class="ti-form-label mt-2rem">ผู้อนุมัติอันดับที่ 1</label>
+                <label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 1</label>
                 <div class="flex">
                     <div class="relative flex rounded-md w-2/3">
                         <input type="text" id="hs-leading-button-add-on-with-icon-and-button"
@@ -182,7 +182,7 @@
                         </div>
                     </div>
                 </div>
-                <label class="ti-form-label mt-2rem">ผู้อนุมัติอันดับที่ 2</label>
+                <label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 2</label>
                 <div class="flex">
                     <div class="relative flex rounded-md w-2/3">
                         <input type="text" id="hs-leading-button-add-on-with-icon-and-button"
@@ -198,7 +198,7 @@
                         </div>
                     </div>
                 </div>
-                <label class="ti-form-label mt-2rem">ผู้อนุมัติอันดับที่ 3</label>
+                <label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 3</label>
                 <div class="flex">
                     <div class="relative flex rounded-md w-2/3">
                         <input type="text" id="hs-leading-button-add-on-with-icon-and-button"
@@ -214,7 +214,7 @@
                         </div>
                     </div>
                 </div>
-                <label class="ti-form-label mt-2rem">ผู้อนุมัติอันดับที่ 4</label>
+                <label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 4</label>
                 <div class="flex">
                     <div class="relative flex rounded-md w-2/3">
                         <input type="text" id="hs-leading-button-add-on-with-icon-and-button"
@@ -230,7 +230,7 @@
                         </div>
                     </div>
                 </div>
-                <label class="ti-form-label mt-2rem">ผู้อนุมัติอันดับที่ 5</label>
+                <label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 5</label>
                 <div class="flex">
                     <div class="relative flex rounded-md w-2/3">
                         <input type="text" id="hs-leading-button-add-on-with-icon-and-button"

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

@@ -163,7 +163,7 @@
             <div class="ti-modal-body mt-1">
                 <label for="input-label" class="ti-form-label">ระดับพนักงาน</label>
                     <input type="text" id="input-label" class="ti-form-input w-1/2 bg-input-readonly" readonly value="พนักงานระดับ 01-02" >
-                    <label class="ti-form-label mt-2rem">ผู้อนุมัติอันดับที่ 1</label>
+                    <label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 1</label>
                     <div class="flex">
                         <div class="relative flex rounded-md w-2/3">
                             <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 rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10" style="padding-right: 2.5rem;" value="">
@@ -174,7 +174,7 @@
                             </div>
                         </div>
                     </div>
-                    <label class="ti-form-label mt-2rem">ผู้อนุมัติอันดับที่ 2</label>
+                    <label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 2</label>
                     <div class="flex">
                         <div class="relative flex rounded-md w-2/3">
                             <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 rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10" style="padding-right: 2.5rem;" value="">
@@ -185,7 +185,7 @@
                             </div>
                         </div>
                     </div>
-                    <label class="ti-form-label mt-2rem">ผู้อนุมัติอันดับที่ 3</label>
+                    <label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 3</label>
                     <div class="flex">
                         <div class="relative flex rounded-md w-2/3">
                             <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 rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10" style="padding-right: 2.5rem;" value="">
@@ -196,7 +196,7 @@
                             </div>
                         </div>
                     </div>
-                    <label class="ti-form-label mt-2rem">ผู้อนุมัติอันดับที่ 4</label>
+                    <label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 4</label>
                     <div class="flex">
                         <div class="relative flex rounded-md w-2/3">
                             <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 rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10" style="padding-right: 2.5rem;" value="">
@@ -207,7 +207,7 @@
                             </div>
                         </div>
                     </div>
-                    <label class="ti-form-label mt-2rem">ผู้อนุมัติอันดับที่ 5</label>
+                    <label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 5</label>
                     <div class="flex">
                         <div class="relative flex rounded-md w-2/3">
                             <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 rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10" style="padding-right: 2.5rem;" value="">