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

src/app/components/job-detail-components/job-competency/sub-job-competency/sub-job-competency.component.html

@@ -88,8 +88,6 @@
                             <td class="flex justify-center">
                                 <i class="ti ti-edit cursor-pointer i-gray fs-l px-1" (click)="modalStatus='edit';edit(item)"
                                     data-hs-overlay="#sub-job-competency-component-modal-edit"></i>
-                                <i class="ti ti-trash cursor-pointer i-gray fs-l px-1" (click)="modalStatus='delete';edit(item)"
-                                     data-hs-overlay="#company-registration-page-alert-modal"></i>
                             </td>
                         </tr>
                     </tbody>

src/app/components/job-detail-components/job-competency/sub-job-competency/sub-job-competency.component.ts

@@ -121,7 +121,7 @@ export class SubJobCompetencyComponent {
 
 
     downloadFile() {
-      const fileName = 'IMPORT_MJOBCODEV2.xlsx'
+      const fileName = 'IMPORT_MJOBCODE_COMPETENCY.xlsx'
       this.fileService.downloadTemplate(fileName).subscribe({
         next: response => {
           const url = window.URL.createObjectURL(response);

src/app/components/job-detail-components/job-detail-management/import-data/import-data.component.ts

@@ -254,7 +254,7 @@ export class ImportDataComponent {
 
 
   downloadFile() {
-    const fileName = 'IMPORT_MJOB.xlsx'
+    const fileName = 'IMPORT_MJOBCODE_GENERAL.xlsx'
     this.fileService.downloadTemplate(fileName).subscribe({
       next: response => {
         const url = window.URL.createObjectURL(response);

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

@@ -120,7 +120,7 @@ export class SubJobPositionIndicatorsComponent {
  
  
      downloadFile() {
-       const fileName = 'MJOBCODE_KPI.xlsx'
+       const fileName = 'IMPORT_MJOBCODE_KPI.xlsx'
        this.fileService.downloadTemplate(fileName).subscribe({
          next: response => {
            const url = window.URL.createObjectURL(response);

src/app/components/job-detail-components/job-qualifications/sub-job-qualifications/sub-job-qualifications.component.html

@@ -187,9 +187,9 @@
                  </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>
+                 <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">
                  <label for="detail_eng" class="ti-form-label mt-1rem">ชื่อลักษณะงาน (อังกฤษ)</label>
                  <input type="text" id="detail_eng" class="ti-form-input bg-input-readonly" readonly [(ngModel)]="selectJob.edesc">

src/app/components/job-detail-components/job-qualifications/sub-job-qualifications/sub-job-qualifications.component.ts

@@ -124,7 +124,7 @@ export class SubJobQualificationsComponent {
    
    
        downloadFile() {
-         const fileName = 'IMPORT_MJOBCODEV2.xlsx'
+         const fileName = 'IMPORT_MJOBCODE_PROPERTY.xlsx'
          this.fileService.downloadTemplate(fileName).subscribe({
            next: response => {
              const url = window.URL.createObjectURL(response);