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

src/app/components/company-components/account-settings/user-settings/user-settings.component.ts

@@ -178,7 +178,7 @@ export class UserSettingsComponent {
     const formData = new FormData();
     formData.append('file', this.selectedFile);
     this.user.loading = true
-    this.fileService.upload(formData, 'muser').subscribe({
+    this.fileService.uploadExcel(formData, 'muser').subscribe({
       next: response => {
         if (response.success) {
           this.showAlert(response.message, 'success')
@@ -195,7 +195,7 @@ export class UserSettingsComponent {
   }
   downloadFile() {
     const fileName = 'IMPORT_USER.xlsx'
-    this.fileService.download(fileName).subscribe({
+    this.fileService.downloadTemplate(fileName).subscribe({
       next: response => {
         const url = window.URL.createObjectURL(response);
         const a = document.createElement("a");

src/app/components/company-components/company-registration/branch-business-unit/department-list/department-list.component.ts

@@ -65,7 +65,7 @@ export class DepartmentListComponent implements OnInit {
     const formData = new FormData();
     formData.append('file', this.selectedFile);
     this.bu2ListLoading = true
-    this.fileService.upload(formData, 'mbu2').subscribe({
+    this.fileService.uploadExcel(formData, 'mbu2').subscribe({
       next: response => {
         if (response.success) {
           this.showAlert(response.message, 'success')
@@ -83,7 +83,7 @@ export class DepartmentListComponent implements OnInit {
 
   downloadFile() {
     const fileName = 'IMPORT_BU.xlsx'
-    this.fileService.download(fileName).subscribe({
+    this.fileService.downloadTemplate(fileName).subscribe({
       next: response => {
         const url = window.URL.createObjectURL(response);
         const a = document.createElement("a");

src/app/components/company-components/company-registration/branch-business-unit/department-register/department-register.component.ts

@@ -42,7 +42,7 @@ export class DepartmentRegisterComponent implements OnInit {
     const formData = new FormData();
     formData.append('file', this.selectedFile);
     this.bu1ListLoading = true
-    this.fileService.upload(formData, 'mbu1').subscribe({
+    this.fileService.uploadExcel(formData, 'mbu1').subscribe({
       next: response => {
         if (response.success) {
           this.showAlert(response.message, 'success')
@@ -60,7 +60,7 @@ export class DepartmentRegisterComponent implements OnInit {
 
   downloadFile() {
     const fileName = 'IMPORT_BU.xlsx'
-    this.fileService.download(fileName).subscribe({
+    this.fileService.downloadTemplate(fileName).subscribe({
       next: response => {
         const url = window.URL.createObjectURL(response);
         const a = document.createElement("a");

src/app/components/company-components/company-registration/branch-business-unit/section-registration/section-registration.component.ts

@@ -66,7 +66,7 @@ export class SectionRegistrationComponent implements OnInit {
     const formData = new FormData();
     formData.append('file', this.selectedFile);
     this.bu3ListLoading = true
-    this.fileService.upload(formData, 'mbu3').subscribe({
+    this.fileService.uploadExcel(formData, 'mbu3').subscribe({
       next: response => {
         if (response.success) {
           this.showAlert(response.message, 'success')
@@ -84,7 +84,7 @@ export class SectionRegistrationComponent implements OnInit {
 
   downloadFile() {
     const fileName = 'IMPORT_BU.xlsx'
-    this.fileService.download(fileName).subscribe({
+    this.fileService.downloadTemplate(fileName).subscribe({
       next: response => {
         const url = window.URL.createObjectURL(response);
         const a = document.createElement("a");

src/app/components/company-components/company-registration/branch-business-unit/sub-department-four/sub-department-four.component.ts

@@ -66,7 +66,7 @@ export class SubDepartmentFourComponent implements OnInit {
     const formData = new FormData();
     formData.append('file', this.selectedFile);
     this.bu7ListLoading = true
-    this.fileService.upload(formData, 'mbu7').subscribe({
+    this.fileService.uploadExcel(formData, 'mbu7').subscribe({
       next: response => {
         if (response.success) {
           this.showAlert(response.message, 'success')
@@ -84,7 +84,7 @@ export class SubDepartmentFourComponent implements OnInit {
 
   downloadFile() {
     const fileName = 'IMPORT_BU.xlsx'
-    this.fileService.download(fileName).subscribe({
+    this.fileService.downloadTemplate(fileName).subscribe({
       next: response => {
         const url = window.URL.createObjectURL(response);
         const a = document.createElement("a");

src/app/components/company-components/company-registration/branch-business-unit/sub-department-one/sub-department-one.component.ts

@@ -66,7 +66,7 @@ export class SubDepartmentOneComponent implements OnInit {
     const formData = new FormData();
     formData.append('file', this.selectedFile);
     this.bu4ListLoading = true
-    this.fileService.upload(formData, 'mbu4').subscribe({
+    this.fileService.uploadExcel(formData, 'mbu4').subscribe({
       next: response => {
         if (response.success) {
           this.showAlert(response.message, 'success')
@@ -84,7 +84,7 @@ export class SubDepartmentOneComponent implements OnInit {
 
   downloadFile() {
     const fileName = 'IMPORT_BU.xlsx'
-    this.fileService.download(fileName).subscribe({
+    this.fileService.downloadTemplate(fileName).subscribe({
       next: response => {
         const url = window.URL.createObjectURL(response);
         const a = document.createElement("a");

src/app/components/company-components/company-registration/branch-business-unit/sub-department-three/sub-department-three.component.ts

@@ -66,7 +66,7 @@ export class SubDepartmentThreeComponent implements OnInit {
     const formData = new FormData();
     formData.append('file', this.selectedFile);
     this.bu6ListLoading = true
-    this.fileService.upload(formData, 'mbu6').subscribe({
+    this.fileService.uploadExcel(formData, 'mbu6').subscribe({
       next: response => {
         if (response.success) {
           this.showAlert(response.message, 'success')
@@ -84,7 +84,7 @@ export class SubDepartmentThreeComponent implements OnInit {
 
   downloadFile() {
     const fileName = 'IMPORT_BU.xlsx'
-    this.fileService.download(fileName).subscribe({
+    this.fileService.downloadTemplate(fileName).subscribe({
       next: response => {
         const url = window.URL.createObjectURL(response);
         const a = document.createElement("a");

src/app/components/company-components/company-registration/branch-business-unit/sub-department-two/sub-department-two.component.ts

@@ -65,7 +65,7 @@ export class SubDepartmentTwoComponent implements OnInit {
     const formData = new FormData();
     formData.append('file', this.selectedFile);
     this.bu5ListLoading = true
-    this.fileService.upload(formData, 'mbu5').subscribe({
+    this.fileService.uploadExcel(formData, 'mbu5').subscribe({
       next: response => {
         if (response.success) {
           this.showAlert(response.message, 'success')
@@ -83,7 +83,7 @@ export class SubDepartmentTwoComponent implements OnInit {
 
   downloadFile() {
     const fileName = 'IMPORT_BU.xlsx'
-    this.fileService.download(fileName).subscribe({
+    this.fileService.downloadTemplate(fileName).subscribe({
       next: response => {
         const url = window.URL.createObjectURL(response);
         const a = document.createElement("a");

src/app/components/company-components/company-registration/company-registration-page/company-registration-page.component.ts

@@ -142,7 +142,7 @@ export class CompanyRegistrationPageComponent {
     const formData = new FormData();
     formData.append('file', this.selectedFile);
     this.dataLoading = true
-    this.fileService.upload(formData, '').subscribe({
+    this.fileService.uploadExcel(formData, '').subscribe({
       next: response => {
         if (response.success) {
           this.showAlert(response.message, 'success')
@@ -161,7 +161,7 @@ export class CompanyRegistrationPageComponent {
   }
   downloadFile() {
     const fileName = '.xlsx'
-    this.fileService.download(fileName).subscribe({
+    this.fileService.downloadTemplate(fileName).subscribe({
       next: response => {
         const url = window.URL.createObjectURL(response);
         const a = document.createElement("a");

src/app/components/company-components/employee-registration/sub-employee-registration/sub-employee-registration.component.ts

@@ -98,7 +98,7 @@ export class SubEmployeeRegistrationComponent {
     const formData = new FormData();
     formData.append('file', this.selectedFile);
     this.employee.loading = true
-    this.fileService.upload(formData, '').subscribe({
+    this.fileService.uploadExcel(formData, '').subscribe({
       next: response => {
         if (response.success) {
           this.showAlert(response.message, 'success')
@@ -117,7 +117,7 @@ export class SubEmployeeRegistrationComponent {
   }
   downloadFile() {
     const fileName = 'IMPORT_MPOSITION.xlsx'
-    this.fileService.download(fileName).subscribe({
+    this.fileService.downloadTemplate(fileName).subscribe({
       next: response => {
         const url = window.URL.createObjectURL(response);
         const a = document.createElement("a");

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

@@ -54,7 +54,7 @@ export class EmployeeCategories {
     const formData = new FormData();
     this.dataLoading = true
     formData.append('file', this.selectedFile);
-    this.fileService.upload(formData, 'employment_type').subscribe({
+    this.fileService.uploadExcel(formData, 'employment_type').subscribe({
       next: response => {
         if (response.success) {
           this.showAlert(response.message, 'success')
@@ -74,7 +74,7 @@ export class EmployeeCategories {
 
   downloadFile() {
     const fileName = 'IMPORT_MEMPLOYMENTTYPE.xlsx'
-    this.fileService.download(fileName).subscribe({
+    this.fileService.downloadTemplate(fileName).subscribe({
       next: response => {
         const url = window.URL.createObjectURL(response);
         const a = document.createElement("a");

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

@@ -55,7 +55,7 @@ export class EmployeeGroupUnit implements OnInit {
     const formData = new FormData();
     formData.append('file', this.selectedFile);
     this.dataLoading = true
-    this.fileService.upload(formData, 'mgroup').subscribe({
+    this.fileService.uploadExcel(formData, 'mgroup').subscribe({
       next: response => {
         if (response.success) {
           this.showAlert(response.message, 'success')
@@ -73,7 +73,7 @@ export class EmployeeGroupUnit implements OnInit {
 
   downloadFile() {
     const fileName = 'IMPORT_MGROUP.xlsx'
-    this.fileService.download(fileName).subscribe({
+    this.fileService.downloadTemplate(fileName).subscribe({
       next: response => {
         const url = window.URL.createObjectURL(response);
         const a = document.createElement("a");

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

@@ -56,7 +56,7 @@ export class EmployeeLevel implements OnInit {
     const formData = new FormData();
     formData.append('file', this.selectedFile);
     this.dataLoading = true
-    this.fileService.upload(formData, 'pl').subscribe({
+    this.fileService.uploadExcel(formData, 'pl').subscribe({
       next: response => {
         if (response.success) {
           this.showAlert(response.message, 'success')
@@ -76,7 +76,7 @@ export class EmployeeLevel implements OnInit {
 
   downloadFile() {
     const fileName = 'IMPORT_PL.xlsx'
-    this.fileService.download(fileName).subscribe({
+    this.fileService.downloadTemplate(fileName).subscribe({
       next: response => {
         const url = window.URL.createObjectURL(response);
         const a = document.createElement("a");

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

@@ -55,7 +55,7 @@ export class PositionUnitComponent implements OnInit {
     const formData = new FormData();
     formData.append('file', this.selectedFile);
     this.dataLoading = true
-    this.fileService.upload(formData, 'mposition').subscribe({
+    this.fileService.uploadExcel(formData, 'mposition').subscribe({
       next: response => {
         if (response.success) {
           this.showAlert(response.message, 'success')
@@ -75,7 +75,7 @@ export class PositionUnitComponent implements OnInit {
 
   downloadFile() {
     const fileName = 'IMPORT_MPOSITION.xlsx'
-    this.fileService.download(fileName).subscribe({
+    this.fileService.downloadTemplate(fileName).subscribe({
       next: response => {
         const url = window.URL.createObjectURL(response);
         const a = document.createElement("a");

src/app/components/competency-assessment/competency-management/group-competencies/edit-group-competencies/edit-group-competencies.component.html

@@ -158,7 +158,7 @@
                                 </label>
                             </td>
                             <td style="font-size: 12px; width: 60%;">
-                                {{item.data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.competencyTopic.tdesc}}
+                                {{item.data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.tdesc}}
                             </td>
                             <td style="font-size: 12px;text-align: center;">
                                 {{item.data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.expectation}}
@@ -316,7 +316,7 @@
                                     <td style="font-size: 12px; width: 60%;">
                                         {{item.data.competencyIndicatorsCourses0.tdesc}}
                                     </td>
-                                    <td style="font-size: 12px;text-align: center;">
+                                    <td style="font-size: 12px;text-align: center; width: 20%;">
                                         {{item.data.competencyIndicatorsCourses0.expectation}}</td>
                                     <td class="flex justify-center">
                                         <div class="px-1">

src/app/components/competency-assessment/competency-management/group-competencies/edit-group-competencies/edit-group-competencies.component.ts

@@ -78,14 +78,27 @@ export class EditGroupCompetenciesComponent {
     this.page = Array.from({ length: Math.ceil(filteredData.length / 10) }, (_, i) => i + 1);
   }
   dataListFilter() {
-    return this.dataList.filter(x => {
-      const data = x.data
-      const match = data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.competencyTopic.competencyTopicId.toLowerCase().includes(this.search.toLowerCase()) ||
-        data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.competencyTopic.tdesc.toLowerCase().includes(this.search.toLowerCase()) ||
-        data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.expectation.toLocaleLowerCase().includes(this.search.toLocaleLowerCase())
-      return match;
-    });
+    return this.dataList
+      .filter(x => {
+        const data = x.data;
+        const match =
+          data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.competencyTopic.competencyTopicId.toLowerCase().includes(this.search.toLowerCase()) ||
+          data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.tdesc.toLowerCase().includes(this.search.toLowerCase()) ||
+          data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.expectation.toLowerCase().includes(this.search.toLowerCase());
+        return match;
+      })
+      .sort((a, b) => {
+        const topicA = a.data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.competencyTopic.competencyTopicId.toLowerCase();
+        const topicB = b.data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.competencyTopic.competencyTopicId.toLowerCase();
+        
+        const expectationA = a.data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.expectation.toLowerCase();
+        const expectationB = b.data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.expectation.toLowerCase();
+
+        return topicA.localeCompare(topicB) || expectationA.localeCompare(expectationB);
+      });
   }
+  
+
 
   getIndicatorsCoursesList() {
     this.dataModalLoading = true
@@ -131,7 +144,6 @@ export class EditGroupCompetenciesComponent {
     this.groupCompetencies.groupAssessment1List = this.dataList.map(x => x.data);
     this.groupAssessmentService.post(this.groupCompetencies).subscribe({
       next: (response) => {
-        console.log(response)
         if (response.success) {
           this.showAlert(response.message, 'success');
         } else {

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

@@ -39,7 +39,8 @@
             </div>
             <div class="px-1">
                 <button type="button" class="ti-btn ti-btn-soft-secondary h-10 m-0 shadow-md"
-                    data-hs-overlay="#competency-topic-page-modal" (click)="modalStatus='add';setData()">
+                    data-hs-overlay="#competency-topic-page-modal"
+                    (click)="modalStatus='add';setData();fileInputMedium.value = '';examFile=null;examFileName = 'กรุณาเลือกไฟล์'">
                     <i class="ri-add-line"></i>
                     Add
                 </button>
@@ -176,7 +177,8 @@
             <div class="ti-modal-center">
                 <div class="flex justify-end" style="padding-right: 1rem;">
                     <div class="px-1">
-                        <button type="button" class="ti-btn ti-btn-soft-indigo h-45px m-0 shadow-md" (click)="clearData(modalStatus)">
+                        <button type="button" class="ti-btn ti-btn-soft-indigo h-45px m-0 shadow-md"
+                            (click)="clearData(modalStatus)">
                             <svg class="svg-indigo" width="16" height="16" viewBox="0 0 64.00 64.00"
                                 xmlns="http://www.w3.org/2000/svg" fill="none" stroke="#595BEA" stroke-width="3.84"
                                 transform="rotate(45)matrix(-1, 0, 0, 1, 0, 0)">
@@ -233,25 +235,31 @@
                     </div>
                 </div>
                 <label class="ti-form-label mt-2rem">แนบไฟล์ข้อสอบ</label>
-                <div>
-                    <div class="flex rounded-md">
-                        <label for="file-input-medium" class="sr-only">อัปโหลดไฟล์</label>
-                        <input type="file" id="file-input-medium" name="file-input-medium"
-                            class="block w-full border border-gray-200 focus:shadow-sm dark:focus:shadow-white/10 ltr:rounded-l-md rtl:rounded-r-none text-sm focus:z-10 focus:outline-0 focus:border-gray-200 dark:focus:border-white/10 dark:border-white/10 dark:text-white/70 file:border-0 file:bg-gray-100 ltr:file:mr-4 rtl:file:ml-4 file:py-3 file:px-4 dark:file:bg-black/20 dark:file:text-white/70">
-                        <span
-                            class="px-4 inline-flex items-center min-w-fit ltr:rounded-r-md rtl:rounded-l-none border ltr:border-l-0 rtl:border-r-0 border-gray-200 bg-gray-50 text-sm dark:bg-black/20 dark:border-white/10">
-                            <button class="text-sm text-gray-500 dark:text-white/70"
-                                onclick="document.getElementById('file-input-medium').click();">Browse</button>
-                        </span>
-                        <div class="flex items-center ml-2">
-                            <button href="javascript:void(0);"
-                                class="ti-btn ti-btn-soft-danger h-10px m-0 shadow-md rounded-md">
-                                <i class="ri-delete-bin-6-line"></i>
-                                Delete
-                            </button>
-                        </div>
+                <div class="flex rounded-md">
+                    <label class="sr-only">อัปโหลดไฟล์</label>
+                    <input #fileInputMedium id="fileInputMedium" type="file" (change)="onExamSelected($event)" hidden>
+                    <input type="text" [value]="examFileName" readonly onclick="fileInputMedium.click();"
+                        class=" cursor-pointer block w-full border border-gray-200 focus:shadow-sm dark:focus:shadow-white/10 ltr:rounded-l-md rtl:rounded-r-none text-sm focus:z-10 focus:outline-0 focus:border-gray-200 dark:focus:border-white/10 dark:border-white/10 dark:text-white/70 file:border-0 file:bg-gray-100 ltr:file:mr-4 rtl:file:ml-4 file:py-3 file:px-4 dark:file:bg-black/20 dark:file:text-white/70">
+                    <span
+                        class="px-4 inline-flex items-center min-w-fit ltr:rounded-r-md rtl:rounded-l-none border ltr:border-l-0 rtl:border-r-0 border-gray-200 bg-gray-50 text-sm dark:bg-black/20 dark:border-white/10">
+                        <button class="text-sm text-gray-500 dark:text-white/70"
+                            onclick="fileInputMedium.click();">Browse</button>
+                    </span>
+                    <div class="flex items-center ml-2">
+                        <button href="javascript:void(0);"
+                            class="ti-btn ti-btn-soft-danger h-10px m-0 shadow-md rounded-md"
+                            (click)="fileInputMedium.value = '';examFile=null;examFileName = 'กรุณาเลือกไฟล์'">
+                            <i class="ri-delete-bin-6-line"></i>
+                            Delete
+                        </button>
                     </div>
                 </div>
+                <div class="flex" *ngIf="examFileName==dataSelect.file">
+                    <h1 class="cursor-pointer justify-center -mb-px inline-flex items-center gap-2 font-weight-500 font-size-12px
+                    text-center text-secondary border-secondary border-b-2 align-items-end"
+                        (click)="dowloadExam(examFileName)">
+                        ดาวน์โหลดไฟล์ข้อสอบ</h1>
+                </div>
                 <div class="flex justify-end mt-3rem mb-1rem space-x-4">
                     <button type="button"
                         class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10"
@@ -560,7 +568,7 @@
                 <div class="flex justify-end">
                     <ng-container *ngIf="modalStatus=='add'||modalStatus=='edit'">
                         <button type="button" class="hs-dropdown-toggle ti-modal-clode-btn text-danger"
-                            data-hs-overlay="#competency-topic-page-alert-modal">
+                            data-hs-overlay="#competency-topic-page-modal">
                             <span class="sr-only">Close</span>
                             <i class="ti ti-circle-x fs-xxl"></i>
                         </button>
@@ -632,6 +640,11 @@
                         <i class="ti ti-upload"></i>
                     </button>
                 </div>
+                <div class="flex justify-center mt-2rem ">
+                    <h1 class="cursor-pointer justify-center -mb-px inline-flex items-center gap-2 font-weight-500 font-size-12px
+                    text-center text-secondary border-secondary border-b-2 align-items-end" (click)="downloadFile()">
+                        ดาวน์โหลดตัวอย่างไฟล์</h1>
+                </div>
                 <div class="flex justify-center mt-2rem mb-1rem space-x-4">
                     <button type="submit" class="ti-btn ti-btn-secondary"
                         data-hs-overlay="#competency-topic-upload-modal" [class.ti-btn-disabled]="!selectedFile"

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

@@ -12,6 +12,7 @@ export interface DataModel {
   code: string
   definition: string
   type: DataModel2
+  file: string
   checked: boolean
 }
 export interface DataModel2 {
@@ -50,13 +51,15 @@ export class CompetencyTopic {
   currentModal = "";
   dataLoading = false
   dataSelectList: DataModel[] = [];
-  dataSelect: DataModel = { id: "", name: "", edesc: "", code: "", definition: "", type: { id: "", name: "", edesc: "", code: "", level: "" }, checked: false }
+  dataSelect: DataModel = { id: "", name: "", edesc: "", code: "", definition: "", file: "", type: { id: "", name: "", edesc: "", code: "", level: "" }, checked: false }
   competencytypeListLoading = false
   competencytypeList: DataModel2[] = []
   competoncyTopicList: { check: boolean; data: DataModel & { checked?: boolean } }[] = []
   modalStatus = 'add'
   selectedFile: File | null = null;
   selectedFileName: string = 'กรุณาเลือกไฟล์';
+  examFile: File | null = null;
+  examFileName: string = 'กรุณาเลือกไฟล์';
   selectedItems: string[] = [];
 
 
@@ -74,6 +77,52 @@ export class CompetencyTopic {
     this.getCompetencytypeList()
   }
 
+
+
+  onExamSelected(event: any) {
+    this.examFile = event.target.files.length > 0 ? event.target.files[0] : null;
+    this.examFileName = this.examFile?.name || "กรุณาเลือกไฟล์"
+  }
+  uploadExam() {
+    if (!this.examFile) {
+      return
+    }
+    const formData = new FormData();
+    formData.append('file', this.examFile);
+    this.fileService.uploadFiles(formData).subscribe({
+      next: response => {
+        if (response.success) {
+          this.examFile = null
+          this.addCompetency_topic(response.resultObject)
+        } else {
+          this.showAlert(response.message, 'error')
+          this.cdr.detectChanges()
+        }
+      }, error: error => {
+        this.showAlert(error.message, 'error')
+        this.cdr.detectChanges()
+      }
+    })
+  }
+  dowloadExam(fileName: string) {
+    this.fileService.dowloadFiles(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);
+        this.cdr.detectChanges()
+      }, error: error => {
+        this.showAlert(error.message, 'error')
+        this.cdr.detectChanges()
+      }
+    })
+  }
+
   onFileSelected(event: any) {
     this.selectedFile = event.target.files.length > 0 ? event.target.files[0] : null;
     this.selectedFileName = this.selectedFile?.name || "กรุณาเลือกไฟล์"
@@ -87,7 +136,7 @@ export class CompetencyTopic {
     const formData = new FormData();
     formData.append('file', this.selectedFile);
     this.dataLoading = true
-    this.fileService.upload(formData, 'competency_topic').subscribe({
+    this.fileService.uploadExcel(formData, 'competency_topic').subscribe({
       next: response => {
         if (response.success) {
           this.showAlert(response.message, 'success')
@@ -108,7 +157,7 @@ export class CompetencyTopic {
 
   downloadFile() {
     const fileName = 'IMPORT_COMPETENCY_TOPIC.xlsx'
-    this.fileService.download(fileName).subscribe({
+    this.fileService.downloadTemplate(fileName).subscribe({
       next: response => {
         const url = window.URL.createObjectURL(response);
         const a = document.createElement("a");
@@ -159,7 +208,7 @@ export class CompetencyTopic {
       next: response => {
         this.competoncyTopicList = response.map(x => ({
           check: false, data: {
-            id: x.competencyTopicId, name: x.tdesc, edesc: x.edesc, code: x.competencyType.shortName, definition: x.competencyDetail,
+            id: x.competencyTopicId, name: x.tdesc, edesc: x.edesc, code: x.competencyType.shortName, definition: x.competencyDetail, file: x.competencyFiles,
             type: { id: x.competencyType.competencyTypeId, name: x.competencyType.tdesc, edesc: x.competencyType.edesc, code: x.competencyType.shortName, level: x.expectationLevel },
             checked: false
           }
@@ -171,7 +220,6 @@ export class CompetencyTopic {
         this.cdr.detectChanges()
       }, error: error => {
         this.dataLoading = false
-        console.error('Error fetching employee types:', error);
         this.cdr.detectChanges()
       }
     })
@@ -189,33 +237,38 @@ export class CompetencyTopic {
     });
   }
   setData(data?: DataModel) {
-    this.dataSelect = JSON.parse(JSON.stringify(data || { id: "", name: "", edesc: "", code: "", definition: "", type: { id: "", name: "", edesc: "", code: "", level: "" }, checked: false }));
+    this.examFileName = data?.file || 'กรุณาเลือกไฟล์'
+    this.dataSelect = JSON.parse(JSON.stringify(data || { id: "", name: "", edesc: "", code: "", definition: "", file: "", type: { id: "", name: "", edesc: "", code: "", level: "" }, checked: false }));
   }
 
-  // ฟังก์ชันสำหรับการเพิ่ม ลบ หรือแก้ไข ข้อมูล
-  addCompetency_topic() {
-    const body = new MyCompetencytopicModel({
-      competencyTopicId: this.dataSelect.id, tdesc: this.dataSelect.name, edesc: this.dataSelect.edesc, competencyDetail: this.dataSelect.definition,
-      competencyType: new MyCompetencytypeModel({ competencyTypeId: this.dataSelect.type.id, tdesc: this.dataSelect.type.name, edesc: this.dataSelect.type.edesc, shortName: this.dataSelect.type.code, expectationLevel: this.dataSelect.type.level }),
-    })
-    this.dataLoading = true
-    this.competencytopicService.post(body).subscribe({
-      next: response => {
-        if (response.success) {
-          this.showAlert(response.message, 'success')
-          this.getCompetencytypeList()
-          this.getCompetencytopicList()
-        } else {
-          this.showAlert(response.message, 'error')
+  addCompetency_topic(competencyFiles?: string) {
+    if (this.examFile) {
+      this.uploadExam()
+    } else {
+      const body = new MyCompetencytopicModel({
+        competencyTopicId: this.dataSelect.id, tdesc: this.dataSelect.name, edesc: this.dataSelect.edesc, competencyDetail: this.dataSelect.definition,
+        competencyType: new MyCompetencytypeModel({ competencyTypeId: this.dataSelect.type.id, tdesc: this.dataSelect.type.name, edesc: this.dataSelect.type.edesc, shortName: this.dataSelect.type.code, expectationLevel: this.dataSelect.type.level }),
+        competencyFiles: competencyFiles || ""
+      })
+      this.dataLoading = true
+      this.competencytopicService.post(body).subscribe({
+        next: response => {
+          if (response.success) {
+            this.showAlert(response.message, 'success')
+            this.getCompetencytypeList()
+            this.getCompetencytopicList()
+          } else {
+            this.showAlert(response.message, 'error')
+            this.dataLoading = false
+            this.cdr.detectChanges()
+          }
+        }, error: error => {
+          this.showAlert(error.message, 'error')
           this.dataLoading = false
           this.cdr.detectChanges()
         }
-      }, error: error => {
-        this.showAlert(error.message, 'error')
-        this.dataLoading = false
-        this.cdr.detectChanges()
-      }
-    })
+      })
+    }
   }
   deleteCompetency_topic() {
     let body: any
@@ -261,7 +314,7 @@ export class CompetencyTopic {
     if (modalStatus == 'add') {
       this.setData()
     } else if (modalStatus == 'edit') {
-      this.setData({ id: this.dataSelect.id, name: "", edesc: "", code: "", definition: "", type: { id: "", name: "", edesc: "", code: "", level: "" }, checked: this.dataSelect.checked })
+      this.setData({ id: this.dataSelect.id, name: "", edesc: "", code: "", definition: "", file: "", type: { id: "", name: "", edesc: "", code: "", level: "" }, checked: this.dataSelect.checked })
     }
   }
 

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

@@ -215,7 +215,7 @@
                 <input type="text" id="detail_eng" class="ti-form-input w-2/3" [(ngModel)]="dataSelect.code">
                 <label for="detail_eng" class="ti-form-label mt-1rem">ระดับความคาดหวัง *</label>
                 <input type="text" id="detail_eng" class="ti-form-input" style="width: 200px;"
-                    [(ngModel)]="dataSelect.level">
+                    oninput="this.value = this.value.replace(/\D/g, '')" [(ngModel)]="dataSelect.level">
                 <div class="flex justify-end mt-2rem mb-1rem">
                     <button type="button"
                         class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10"
@@ -318,10 +318,16 @@
                         <i class="ti ti-upload"></i>
                     </button>
                 </div>
+                <div class="flex justify-center mt-2rem ">
+                    <h1 class="cursor-pointer justify-center -mb-px inline-flex items-center gap-2 font-weight-500 font-size-12px
+                    text-center text-secondary border-secondary border-b-2 align-items-end" (click)="downloadFile()">
+                        ดาวน์โหลดตัวอย่างไฟล์</h1>
+                </div>
                 <div class="flex justify-center mt-2rem mb-1rem space-x-4">
                     <button type="submit" class="ti-btn ti-btn-secondary"
-                        data-hs-overlay="#type-registration-component-upload-modal" [class.ti-btn-disabled]="!selectedFile"
-                        (click)="uploadFile()" [disabled]="!selectedFile" [disabled]="!selectedFile">
+                        data-hs-overlay="#type-registration-component-upload-modal"
+                        [class.ti-btn-disabled]="!selectedFile" (click)="uploadFile()" [disabled]="!selectedFile"
+                        [disabled]="!selectedFile">
                         อัปโหลด
                     </button>
                 </div>

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

@@ -60,7 +60,7 @@ export class TypeRegistration {
     const formData = new FormData();
     formData.append('file', this.selectedFile);
     this.dataLoading = true
-    this.fileService.upload(formData, 'competency_type').subscribe({
+    this.fileService.uploadExcel(formData, 'competency_type').subscribe({
       next: response => {
         if (response.success) {
           this.showAlert(response.message, 'success')
@@ -80,7 +80,7 @@ export class TypeRegistration {
 
   downloadFile() {
     const fileName = 'IMPORT_COMPETENCY_TYPE.xlsx'
-    this.fileService.download(fileName).subscribe({
+    this.fileService.downloadTemplate(fileName).subscribe({
       next: response => {
         const url = window.URL.createObjectURL(response);
         const a = document.createElement("a");

src/app/components/competency-assessment/tool-register/assessment-tool/assessment-tool.component.html

 <div class="w-full min-height-50px mb-10px justify-between items-center">
     <div class="flex justify-between">
-        <div class="flex pr-2">
-            <!-- Content ของ div แรก -->
-            <div class="flex gap-x-6">
-                <div class="flex items-center">
-                    <label for="hs-checkbox-group-1"
-                        class="text-sm text-gray-500 ltr:ml-2 rtl:mr-2 dark:text-white/70">{{mockDataSelect.length}}
-                        Selected</label>
-                </div>
-
-                <div class="flex items-center">
-                    <i (click)="toggleCheckbox()"
-                        [ngClass]="{'ri-checkbox-multiple-line': !isChecked, 'ri-checkbox-multiple-fill': isChecked}"
-                        class="ri-checkbox-multiple-line text-gray-500 dark:text-white/70"></i>
-                    <label for="hs-checkbox-group-2" class="text-sm text-gray-500 ltr:ml-2 rtl:mr-2 dark:text-white/70"
-                        (click)="toggleCheckbox()">Select All</label>
-                </div>
-
+        <div class="flex">
+            <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">
+                    {{numDataListChecked}} Selected</label>
+            </div>
+            <div class="mx-1 flex items-center">
+                <button (click)="isDataListCheckedAll = !isDataListCheckedAll;dataListCheckAll()"
+                    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>
             </div>
         </div>
 
@@ -35,28 +32,26 @@
             <div class="px-1">
                 <button type="button"
                     class="ti-btn ti-btn bg-pink-500/10 text-pink-500 hover:text-white hover:bg-pink-500 ring-offset-white focus:ring-pink-500 dark:focus:ring-offset-white/10 h-10 m-0 shadow-md"
-                    data-hs-overlay="#assessment-tool-component-modal-add">
+                    data-hs-overlay="#assessment-tool-upload-modal"
+                    (click)="fileInput.value = '';selectedFile=null;selectedFileName = 'กรุณาเลือกไฟล์'">
                     <i class="ti ti-file-plus"></i>
                     import
                 </button>
             </div>
             <div class="px-1">
                 <button type="button" class="ti-btn ti-btn-soft-secondary h-10 m-0 shadow-md"
-                    data-hs-overlay="#assessment-tool-component-modal-add" (click)="selectAssessment()">
+                    data-hs-overlay="#assessment-tool-modal" (click)="currentModal='add';selectAssessment()">
                     <i class="ri-add-line"></i>
                     Add
                 </button>
             </div>
             <div class="px-1">
-                <button href="javascript:void(0);" class="ti-btn ti-btn-soft-danger h-10 m-0 shadow-md">
+                <button href="javascript:void(0);" class="ti-btn ti-btn-soft-danger h-10 m-0 shadow-md"
+                    data-hs-overlay="#assessment-tool-alert-modal"
+                    (click)="currentModal='deleteGroup';selectAssessment()">
                     <i class="ri-delete-bin-6-line"></i>
                     Delete
                 </button>
-                <!-- <button href="javascript:void(0);" class="ti-btn ti-btn-soft-danger h-10 m-0 shadow-md"
-                    data-hs-overlay="#assessment-tool-component-alert-delete-modal">
-                    <i class="ri-delete-bin-6-line"></i>
-                    Delete
-                </button> -->
             </div>
             <div class="px-1">
                 <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-10 m-0 shadow-md">
@@ -84,7 +79,7 @@
                     </ng-container>
                 </tr>
             </thead>
-            <tbody *ngIf="dataLoading">
+            <tbody *ngIf="assessment.loading">
                 <tr>
                     <td class="text-center" colspan="100%">
                         <div *ngFor="let item of [1,2,3]" class="ti-spinner w-8 h-8 text-secondary mx-1" role="status"
@@ -94,30 +89,30 @@
                     </td>
                 </tr>
             </tbody>
-            <tbody *ngIf="!dataLoading&&!dataListFilter().length">
+            <tbody *ngIf="!assessment.loading&&!assessmentListFilter().length">
                 <tr>
                     <td class="text-center" colspan="100%">
                         ไม่พบข้อมูล
                     </td>
                 </tr>
             </tbody>
-            <tbody *ngIf="!dataLoading&&dataListFilter().length">
+            <tbody *ngIf="!assessment.loading&&assessmentListFilter().length">
                 <tr
-                    *ngFor="let item of dataListFilter()| slice:((currentPage-1) * 10) : (((currentPage-1) * 10) + 10);let i = index">
+                    *ngFor="let item of assessmentListFilter()| 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.id}}"
-                            [(ngModel)]="item.checked" (change)="checkSelect()">
-                        <label for="checkbox-{{item.id}}">&nbsp;{{item.id}}</label>
+                        <input type="checkbox" class="ti-form-checkbox cursor-pointer"
+                            id="checkbox-{{item.data.assessmentId}}" [(ngModel)]="item.check"
+                            (ngModelChange)="dataListCheck()">
+                        <label for="checkbox-{{item.data.assessmentId}}">&nbsp;{{item.data.assessmentId}}</label>
                     </td>
-                    <td>{{item.name}}</td>
-                    <td class="text-center">{{item.code}}</td>
+                    <td>{{item.data.tdesc}}</td>
+                    <td class="text-center">{{item.data.shortName}}</td>
                     <td class="flex justify-center">
-                        <i class="ti ti-edit cursor-pointer i-gray fs-l px-1"
-                            data-hs-overlay="#assessment-tool-component-modal-edit"
-                            (click)="selectAssessment(item)"></i>
+                        <i class="ti ti-edit cursor-pointer i-gray fs-l px-1" data-hs-overlay="#assessment-tool-modal"
+                            (click)="currentModal='edit';selectAssessment(item.data)"></i>
                         <i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
-                            data-hs-overlay="#assessment-tool-component-alert-delete-modal"
-                            (click)="selectAssessment(item)"></i>
+                            data-hs-overlay="#assessment-tool-alert-modal"
+                            (click)="currentModal='delete';selectAssessment(item.data)"></i>
                     </td>
                 </tr>
             </tbody>
@@ -155,92 +150,65 @@
             </li>
         </ul>
         <ul class="nav-tabs mt-3">
-            <span>Show {{((currentPage-1) * 10)+1}} to {{dataListFilter().length<10 ?dataListFilter().length:
-                    (currentPage==page.length ? ((currentPage * 10) - ((currentPage * 10) - dataListFilter().length) )
-                    :(currentPage * 10) ) }} of {{dataListFilter().length}} items</span>
+            <span>Show {{((currentPage-1) * 10)+1}} to {{assessmentListFilter().length<10
+                    ?assessmentListFilter().length: (currentPage==page.length ? ((currentPage * 10) - ((currentPage *
+                    10) - assessmentListFilter().length) ) :(currentPage * 10) ) }} of {{assessmentListFilter().length}}
+                    items</span>
         </ul>
     </nav>
 </div>
 
 
 
-<div id="assessment-tool-component-modal-add" class="hs-overlay hidden ti-modal">
-    <div class="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out h-[calc(100%-3.5rem)]">
-        <div class="max-h-full overflow-hidden ti-modal-content">
-            <div class="ti-modal-header">
-                <h3 class="text-xxl font-bold text-primary">
-                    เพิ่มเครื่องมือประเมิน
-                </h3>
-                <div class="flex justify-end">
-                    <button type="button" class="hs-dropdown-toggle ti-modal-clode-btn text-danger"
-                        data-hs-overlay="#assessment-tool-component-modal-add">
-                        <span class="sr-only">Close</span>
-                        <i class="ti ti-circle-x fs-xxl"></i>
+<div id="assessment-tool-upload-modal" class="hs-overlay hidden ti-modal">
+    <div class="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out rounded-md">
+        <div class="ti-modal-header bg-primary !rounded-none !rounded-t-sm">
+            <h5 class="text-xxl font-bold text-white">
+                นำเข้าเครื่องมือประเมิน
+            </h5>
+        </div>
+        <div class="ti-modal-body max-h-full overflow-hidden ti-modal-content !rounded-t-none !rounded-b-sm">
+            <h1 class="mt-2" style="text-align: center;">ไฟล์</h1>
+            <div class="mt-2 p-2">
+                <div class="flex rounded-md">
+                    <input #fileInput id="fileInput" type="file" (change)="onFileSelected($event)" hidden>
+                    <input type="text" [value]="selectedFileName" readonly (click)="fileInput.click()"
+                        class="ti-form-input rounded-none ltr:rounded-l-md rtl:rounded-r-md focus:z-10 cursor-pointer">
+                    <button type="button" (click)="fileInput.click()"
+                        class="inline-flex flex-shrink-0 justify-center items-center h-[2.875rem] w-[2.875rem] ltr:rounded-r-md rtl:rounded-l-md border border-transparent font-semibold bg-secondary text-white hover:bg-secondary focus:z-10 focus:outline-none focus:ring-0 focus:ring-secondary transition-all text-sm">
+                        <i class="ti ti-upload"></i>
                     </button>
                 </div>
-            </div>
-            <div class="ti-modal-center">
-                <div class="flex justify-end" style="padding-right: 1rem;">
-                    <div class="px-1">
-                        <button type="button" class="ti-btn ti-btn-soft-indigo h-45px m-0 shadow-md">
-                            <svg class="svg-indigo" width="16" height="16" viewBox="0 0 64.00 64.00"
-                                xmlns="http://www.w3.org/2000/svg" fill="none" stroke="#595BEA" stroke-width="3.84"
-                                transform="rotate(45)matrix(-1, 0, 0, 1, 0, 0)">
-                                <g id="SVGRepo_bgCarrier" stroke-width="0"></g>
-                                <g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"></g>
-                                <g id="SVGRepo_iconCarrier">
-                                    <path d="M15 49A24 24 0 0 1 32 8"></path>
-                                    <path d="M49 15a24 24 0 0 1-17 41"></path>
-                                    <polyline points="15.03 40 15.03 48.97 8 48.97"></polyline>
-                                    <polyline points="48.97 24 48.97 15.03 56 15.03"></polyline>
-                                </g>
-                            </svg>
-                            Clear
-                        </button>
-                    </div>
-                    <div class="px-1">
-                        <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
-                            <i class="ti ti-book fs-l"></i>
-                            Help
-                        </button>
-                    </div>
+                <div class="flex justify-center mt-2rem ">
+                    <h1 class="cursor-pointer justify-center -mb-px inline-flex items-center gap-2 font-weight-500 font-size-12px
+                    text-center text-secondary border-secondary border-b-2 align-items-end" (click)="downloadFile()">
+                        ดาวน์โหลดตัวอย่างไฟล์</h1>
                 </div>
-            </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" [(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-full" [(ngModel)]="dataSelect.name">
-                <label for="detail_eng" class="ti-form-label mt-1rem">ชื่อเครื่องมือประเมิน (อังกฤษ)</label>
-                <input type="text" id="detail_eng" class="ti-form-input w-full" [(ngModel)]="dataSelect.edesc">
-                <label for="detail_eng" class="ti-form-label mt-1rem">ชื่อที่ใช้เเสดง *</label>
-                <input type="text" id="showname" class="ti-form-input w-full" [(ngModel)]="dataSelect.code">
-                <div class="flex justify-end mt-2rem mb-1rem">
-                    <button type="button"
-                        class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10"
-                        data-hs-overlay="#assessment-tool-component-modal-add">
-                        ย้อนกลับ
+                <div class="flex justify-center mt-2rem mb-1rem space-x-4">
+                    <button type="submit" class="ti-btn ti-btn-secondary"
+                        data-hs-overlay="#assessment-tool-upload-modal" [class.ti-btn-disabled]="!selectedFile"
+                        (click)="uploadFile()" [disabled]="!selectedFile" [disabled]="!selectedFile">
+                        อัปโหลด
                     </button>
-                    <a class="ti-btn ti-btn-success" href="javascript:void(0);"
-                        data-hs-overlay="#assessment-tool-component-alert-modal">
-                        บันทึกข้อมูล
-                    </a>
                 </div>
             </div>
         </div>
     </div>
 </div>
 
-<div id="assessment-tool-component-modal-edit" class="hs-overlay hidden ti-modal">
+<div id="assessment-tool-modal" class="hs-overlay hidden ti-modal">
     <div class="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out h-[calc(100%-3.5rem)]">
         <div class="max-h-full overflow-hidden ti-modal-content">
             <div class="ti-modal-header">
-                <h3 class="text-xxl font-bold text-primary">
-                    เเก้ไขเครื่องมือประเมิน
+                <h3 class="text-xxl font-bold text-primary" *ngIf="currentModal=='add'">
+                    เพิ่มเครื่องมือประเมิน
+                </h3>
+                <h3 class="text-xxl font-bold text-primary" *ngIf="currentModal=='edit'">
+                    แก้ไขเครื่องมือประเมิน
                 </h3>
                 <div class="flex justify-end">
                     <button type="button" class="hs-dropdown-toggle ti-modal-clode-btn text-danger"
-                        data-hs-overlay="#assessment-tool-component-modal-edit">
+                        data-hs-overlay="#assessment-tool-modal">
                         <span class="sr-only">Close</span>
                         <i class="ti ti-circle-x fs-xxl"></i>
                     </button>
@@ -249,7 +217,8 @@
             <div class="ti-modal-center">
                 <div class="flex justify-end" style="padding-right: 1rem;">
                     <div class="px-1">
-                        <button type="button" class="ti-btn ti-btn-soft-indigo h-45px m-0 shadow-md">
+                        <button type="button" class="ti-btn ti-btn-soft-indigo h-45px m-0 shadow-md"
+                            (click)="clearAssessment(currentModal)">
                             <svg class="svg-indigo" width="16" height="16" viewBox="0 0 64.00 64.00"
                                 xmlns="http://www.w3.org/2000/svg" fill="none" stroke="#595BEA" stroke-width="3.84"
                                 transform="rotate(45)matrix(-1, 0, 0, 1, 0, 0)">
@@ -274,133 +243,85 @@
                 </div>
             </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 bg-input-readonly" readonly
-                    [(ngModel)]="dataSelect.id">
+                <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':currentModal=='edit'}" [readonly]="currentModal=='edit'"
+                    [(ngModel)]="assessment.select.assessmentId">
                 <label for="detail_th" class="ti-form-label mt-1rem">ชื่อเครื่องมือประเมิน (ไทย)*</label>
-                <input type="text" id="detail_th" class="ti-form-input w-full" [(ngModel)]="dataSelect.name">
+                <input type="text" id="detail_th" class="ti-form-input w-full" [(ngModel)]="assessment.select.tdesc">
                 <label for="detail_eng" class="ti-form-label mt-1rem">ชื่อเครื่องมือประเมิน (อังกฤษ)</label>
-                <input type="text" id="detail_eng" class="ti-form-input w-full" [(ngModel)]="dataSelect.edesc">
-                <label for="detail_eng" class="ti-form-label mt-1rem">ชื่อที่ใช้เเสดง *</label>
-                <input type="text" id="showname" class="ti-form-input w-full" [(ngModel)]="dataSelect.code">
+                <input type="text" id="detail_eng" class="ti-form-input w-full" [(ngModel)]="assessment.select.edesc">
+                <label for="detail_eng" class="ti-form-label mt-1rem">ชื่อที่ใช้เเสดง*</label>
+                <input type="text" id="showname" class="ti-form-input w-full" [(ngModel)]="assessment.select.shortName">
                 <div class="flex justify-end mt-2rem mb-1rem">
                     <button type="button"
                         class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10"
-                        data-hs-overlay="#assessment-tool-component-modal-edit">
+                        data-hs-overlay="#assessment-tool-modal">
                         ย้อนกลับ
                     </button>
-                    <a class="ti-btn ti-btn-success" href="javascript:void(0);"
-                        data-hs-overlay="#assessment-tool-component-alert-edit-modal">
+                    <button type="button" class="ti-btn ti-btn-success" data-hs-overlay="#assessment-tool-alert-modal"
+                        [class.ti-btn-disabled]="!assessment.select.assessmentId||!assessment.select.tdesc||!assessment.select.shortName"
+                        [disabled]="!assessment.select.assessmentId||!assessment.select.tdesc||!assessment.select.shortName">
                         บันทึกข้อมูล
-                    </a>
+                    </button>
                 </div>
             </div>
         </div>
-
     </div>
 </div>
 
-<div id="assessment-tool-component-alert-modal" class="hs-overlay hidden ti-modal">
+<div id="assessment-tool-alert-modal" class="hs-overlay hidden ti-modal">
     <div class="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out h-[calc(100%-3.5rem)] flex items-center">
         <div class="max-h-full overflow-hidden ti-modal-content w-full">
             <div class="ti-modal-header">
                 <h3 class="text-xxl font-bold text-primary">
                     แจ้งเตือน
                 </h3>
-                <div class="flex justify-end">
+                <div class="flex justify-end" *ngIf="currentModal=='add'||currentModal=='edit'">
                     <button type="button" class="hs-dropdown-toggle ti-modal-clode-btn text-danger"
-                        data-hs-overlay="#assessment-tool-component-alert-modal">
+                        data-hs-overlay="#assessment-tool-modal">
                         <span class="sr-only">Close</span>
                         <i class="ti ti-circle-x fs-xxl"></i>
                     </button>
                 </div>
-            </div>
-            <div class="ti-modal-body ">
-                <p class="mt-1 text-gray-800 dark:text-white/70">
-                    ยืนยันการบันทึกข้อมูลหรือไม่
-                </p>
-
-                <div class="flex justify-end mt-2rem mb-1rem">
-                    <button type="button"
-                        class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10"
-                        data-hs-overlay="#assessment-tool-component-modal-add">
-                        ย้อนกลับ
-                    </button>
-                    <a class="ti-btn ti-btn-success" href="javascript:void(0);"
-                        data-hs-overlay="#assessment-tool-component-alert-modal" (click)="addUser()">
-                        บันทึกข้อมูล
-                    </a>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-<div id="assessment-tool-component-alert-edit-modal" class="hs-overlay hidden ti-modal">
-    <div class="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out h-[calc(100%-3.5rem)] flex items-center">
-        <div class="max-h-full overflow-hidden ti-modal-content w-full">
-            <div class="ti-modal-header">
-                <h3 class="text-xxl font-bold text-primary">
-                    แจ้งเตือน
-                </h3>
-                <div class="flex justify-end">
+                <div class="flex justify-end" *ngIf="currentModal=='delete'||currentModal=='deleteGroup'">
                     <button type="button" class="hs-dropdown-toggle ti-modal-clode-btn text-danger"
-                        data-hs-overlay="#assessment-tool-component-alert-edit-modal">
+                        data-hs-overlay="#assessment-tool-alert-modal">
                         <span class="sr-only">Close</span>
                         <i class="ti ti-circle-x fs-xxl"></i>
                     </button>
                 </div>
             </div>
             <div class="ti-modal-body ">
-                <p class="mt-1 text-gray-800 dark:text-white/70">
-                    ยืนยันการเเก้ไขข้อมูลหรือไม่
+                <p class="mt-1 text-gray-800 dark:text-white/70" *ngIf="currentModal=='add'||currentModal=='edit'">
+                    ยืนยันการบันทึกข้อมูลหรือไม่
                 </p>
-
-                <div class="flex justify-end mt-2rem mb-1rem">
+                <p class="mt-1 text-gray-800 dark:text-white/70"
+                    *ngIf="currentModal=='delete'||currentModal=='deleteGroup'">
+                    ยืนยันการลบข้อมูลหรือไม่
+                </p>
+                <div class="flex justify-end mt-2rem mb-1rem" *ngIf="currentModal=='add'||currentModal=='edit'">
                     <button type="button"
                         class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10"
-                        data-hs-overlay="#assessment-tool-component-modal-edit">
+                        data-hs-overlay="#assessment-tool-modal">
                         ย้อนกลับ
                     </button>
-                    <a class="ti-btn ti-btn-success" href="javascript:void(0);"
-                        data-hs-overlay="#assessment-tool-component-alert-edit-modal" (click)="addUser()">
+                    <button type="button" class="ti-btn ti-btn-success" data-hs-overlay="#assessment-tool-alert-modal"
+                        (click)="updateAssessment('post')">
                         บันทึกข้อมูล
-                    </a>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<div id="assessment-tool-component-alert-delete-modal" class="hs-overlay hidden ti-modal">
-    <div class="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out h-[calc(100%-3.5rem)] flex items-center">
-        <div class="max-h-full overflow-hidden ti-modal-content w-full">
-            <div class="ti-modal-header">
-                <h3 class="text-xxl font-bold text-primary">
-                    แจ้งเตือน
-                </h3>
-                <div class="flex justify-end">
-                    <button type="button" class="hs-dropdown-toggle ti-modal-clode-btn text-danger"
-                        data-hs-overlay="#assessment-tool-component-alert-delete-modal">
-                        <span class="sr-only">Close</span>
-                        <i class="ti ti-circle-x fs-xxl"></i>
                     </button>
                 </div>
-            </div>
-            <div class="ti-modal-body ">
-                <p class="mt-1 text-gray-800 dark:text-white/70">
-                    ยืนยันการลบข้อมูลหรือไม่!
-                </p>
-
-                <div class="flex justify-end mt-2rem mb-1rem">
+                <div class="flex justify-end mt-2rem mb-1rem"
+                    *ngIf="currentModal=='delete'||currentModal=='deleteGroup'">
                     <button type="button"
                         class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10"
-                        data-hs-overlay="#assessment-tool-component-alert-delete-modal">
+                        data-hs-overlay="#assessment-tool-alert-modal">
                         ย้อนกลับ
                     </button>
-                    <a class="ti-btn ti-btn-success" href="javascript:void(0);"
-                        data-hs-overlay="#assessment-tool-component-alert-delete-modal" (click)="deleteUser()">
+                    <button type="button" class="ti-btn ti-btn-danger" data-hs-overlay="#assessment-tool-alert-modal"
+                        (click)="updateAssessment('delete')">
                         ลบข้อมูล
-                    </a>
+                    </button>
                 </div>
             </div>
         </div>

src/app/components/competency-assessment/tool-register/assessment-tool/assessment-tool.component.ts

 import { ChangeDetectorRef, Component, EventEmitter, Input, Output } from '@angular/core';
 import { ToastrService } from 'ngx-toastr';
-import { MyAssessmentModel } from 'src/app/shared/model/assessment.model';
+import { AssessmentModel, MyAssessmentModel } from 'src/app/shared/model/assessment.model';
 import { AssessmentService } from 'src/app/shared/services/assessment.service';
+import { FileService } from 'src/app/shared/services/file.service';
 export interface DataModel {
   id: string
   name: string
@@ -15,159 +16,169 @@ export interface DataModel {
   styleUrls: ['./assessment-tool.component.scss']
 })
 export class AssessmentToolComponent {
-  @Input() pathTitle = ['การประเมินสมรรถนะ', 'ทะเบียนเครื่องมือ', 'เครื่องมือประเมิน'];
-  @Output() sendPathTitle: EventEmitter<string[]> = new EventEmitter<string[]>();
-  activeTab: string = 'tab1'; // กำหนด tab เริ่มต้น
-  isChecked: boolean = false;
-
   currentPage = 1
   page = Array.from({ length: 1 }, (_, i) => i + 1);
   search = ""
+  numDataListChecked = 0
+  isDataListChecked = false
+  isDataListCheckedAll = false
 
+  assessment: { loading: boolean, select: AssessmentModel, dataList: { check: boolean, data: AssessmentModel }[] } = { loading: false, select: new MyAssessmentModel(), dataList: [] }
 
-
-  // ฟังก์ชันในการเปลี่ยนแท็บ
-  changeTab(tab: { id: string, text: string }) {
-    this.sendPathTitle.emit(['การประเมินสมรรถนะ', 'ทะเบียนเครื่องมือ', tab.text]);
-    this.activeTab = tab.id;
+  currentModal: 'add' | 'edit' | 'delete' | 'deleteGroup' = "add"
+  selectedFile: File | null = null;
+  selectedFileName: string = 'กรุณาเลือกไฟล์';
+  constructor(private toastr: ToastrService,
+    private cdr: ChangeDetectorRef,
+    private assessmentService: AssessmentService,
+    private fileService: FileService
+  ) { }
+  ngOnInit(): void {
+    this.getAssessmentList()
   }
-
-
-
-  // การจัดการการเปิดปิด modal
-  modalOptions: {
-    [nameModal: string]: {
-      isModalOpen: boolean;
-      modalSize: string;
-      backdropClose: boolean;
-    };
-  } = {
-      "add": {
-        isModalOpen: false,
-        modalSize: 'm',
-        backdropClose: true,
-      },
-      "edit": {
-        isModalOpen: false,
-        modalSize: 'm',
-        backdropClose: true,
-      }
-    };
-
-  openModal(name: string, size: string, closeOnBackdrop?: boolean) {
-    this.modalOptions[name].modalSize = size;
-    this.modalOptions[name].backdropClose = closeOnBackdrop || false;
-    this.modalOptions[name].isModalOpen = true;
-    this.currentModal = name;  // ตั้งค่าค่าของ currentModal เป็น 'add' หรือ 'edit'
-    document.body.style.overflow = 'hidden';
+  onFileSelected(event: any) {
+    this.selectedFile = event.target.files.length > 0 ? event.target.files[0] : null;
+    this.selectedFileName = this.selectedFile?.name || "กรุณาเลือกไฟล์"
   }
-
-  closeModal(name: string) {
-    this.modalOptions[name].isModalOpen = false;
-    if (!this.isAnyModalOpen()) {
-      document.body.style.overflow = ''; // คืนค่าการ Scroll เฉพาะเมื่อ Modal ทั้งหมดปิดแล้ว
+  uploadFile() {
+    if (!this.selectedFile) {
+      alert('กรุณาเลือกไฟล์ก่อนอัปโหลด')
+      return
     }
-  }
-
-  isAnyModalOpen(): boolean {
-    return Object.values(this.modalOptions).some(modal => modal.isModalOpen); // ตรวจสอบว่า modal อื่นยังเปิดอยู่หรือไม่
-  }
-
-  // ฟังก์ชันสำหรับการเพิ่ม ลบ หรือแก้ไข ข้อมูล
-  addUser() {
-    const body = new MyAssessmentModel({ assessmentId: this.dataSelect.id, tdesc: this.dataSelect.name, edesc: this.dataSelect.edesc, shortName: this.dataSelect.code })
-    this.assessmentService.post(body).subscribe((response: any) => {
-      if (response.success) {
-        this.showSuccess()
-        this.getAssessmentList()
+    const formData = new FormData();
+    formData.append('file', this.selectedFile);
+    this.assessment.loading = true
+    this.fileService.uploadExcel(formData, '').subscribe({
+      next: response => {
+        if (response.success) {
+          this.showAlert(response.message, 'success')
+          this.getAssessmentList()
+        } else {
+          this.showAlert(response.message, 'error')
+          this.assessment.loading = false
+          this.cdr.detectChanges()
+        }
+      }, error: error => {
+        this.showAlert(error.message, 'error')
+        this.assessment.loading = false
+        this.cdr.detectChanges()
       }
     })
   }
-  deleteUser() {
-    const body = new MyAssessmentModel({ assessmentId: this.dataSelect.id, tdesc: this.dataSelect.name, edesc: this.dataSelect.edesc, shortName: this.dataSelect.code })
-    this.assessmentService.delete(body).subscribe((response: any) => {
-      if (response.success) {
-        this.showSuccessDelete()
-        this.getAssessmentList()
+  downloadFile() {
+    const fileName = '.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')
       }
     })
-  }
 
-  currentModal = ""
-  constructor(private toastr: ToastrService,
-    private cdr: ChangeDetectorRef,
-    private assessmentService: AssessmentService
-  ) { }
-  ngOnInit(): void {
-    this.getAssessmentList()
   }
   getAssessmentList() {
-    this.dataLoading = true
+    this.assessment.loading = true
     this.assessmentService.getList().subscribe({
       next: response => {
-        this.mockData = response.map(x => ({ id: x.assessmentId, name: x.tdesc, edesc: x.edesc, code: x.shortName, checked: false }))
-        this.dataLoading = false
+        this.assessment.dataList = response.map(x => ({ check: false, data: new MyAssessmentModel(x) }))
+        this.isDataListCheckedAll = false
+        this.dataListCheckAll()
+        this.assessment.loading = false
         this.searchChange()
         this.cdr.detectChanges()
       }, error: error => {
-        this.dataLoading = false
+        this.assessment.loading = false
         this.cdr.detectChanges()
       }
     })
   }
-  searchChange() {
-    this.currentPage = 1
-    this.page = Array.from({ length: Math.ceil(this.dataListFilter().length / 10) }, (_, i) => i + 1);
-  }
-  dataListFilter() {
-    return this.mockData.filter(x => {
-      const data = x
-      const match = data.id.includes(this.search) || data.name.includes(this.search) || data.code.includes(this.search);
-      return match;
-    });
+  assessmentListFilter() {
+    return this.assessment.dataList.filter(x => {
+      const data = x.data
+      const match = data.assessmentId.toLowerCase().includes(this.search.toLowerCase()) ||
+        data.tdesc.toLowerCase().includes(this.search.toLowerCase()) ||
+        data.shortName.toLowerCase().includes(this.search.toLowerCase())
+      return match
+    })
   }
-  selectAssessment(data?: DataModel) {
-    this.dataSelect = JSON.parse(JSON.stringify(data || { id: "", name: "", edesc: "", code: "", checked: false }));
+  selectAssessment(data?: AssessmentModel) {
+    this.assessment.select = new MyAssessmentModel(data)
   }
-
-
-  toggleCheckbox(): void {
-    this.isChecked = !this.isChecked;
-    this.mockData.forEach((item) => {
-      item.checked = this.isChecked;
-    });
-    this.checkSelect();
+  clearAssessment(currentModal: string) {
+    if (currentModal == 'add') {
+      this.selectAssessment()
+    } else if (currentModal == 'edit') {
+      this.selectAssessment(new MyAssessmentModel({ assessmentId: this.assessment.select.assessmentId }))
+    }
   }
-
-
-  mockData: DataModel[] = []
-  dataLoading = false
-  dataSelect: DataModel = { id: "", name: "", edesc: "", code: "", checked: false }
-  mockDataSelect: any = []
-
-
-  checkSelect() {
-    this.mockDataSelect = this.mockData.filter(item => item.checked);
+  searchChange() {
+    this.currentPage = 1
+    this.page = Array.from({ length: Math.ceil(this.assessmentListFilter().length / 10) }, (_, i) => i + 1);
+    this.dataListCheck()
   }
-
-
-  showSuccess() {
-    this.toastr.success('บันทึกข้อมูลสำเร็จ', 'เเจ้งเตือน', {
+  showAlert(text: string, type: 'success' | 'error') {
+    this.toastr[type](text, 'แจ้งเตือน', {
       timeOut: 3000,
       positionClass: 'toast-top-right',
-    });
+    })
   }
-  showSuccessEdit() {
-    this.toastr.success('เเก้ไขข้อมูลสำเร็จ', 'เเจ้งเตือน', {
-      timeOut: 3000,
-      positionClass: 'toast-top-right',
-    });
+  updateAssessment(typeApi: 'post' | 'delete') {
+    this.assessment.loading = true
+    let body: AssessmentModel | AssessmentModel[]
+    switch (this.currentModal) {
+      case ('delete'): {
+        body = new MyAssessmentModel(this.assessment.select)
+        break;
+      }
+      case ('deleteGroup'): {
+        body = this.assessment.dataList.filter(x => x.check).map(x => new MyAssessmentModel(x.data))
+        break;
+      }
+      default: {
+        body = new MyAssessmentModel(this.assessment.select)
+      }
+    }
+    this.assessmentService[typeApi]((body as any)).subscribe({
+      next: response => {
+        if (response.success) {
+          this.showAlert(response.message, 'success')
+          this.getAssessmentList()
+          this.searchChange()
+        } else {
+          this.showAlert(response.message, 'error')
+          this.assessment.loading = false
+        }
+        this.cdr.detectChanges()
+      }, error: error => {
+        this.showAlert(error.message, 'error')
+        this.assessment.loading = false
+        this.cdr.detectChanges()
+      }
+    })
   }
-  showSuccessDelete() {
-    this.toastr.success('ลบข้อมูลสำเร็จ', 'เเจ้งเตือน', {
-      timeOut: 3000,
-      positionClass: 'toast-top-right',
-    });
+  dataListCheckAll() {
+    const selectAll = this.isDataListCheckedAll;
+    this.assessment.dataList.filter(x => {
+      const data = x.data
+      const match = data.assessmentId.toLowerCase().includes(this.search.toLowerCase()) ||
+        data.tdesc.toLowerCase().includes(this.search.toLowerCase()) ||
+        data.shortName.toLowerCase().includes(this.search.toLowerCase())
+      return match
+    }).forEach(x => x.check = selectAll);
+    this.dataListCheck();
+  }
+  dataListCheck() {
+    const dataCheck = this.assessmentListFilter();
+    this.isDataListCheckedAll = dataCheck.length ? dataCheck.every(x => x.check) : false;
+    this.numDataListChecked = this.assessment.dataList.filter(x => x.check).length;
+    this.isDataListChecked = Boolean(this.numDataListChecked)
   }
 }
 

src/app/components/competency-assessment/tool-register/tool-register.component.html

@@ -15,10 +15,9 @@
                 </a>
             </nav>
         </div>
-        <div class="mt-3 px-3rem !-mt-3 pt-50px">
+        <div class="mt-3 px-2rem !-mt-3 pt-50px">
             <div id="underline-1" role="tabpanel" aria-labelledby="underline-item-1">
-                <app-assessment-tool [pathTitle]="pathTitle"
-                    (sendPathTitle)="pathTitle=$event"></app-assessment-tool>
+                <app-assessment-tool></app-assessment-tool>
             </div>
         </div>
     </div>

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

@@ -103,7 +103,7 @@ export class SubJobCompetencyComponent {
       const formData = new FormData();
       formData.append('file', this.selectedFile);
       this.loading = true
-      this.fileService.upload(formData, 'MJOBCODE_COMPETENCY').subscribe({
+      this.fileService.uploadExcel(formData, 'MJOBCODE_COMPETENCY').subscribe({
         next: response => {
           if (response.success) {
             this.showAlert(response.message, 'success')
@@ -122,7 +122,7 @@ export class SubJobCompetencyComponent {
 
     downloadFile() {
       const fileName = 'IMPORT_MJOBCODEV2.xlsx'
-      this.fileService.download(fileName).subscribe({
+      this.fileService.downloadTemplate(fileName).subscribe({
         next: response => {
           const url = window.URL.createObjectURL(response);
           const a = document.createElement("a");

src/app/shared/model/assessment.model.ts

@@ -13,12 +13,12 @@ export class MyAssessmentModel implements AssessmentModel {
     edesc: string
     tdesc: string
     shortName: string
-    constructor(data: Partial<AssessmentModel>) {
-        this.assessmentId = data.assessmentId || ""
-        this.companyId = data.companyId || ""
-        this.edesc = data.edesc || ""
-        this.tdesc = data.tdesc || ""
-        this.shortName = data.shortName || ""
+    constructor(data?: Partial<AssessmentModel>) {
+        this.assessmentId = data?.assessmentId || ""
+        this.companyId = data?.companyId || ""
+        this.edesc = data?.edesc || ""
+        this.tdesc = data?.tdesc || ""
+        this.shortName = data?.shortName || ""
     }
 }
 

src/app/shared/services/assessment.service.ts

@@ -3,6 +3,7 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { environment } from 'src/environments/environment';
 import { AssessmentModel } from '../model/assessment.model';
+import { AlertModel } from '../model/alert.model';
 @Injectable({
   providedIn: 'root'
 })
@@ -17,16 +18,16 @@ export class AssessmentService {
   getList(): Observable<AssessmentModel[]> {
     return this.http.get<AssessmentModel[]>(this.urlApi + "/lists")
   }
-  post(body: AssessmentModel) {
-    return this.http.post(this.urlApi, body)
+  post(body: AssessmentModel): Observable<AlertModel> {
+    return this.http.post<AlertModel>(this.urlApi, body)
   }
-  delete(body: AssessmentModel) {
+  delete(body: AssessmentModel): Observable<AlertModel> {
     const options = {
       headers: new HttpHeaders({
         "Content-Type": "application/json",
       }),
       body: body
     };
-    return this.http.delete(this.urlApi, options)
+    return this.http.delete<AlertModel>(this.urlApi, options)
   }
 }
\ No newline at end of file

src/app/shared/services/file.service.ts

@@ -9,11 +9,16 @@ import { AlertModel } from '../model/alert.model';
 export class FileService {
   constructor(private http: HttpClient) {
   }
-
-  upload(formData: any, table: string): Observable<AlertModel> {
+  uploadFiles(formData: any): Observable<AlertModel> {
+    return this.http.post<AlertModel>(environment.baseUrl + '/files/upload', formData)
+  }
+  dowloadFiles(filename: string) {
+    return this.http.get(environment.baseUrl + '/files/download/' + filename, { responseType: "blob" })
+  }
+  uploadExcel(formData: any, table: string): Observable<AlertModel> {
     return this.http.post<AlertModel>(environment.baseUrl + '/import/excel/' + table, formData)
   }
-  download(fileName: string) {
+  downloadTemplate(fileName: string) {
     return this.http.get("/assets/template/" + fileName, { responseType: "blob" })
   }
 }