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

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

@@ -236,7 +236,7 @@ export class ImportDataComponent {
     const formData = new FormData();
     formData.append('file', this.selectedFile);
     this.loading = true
-    this.fileService.uploadExcel(formData, 'MJOBCODE_COMPETENCY').subscribe({
+    this.fileService.uploadExcel(formData, 'MJOBCODE_GENERAL').subscribe({
       next: response => {
         if (response.success) {
           this.showAlert(response.message, 'success')

src/app/components/job-detail-components/job-detail/work-detail/work-detail.component.ts

-import { Component } from '@angular/core';
+import { ChangeDetectorRef, Component} from '@angular/core';
 import { ToastrService } from 'ngx-toastr';
-import { JobModel, MyJobModel } from 'src/app/shared/model/job.model';
+import { JobCodeModel, MyJobCodeModel } from 'src/app/shared/model/job-code.model';
+import { FileService } from 'src/app/shared/services/file.service';
+import { JobCodeService } from 'src/app/shared/services/job-code.service';
+
+
 
 @Component({
   selector: 'app-work-detail',
@@ -10,62 +14,158 @@ import { JobModel, MyJobModel } from 'src/app/shared/model/job.model';
 export class WorkDetailComponent {
     currentPage = 1
     page = Array.from({ length: 1 }, (_, i) => i + 1);
-  jobList: JobModel[] = []
-  job: JobModel = new MyJobModel({})
+    pageSize=10
     search = ""
+    jobCodeList:JobCodeModel[]=[]
+    loading = false
+
+    selectedFile: File | null = null;
+    selectedFileName: string = 'กรุณาเลือกไฟล์';
+
+    selectJob:JobCodeModel=new MyJobCodeModel({})
+    modalStatus=''
     constructor(
-    private toastr: ToastrService
+      private toastr: ToastrService,
+      private fileService: FileService,
+      private jobcodeService: JobCodeService,
+       private cdr: ChangeDetectorRef,
     ) { }
     ngOnInit(): void {
+      this.getListJob();
+    }
+    getListJob(){
+      this.loading = false
+      this.jobcodeService.getList().subscribe({
+        next: response => {
+          this.jobCodeList = response.map((x: any) => new MyJobCodeModel(x))
+          this.jobCodeList = this.jobCodeList.sort((a, b) => a.jobcodeId.localeCompare(b.jobcodeId))
+          this.loading = false
+          this.searchChange()
+          this.cdr.detectChanges()
+        }, error: error => {
+          this.loading = false
+          this.cdr.detectChanges()
+        }
+      })
     }
 
     searchChange() {
       this.currentPage = 1
-    this.page = Array.from({ length: Math.ceil(this.jobListFilter().length / 10) }, (_, i) => i + 1);
+      this.page = Array.from({ length: Math.ceil(this.jobcodeFilter().length / this.pageSize) }, (_, i) => i + 1);
+    }
+    edit(item :JobCodeModel){
+      this.selectJob = new MyJobCodeModel({})
+      this.selectJob = new MyJobCodeModel(item)
     }
-  jobListFilter() {
-    return this.jobList.filter(x => x.jobid.includes(this.search) ||
-      x.tdesc.includes(this.search) ||
-      x.edesc.includes(this.search))
+    clearValue(){
+      this.selectJob.competencyWorkText = ''
+      this.selectJob.serviceWorkText=''
+      this.selectJob.serviceWorkPercent = 0
+      this.selectJob.responsibleWorkText =''
+      this.selectJob.responsibleWorkPercent = 0
+      this.selectJob.specialWorkText =''
+      this.selectJob.specialWorkPercent = 0
+      this.selectJob.allPositionWorkText =''
+      this.selectJob.allPositionWorkPercent = 0
+      this.selectJob.otherWorkText=''
+      this.selectJob.otherWorkPercent = 0
     }
-  selectJob(job: JobModel) {
-    // this.showSuccess()
-    this.job = new MyJobModel(job)
+    toNumber(value: string | number): number {
+      return typeof value === 'string' ? parseInt(value) : value; 
     }
+    save(){
+      this.selectJob.serviceWorkPercent = this.toNumber(this.selectJob.serviceWorkPercent)
+      this.selectJob.responsibleWorkPercent = this.toNumber(this.selectJob.responsibleWorkPercent)
+      this.selectJob.specialWorkPercent = this.toNumber(this.selectJob.specialWorkPercent)
+      this.selectJob.allPositionWorkPercent = this.toNumber(this.selectJob.allPositionWorkPercent)
+      this.selectJob.otherWorkPercent = this.toNumber(this.selectJob.otherWorkPercent)
       
-  showSuccessAdd() {
-    this.toastr.success('บันทึกข้อมูลสำเร็จ', 'เเจ้งเตือน', {
-      timeOut: 3000,
-      positionClass: 'toast-top-right',
-    });
+      this.jobcodeService.post(this.selectJob).subscribe((response:any) => {
+        if (response.success) {
+          this.showAlert(response.message, 'success')
+          this.selectJob = new MyJobCodeModel({})
+          this.getListJob();
+        } else {
+          this.showAlert(response.message, 'error')
+        }
+        this.cdr.detectChanges()
+      })
+    }
+    deleteJob(){
+      this.jobcodeService.delete(this.selectJob).subscribe((response:any) => {
+        if (response.success) {
+          this.showAlert(response.message, 'success')
+          this.selectJob = new MyJobCodeModel({})
+          this.getListJob();
+        } else {
+          this.showAlert(response.message, 'error')
+        }
+        this.cdr.detectChanges()
+      })
+    }
+    jobcodeFilter() {
+      return this.jobCodeList.filter(x =>
+        x.tdesc.toLowerCase().includes(this.search.toLowerCase()) ||
+        x.edesc.toLowerCase().includes(this.search.toLowerCase()) ||
+        x.jobcodeId.toLowerCase().includes(this.search.toLowerCase())
+      )
+    }
+    onFileSelected(event: any) {
+      this.selectedFile = event.target.files.length > 0 ? event.target.files[0] : null;
+      this.selectedFileName = this.selectedFile?.name || "กรุณาเลือกไฟล์"
     }
   
-  showSuccessEdit() {
-    this.toastr.success('เเก้ไขข้อมูลสำเร็จ', 'เเจ้งเตือน', {
-      timeOut: 3000,
-      positionClass: 'toast-top-right',
-    });
+    uploadFile() {
+      if (!this.selectedFile) {
+        alert('กรุณาเลือกไฟล์ก่อนอัปโหลด')
+        return
+      }
+      const formData = new FormData();
+      formData.append('file', this.selectedFile);
+      this.loading = true
+      this.fileService.uploadExcel(formData, 'MJOBCODE_COMPETENCY').subscribe({
+        next: response => {
+          if (response.success) {
+            this.showAlert(response.message, 'success')
+            this.getListJob();
+          } else {
+            this.showAlert(response.message, 'error')
+            this.loading = false
           }
+        }, error: error => {
+          this.showAlert(error.message, 'error')
+          this.loading = false
+        }
+      })
+    }
+
 
-  showSuccessDelete() {
-    this.toastr.success('ลบข้อมูลสำเร็จ', 'เเจ้งเตือน', {
+    downloadFile() {
+      const fileName = 'IMPORT_MJOBCODEV2.xlsx'
+      this.fileService.downloadTemplate(fileName).subscribe({
+        next: response => {
+          const url = window.URL.createObjectURL(response);
+          const a = document.createElement("a");
+          a.href = url;
+          a.download = fileName;
+          document.body.appendChild(a);
+          a.click();
+          document.body.removeChild(a);
+          window.URL.revokeObjectURL(url);
+        }, error: error => {
+          this.showAlert(error.message, 'error')
+        }
+      })
+  
+    }
+
+    showAlert(text: string, type: 'success' | 'error') {
+      this.toastr[type](text, 'แจ้งเตือน', {
         timeOut: 3000,
         positionClass: 'toast-top-right',
-    });
-  }
-  addBu1() {
-    // this.bu1Service.post(this.bu1).subscribe((response:any) => {
-    //   if (response.success) {
-    //     this.getBu1List()
-    //   }
-    // })
-  }
-  deleteJob(job: JobModel) {
-    // this.bu1Service.delete(new MyBu1Model(bu1)).subscribe((response:any) => {
-    //   if (response.success) {
-    //     this.getBu1List()
-    //   }
-    // })
+      })
     }
 
+   
+
 }

src/app/shared/model/job-code.model.ts

@@ -34,6 +34,16 @@ export interface JobCodeModel {
     supervisor: string
     competencyWorkText: string
     supervisorPosition:PositionModel
+    serviceWorkText: string
+    serviceWorkPercent: number
+    responsibleWorkText: string
+    responsibleWorkPercent: number
+    specialWorkText: string
+    specialWorkPercent: number
+    allPositionWorkText: string
+    allPositionWorkPercent: number
+    otherWorkText: string
+    otherWorkPercent: number
 }
 
 export class MyJobCodeModel implements JobCodeModel {
@@ -62,6 +72,16 @@ export class MyJobCodeModel implements JobCodeModel {
     supervisor: string
     competencyWorkText: string
     supervisorPosition:PositionModel
+    serviceWorkText: string
+    serviceWorkPercent: number
+    responsibleWorkText: string
+    responsibleWorkPercent: number
+    specialWorkText: string
+    specialWorkPercent: number
+    allPositionWorkText: string
+    allPositionWorkPercent: number
+    otherWorkText: string
+    otherWorkPercent: number
     constructor(data: Partial<JobCodeModel>) {
         this.jobcodeId = data.jobcodeId || ""
         this.tdesc = data.tdesc || ""
@@ -88,7 +108,16 @@ export class MyJobCodeModel implements JobCodeModel {
         this.supervisor = data.supervisor || ""
         this.competencyWorkText = data.competencyWorkText || ""
         this.supervisorPosition = new MyPositionModel(data.supervisorPosition || {})
-
+        this.serviceWorkText = data.serviceWorkText || ""
+        this.serviceWorkPercent = data.serviceWorkPercent ?? 0
+        this.responsibleWorkText = data.responsibleWorkText || ""
+        this.responsibleWorkPercent = data.responsibleWorkPercent ?? 0
+        this.specialWorkText = data.specialWorkText || ""
+        this.specialWorkPercent = data.specialWorkPercent ?? 0
+        this.allPositionWorkText = data.allPositionWorkText || ""
+        this.allPositionWorkPercent = data.allPositionWorkPercent ?? 0
+        this.otherWorkText = data.otherWorkText || ""
+        this.otherWorkPercent = data.otherWorkPercent ?? 0
     }
 }