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

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

@@ -187,7 +187,7 @@
                  </div>
              </div>
              <div class="ti-modal-body" style="padding-top: 0px;">
-                 <label for="input-label" class="ti-form-label mt-1rem">รหัสงาน</label>
+                 <label for="input-label" class="ti-form-label mt-1rem">รหัสงาน*</label>
                  <input type="text" id="input-label" class="ti-form-input  bg-input-readonly" readonly [(ngModel)]="selectJob.jobcodeId">
                  <label for="detail_th" class="ti-form-label mt-1rem">ชื่อลักษณะงาน (ไทย)*</label>
                  <input type="text" id="detail_th" class="ti-form-input bg-input-readonly" readonly [(ngModel)]="selectJob.tdesc">

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

@@ -56,7 +56,7 @@ export class SubJobPositionIndicatorsComponent {
        this.selectJob = new MyJobCodeModel(item)
      }
      clearValue(){
-       this.selectJob.competencyWorkText = ''
+       this.selectJob.kpiWorkText = ''
      }
      save(){
        this.jobcodeService.post(this.selectJob).subscribe((response:any) => {
@@ -120,7 +120,7 @@ export class SubJobPositionIndicatorsComponent {
  
  
      downloadFile() {
-       const fileName = 'IMPORT_MJOBCODEV2.xlsx'
+       const fileName = 'MJOBCODE_KPI.xlsx'
        this.fileService.downloadTemplate(fileName).subscribe({
          next: response => {
            const url = window.URL.createObjectURL(response);

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

@@ -8,12 +8,12 @@
           {{numDataListChecked}} Selected</label>
       </div>
       <div class="mx-1 flex items-center">
-        <button (click)="isDataListCheckedAll = !isDataListCheckedAll;dataListCheckAll()"
+        <button (click)="isDataListCheckedAll = !isDataListCheckedAll;dataListCheckAll()" id="check-boxall"
           class="focus:ring-2 focus:ring-primary rounded-sm flex item-center">
           <i class="fs-l transition-all duration-200"
             [ngClass]="{'ri-checkbox-multiple-line text-gray-500': !isDataListCheckedAll, 'ri-checkbox-multiple-fill text-primary': isDataListCheckedAll}"></i>
         </button>
-        <label class="text-sm text-gray-500 ml-2">Select All</label>
+        <label class="text-sm text-gray-500 ml-2" for="check-boxall">Select All</label>
       </div>
     </div>
 
@@ -68,10 +68,10 @@
       <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 !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">
+              <div class="absolute top-1/2 transform -translate-y-1/2 right-0" *ngIf="!l&&!f">
                 <i class="ti ti-dots-vertical fs-l"></i>
               </div>
             </th>
@@ -98,9 +98,10 @@
       <tbody *ngIf="!pmstopic.loading&&pmstopicListFilter().length">
         <tr
           *ngFor="let item of pmstopicListFilter()| slice:((currentPage-1) * 10) : (((currentPage-1) * 10) + 10);let i = index">
-          <td class="text-center">
-            <input type="checkbox" class="ti-form-checkbox cursor-pointer" id="checkbox-{{item.data.pmsTopicId}}"
-              [(ngModel)]="item.check" (change)="dataListCheck()">
+          <td class="text-center"><input type="checkbox" class="ti-form-checkbox cursor-pointer" id="checkbox-{{item.data.pmsTopicId}}"
+            [(ngModel)]="item.check" (change)="dataListCheck()"></td>
+          <td >
+        
             <label for="checkbox-{{item.data.pmsTopicId}}">&nbsp;{{item.data.pmsTopicId}}</label>
           </td>
           <td>{{item.data.tdesc}}</td>

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

 <div class="w-full min-height-50px mb-10px justify-between items-center">
     <div class="flex justify-between">
         <div class="flex">
-            <div class="flex items-center">
+            <!-- <div class="flex items-center">
                 <input type="checkbox" class="ti-form-checkbox pointer-events-none" id="hs-default-checkbox"
                     [(ngModel)]="isDataListChecked">
                 <label for="hs-default-checkbox" class="text-sm text-gray-500 mx-2 pointer-events-none">
@@ -14,7 +14,7 @@
                         [ngClass]="{'ri-checkbox-multiple-line text-gray-500': !isDataListCheckedAll, 'ri-checkbox-multiple-fill text-primary': isDataListCheckedAll}"></i>
                 </button>
                 <label class="text-sm text-gray-500 ml-2">Select All</label>
-            </div>
+            </div> -->
         </div>
 
         <div class="flex justify-end">
@@ -38,7 +38,7 @@
                     import
                 </button>
             </div> -->
-            <div class="px-1">
+            <!-- <div class="px-1">
                 <button type="button" class="ti-btn ti-btn-soft-secondary h-10 m-0 shadow-md"
                     data-hs-overlay="#assessment-types-modal" (click)="modalStatus='add';selectPmstype()">
                     <i class="ri-add-line"></i>
@@ -51,7 +51,7 @@
                     <i class="ri-delete-bin-6-line"></i>
                     Delete
                 </button>
-            </div>
+            </div> -->
             <div class="px-1">
                 <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-10 m-0 shadow-md">
                     <i class="ti ti-book fs-l"></i>
@@ -99,8 +99,8 @@
                 <tr
                     *ngFor="let item of pmstypeListFilter()| slice:((currentPage-1) * 10) : (((currentPage-1) * 10) + 10);let i = index">
                     <td class="text-center">
-                        <input type="checkbox" class="ti-form-checkbox cursor-pointer"
-                            id="checkbox-{{item.data.pmsTypeId}}" [(ngModel)]="item.check" (change)="dataListCheck()">
+                        <!-- <input type="checkbox" class="ti-form-checkbox cursor-pointer"
+                            id="checkbox-{{item.data.pmsTypeId}}" [(ngModel)]="item.check" (change)="dataListCheck()"> -->
                         <label for="checkbox-{{item.data.pmsTypeId}}">&nbsp;{{item.data.pmsTypeId}}</label>
                     </td>
                     <td>{{item.data.tdesc}}</td>
@@ -109,9 +109,9 @@
                         <i class="ti ti-edit cursor-pointer i-gray fs-l px-1"
                             (click)="modalStatus='edit';selectPmstype(item.data)"
                             data-hs-overlay="#assessment-types-modal"></i>
-                        <i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
+                        <!-- <i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
                             (click)="modalStatus='delete';selectPmstype(item.data)"
-                            data-hs-overlay="#assessment-types-alert-modal"></i>
+                            data-hs-overlay="#assessment-types-alert-modal"></i> -->
                     </td>
                 </tr>
             </tbody>