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

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

@@ -108,7 +108,7 @@
                     <tr
                         *ngFor="let item of emp_typeListFilter() | slice:((currentPage-1) * 10) : (((currentPage-1) * 10) + 10);let i = index">
                         <td class="text-center">
-                            <input *ngIf="item.data.codeId!='100'" type="checkbox"
+                            <input type="checkbox"
                                 class="ti-form-checkbox cursor-pointer" id="checkbox-{{item.data.codeId}}"
                                 [(ngModel)]="item.check" (ngModelChange)="dataListCheck()">
                             <label for="checkbox-{{item.data.codeId}}">&nbsp;{{item.data.codeId}}</label>
@@ -119,7 +119,7 @@
                             <i class="ti ti-edit cursor-pointer i-gray fs-l px-1"
                                 (click)="modalStatus='edit';setData(item.data)"
                                 data-hs-overlay="#employee-categories-page-modal"></i>
-                            <i class="ti ti-trash cursor-pointer i-gray fs-l px-1" *ngIf="item.data.codeId!='100'"
+                            <i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
                                 (click)="modalStatus='delete';setData(item.data)"
                                 data-hs-overlay="#employee-categories-page-alert-modal"></i>
                         </td>
@@ -216,9 +216,9 @@
                 <input type="text" id="input-label" class="ti-form-input w-1/2"
                     [ngClass]="{'bg-input-readonly':modalStatus=='edit'}" [readonly]="modalStatus=='edit'"
                     [(ngModel)]="dataSelect.codeId">
-                <label for="detail_th" class="ti-form-label mt-2rem">รายละเอียด (ไทย)*</label>
+                <label for="detail_th" class="ti-form-label mt-2rem">รายละเอียดประเภทพนักงาน (ไทย)*</label>
                 <input type="text" id="detail_th" class="ti-form-input h-16" [(ngModel)]="dataSelect.tdesc">
-                <label for="detail_eng" class="ti-form-label mt-2rem">รายละเอียด (อังกฤษ)</label>
+                <label for="detail_eng" class="ti-form-label mt-2rem">รายละเอียดประเภทพนักงาน (อังกฤษ)</label>
                 <input type="text" id="detail_eng" class="ti-form-input h-16" [(ngModel)]="dataSelect.edesc">
                 <div class="flex justify-end mt-2rem mb-1rem space-x-4">
                     <button type="button"

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

@@ -105,7 +105,7 @@
                 <tr
                     *ngFor="let item of emp_groupListFilter() | slice:((currentPage-1) * 10) : (((currentPage-1) * 10) + 10);let i = index">
                     <td class="text-center">
-                        <input *ngIf="item.data.groupId!='100'" type="checkbox" class="ti-form-checkbox cursor-pointer"
+                        <input type="checkbox" class="ti-form-checkbox cursor-pointer"
                             id="checkbox-{{item.data.groupId}}" [(ngModel)]="item.check"
                             (ngModelChange)="dataListCheck()">
                         <label for="checkbox-{{item.data.groupId}}">&nbsp;{{item.data.groupId}}</label>
@@ -116,7 +116,7 @@
                         <i class="ti ti-edit cursor-pointer i-gray fs-l px-1"
                             (click)="modalStatus='edit';setData(item.data)"
                             data-hs-overlay="#employee-group-unit-component-page-modal"></i>
-                        <i class="ti ti-trash cursor-pointer i-gray fs-l px-1" *ngIf="item.data.groupId!='100'"
+                        <i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
                             (click)="modalStatus='delete';setData(item.data)"
                             data-hs-overlay="#employee-group-unit-component-page-alert-modal"></i>
                     </td>
@@ -216,7 +216,7 @@
                     [(ngModel)]="dataSelect.groupId">
                 <label for="detail_th" class="ti-form-label mt-2rem">รายละเอียดกลุ่มพนักงาน (ไทย)*</label>
                 <input type="text" id="detail_th" class="ti-form-input h-16" [(ngModel)]="dataSelect.tdesc">
-                <label for="detail_eng" class="ti-form-label mt-2rem">รายละเอียดกลุ่มพนักงาน (อังกฤษ)*</label>
+                <label for="detail_eng" class="ti-form-label mt-2rem">รายละเอียดกลุ่มพนักงาน (อังกฤษ)</label>
                 <input type="text" id="detail_eng" class="ti-form-input h-16" [(ngModel)]="dataSelect.edesc">
                 <div class="flex justify-end mt-2rem mb-1rem space-x-2">
                     <button type="button"

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

@@ -106,7 +106,7 @@
           <tr
             *ngFor="let item of plListFilter() | slice:((currentPage-1) * 10) : (((currentPage-1) * 10) + 10);let i = index">
             <td class="text-center">
-              <input *ngIf="item.data.plId!='100'" type="checkbox" class="ti-form-checkbox cursor-pointer"
+              <input type="checkbox" class="ti-form-checkbox cursor-pointer"
                 id="checkbox-{{item.data.plId}}" [(ngModel)]="item.check" (ngModelChange)="dataListCheck()">
               <label for="checkbox-{{item.data.plId}}">&nbsp;{{item.data.plId}}</label>
             </td>
@@ -116,7 +116,7 @@
             <td class="flex justify-center">
               <i class="ti ti-edit cursor-pointer i-gray fs-l px-1" (click)="modalStatus='edit';setData(item.data)"
                 data-hs-overlay="#employee-level-page-modal"></i>
-              <i class="ti ti-trash cursor-pointer i-gray fs-l px-1" *ngIf="item.data.plId!='100'"
+              <i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
                 (click)="modalStatus='delete';setData(item.data)"
                 data-hs-overlay="#employee-level-page-alert-modal"></i>
             </td>
@@ -212,9 +212,9 @@
         <input type="text" id="input-label" class="ti-form-input w-1/2"
           [ngClass]="{'bg-input-readonly':modalStatus=='edit'}" [readonly]="modalStatus=='edit'"
           [(ngModel)]="dataSelect.plId">
-        <label for="detail_th" class="ti-form-label mt-2rem">รายละเอียด (ไทย)*</label>
+        <label for="detail_th" class="ti-form-label mt-2rem">รายละเอียดระดับพนักงาน(PL) (ไทย)*</label>
         <input type="text" id="detail_th" class="ti-form-input h-16" [(ngModel)]="dataSelect.tdesc">
-        <label for="detail_eng" class="ti-form-label mt-2rem">รายละเอียด (อังกฤษ)</label>
+        <label for="detail_eng" class="ti-form-label mt-2rem">รายละเอียดระดับพนักงาน(PL) (อังกฤษ)</label>
         <input type="text" id="detail_eng" class="ti-form-input h-16" [(ngModel)]="dataSelect.edesc">
         <div class="flex justify-end mt-2rem mb-1rem space-x-4">
           <button type="button"

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

@@ -106,9 +106,9 @@
                 <tr
                     *ngFor="let item of positionListFilter() | slice:((currentPage-1) * 10) : (((currentPage-1) * 10) + 10);let i = index">
                     <td class="text-center">
-                        <input *ngIf="item.data.positionId!='100'" type="checkbox"
-                            class="ti-form-checkbox cursor-pointer" id="checkbox-{{item.data.positionId}}"
-                            [(ngModel)]="item.check" (ngModelChange)="dataListCheck()">
+                        <input type="checkbox" class="ti-form-checkbox cursor-pointer"
+                            id="checkbox-{{item.data.positionId}}" [(ngModel)]="item.check"
+                            (ngModelChange)="dataListCheck()">
                         <label for="checkbox-{{item.data.positionId}}">&nbsp;{{item.data.positionId}}</label>
                     </td>
                     <td>{{item.data.tdesc}}</td>
@@ -117,7 +117,7 @@
                         <i class="ti ti-edit cursor-pointer i-gray fs-l px-1"
                             (click)="modalStatus='edit';setData(item.data)"
                             data-hs-overlay="#position-unit-component-page-modal"></i>
-                        <i class="ti ti-trash cursor-pointer i-gray fs-l px-1" *ngIf="item.data.positionId!='100'"
+                        <i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
                             (click)="modalStatus='delete';setData(item.data)"
                             data-hs-overlay="#position-unit-component-page-alert-modal"></i>
                     </td>
@@ -213,9 +213,9 @@
                 <input type="text" id="input-label" class="ti-form-input w-1/2 "
                     [ngClass]="{'bg-input-readonly':modalStatus=='edit'}" [readonly]="modalStatus=='edit'"
                     [(ngModel)]="dataSelect.positionId">
-                <label for="detail_th" class="ti-form-label mt-2rem">รายละเอียดฝ่าย (ไทย)*</label>
+                <label for="detail_th" class="ti-form-label mt-2rem">รายละเอียดตำแหน่ง (ไทย)*</label>
                 <input type="text" id="detail_th" class="ti-form-input h-16" [(ngModel)]="dataSelect.tdesc">
-                <label for="detail_eng" class="ti-form-label mt-2rem">รายละเอียดฝ่าย (อังกฤษ)*</label>
+                <label for="detail_eng" class="ti-form-label mt-2rem">รายละเอียดตำแหน่ง (อังกฤษ)</label>
                 <input type="text" id="detail_eng" class="ti-form-input h-16" [(ngModel)]="dataSelect.edesc">
                 <div class="flex justify-end mt-2rem mb-1rem space-x-2">
                     <button type="button"

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

@@ -91,7 +91,7 @@
         <tr
           *ngFor="let item of evaluation_cycleListFilter() | slice:((currentPage-1) * 10) : (((currentPage-1) * 10) + 10);let i = index">
           <td class="text-center">
-            <input *ngIf="item.data.evaluationRoundId!='100'" type="checkbox" class="ti-form-checkbox cursor-pointer"
+            <input type="checkbox" class="ti-form-checkbox cursor-pointer"
               id="checkbox-{{item.data.evaluationRoundId}}" [(ngModel)]="item.check" (ngModelChange)="dataListCheck()">
             <label for="checkbox-{{item.data.evaluationRoundId}}">&nbsp;{{item.data.evaluationRoundId}}</label>
           </td>

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

@@ -109,10 +109,11 @@
                     <td>{{item.data.name}}</td>
                     <td class="text-center">{{item.data.code}}</td>
                     <td class="flex justify-center">
-                        <i class="ti ti-edit cursor-pointer i-gray fs-l px-1" (click)="modalStatus='edit';setData(item.data)"
+                        <i class="ti ti-edit cursor-pointer i-gray fs-l px-1"
+                            (click)="modalStatus='edit';setData(item.data)"
                             data-hs-overlay="#competency-topic-page-modal"></i>
-                        <i class="ti ti-trash cursor-pointer i-gray fs-l px-1" *ngIf="item.data.id!='100'"
-                        (click)="modalStatus='delete';setData(item.data)"
+                        <i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
+                            (click)="modalStatus='delete';setData(item.data)"
                             data-hs-overlay="#competency-topic-page-alert-modal"></i>
                     </td>
                 </tr>
@@ -204,7 +205,9 @@
             </div>
             <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" [ngClass]="{'bg-input-readonly':modalStatus=='edit'}" [readonly]="modalStatus=='edit'" [(ngModel)]="dataSelect.id">
+                <input type="text" id="input-label" class="ti-form-input w-1/2"
+                    [ngClass]="{'bg-input-readonly':modalStatus=='edit'}" [readonly]="modalStatus=='edit'"
+                    [(ngModel)]="dataSelect.id">
                 <label for="detail_th" class="ti-form-label mt-2rem">ชื่อหัวข้อ (ไทย)</label>
                 <input type="text" id="detail_th" class="ti-form-input h-10" [(ngModel)]="dataSelect.name">
                 <label for="detail_eng" class="ti-form-label mt-2rem">ชื่อหัวข้อ (อังกฤษ)</label>

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

@@ -49,7 +49,8 @@
             </div>
             <div class="px-1">
                 <button href="javascript:void(0);" class="ti-btn ti-btn-soft-danger h-10 m-0 shadow-md"
-                    data-hs-overlay="#type-registration-component-page-alert-modal" (click)="modalStatus='deleteGroup';setData()">
+                    data-hs-overlay="#type-registration-component-page-alert-modal"
+                    (click)="modalStatus='deleteGroup';setData()">
                     <i class="ri-delete-bin-6-line"></i>
                     Delete
                 </button>
@@ -101,17 +102,18 @@
                 <tr
                     *ngFor="let item of dataListFilter()| slice:((currentPage-1) * 10) : (((currentPage-1) * 10) + 10);let i = index">
                     <td class="text-center">
-                        <input *ngIf="item.data.id!='100'" type="checkbox" class="ti-form-checkbox cursor-pointer" id="checkbox-{{item.data.id}}"
+                        <input type="checkbox" class="ti-form-checkbox cursor-pointer" id="checkbox-{{item.data.id}}"
                             [(ngModel)]="item.check" (change)="checkSelect()">
                         <label for="checkbox-{{item.data.id}}">&nbsp;{{item.data.id}}</label>
                     </td>
                     <td>{{item.data.name}}</td>
                     <td class="text-center">{{item.data.code}}</td>
                     <td class="flex justify-center">
-                        <i class="ti ti-edit cursor-pointer i-gray fs-l px-1" (click)="modalStatus='edit';setData(item.data)"
+                        <i class="ti ti-edit cursor-pointer i-gray fs-l px-1"
+                            (click)="modalStatus='edit';setData(item.data)"
                             data-hs-overlay="#type-registration-component-page-modal"></i>
-                        <i class="ti ti-trash cursor-pointer i-gray fs-l px-1" *ngIf="item.data.id!='100'"
-                        (click)="modalStatus='delete';setData(item.data)"
+                        <i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
+                            (click)="modalStatus='delete';setData(item.data)"
                             data-hs-overlay="#type-registration-component-page-alert-modal"></i>
                     </td>
                 </tr>
@@ -203,7 +205,9 @@
             </div>
             <div class="ti-modal-body" style="padding-top: 0px;">
                 <label for="input-label" class="ti-form-label mt-1rem">รหัส *</label>
-                <input type="text" id="input-label" class="ti-form-input w-1/2" [ngClass]="{'bg-input-readonly':modalStatus=='edit'}" [readonly]="modalStatus=='edit'" [(ngModel)]="dataSelect.id">
+                <input type="text" id="input-label" class="ti-form-input w-1/2"
+                    [ngClass]="{'bg-input-readonly':modalStatus=='edit'}" [readonly]="modalStatus=='edit'"
+                    [(ngModel)]="dataSelect.id">
                 <label for="detail_th" class="ti-form-label mt-1rem">ชื่อประเภท (ไทย)*</label>
                 <input type="text" id="detail_th" class="ti-form-input w-2/3" [(ngModel)]="dataSelect.name">
                 <label for="detail_eng" class="ti-form-label mt-1rem">ชื่อประเภท (อังกฤษ)</label>
@@ -271,7 +275,8 @@
                             ย้อนกลับ
                         </button>
                         <a class="ti-btn ti-btn-success" href="javascript:void(0);"
-                            data-hs-overlay="#type-registration-component-page-alert-modal" (click)="addType_registration()">
+                            data-hs-overlay="#type-registration-component-page-alert-modal"
+                            (click)="addType_registration()">
                             บันทึกข้อมูล
                         </a>
                     </ng-container>
@@ -282,7 +287,8 @@
                             ย้อนกลับ
                         </button>
                         <a class="ti-btn ti-btn-danger" href="javascript:void(0);"
-                            data-hs-overlay="#type-registration-component-page-alert-modal" (click)="deleteType_registration()">
+                            data-hs-overlay="#type-registration-component-page-alert-modal"
+                            (click)="deleteType_registration()">
                             ลบข้อมูล
                         </a>
                     </ng-container>