รายละเอียดของงาน

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

@@ -62,7 +62,7 @@ export class UserSettingsComponent {
     type: "string"
   }]
   searchSettings = {
-    fields: ['usernameId', 'empId', 'fname', 'lname', 'status'],
+    fields: ['usernameId', 'empId', 'employee.fname', 'employee.lname', 'status'],
     operator: 'contains',
     ignoreCase: false
   }

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

 <div class="w-full min-height-50px mb-10px justify-between items-center">
-
     <div class="flex justify-end">
         <div class="px-1">
             <div class="relative shadow-md">
                 <input type="text" id="hs-leading-icon" name="hs-leading-icon"
                     class="ti-form-input ltr:pl-11 rtl:pr-11 focus:z-10 " placeholder="Search by No. or Name"
-                    [(ngModel)]="search" (ngModelChange)="searchChange()">
+                    [(ngModel)]="search">
 
                 <div
                     class="absolute inset-y-0 ltr:left-0 rtl:right-0 flex items-center pointer-events-none z-20 ltr:pl-4 rtl:pr-4">
@@ -21,77 +20,21 @@
                 import
             </button>
         </div>
-        <!-- <div class="px-1">
-                        <button href="javascript:void(0);" class="ti-btn ti-btn-soft-danger h-45px m-0 shadow-md"
-                            data-hs-overlay="#sub-command-structure-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-45px m-0 shadow-md">
-                            <i class="ti ti-book fs-l"></i>
-                            Help
-                        </button>
-                    </div> -->
+        <div class="px-1">
+            <button type="button" class="ti-btn ti-btn-soft-danger  h-45px m-0 shadow-md"
+                data-hs-overlay="#company-registration-page-alert-modal" (click)="currentModal='delete'">
+                <i class="ri-delete-bin-6-line"></i>
+                Delete
+            </button>
+        </div>
     </div>
 </div>
 
 <div class="page px-rem">
-    <div class="overflow-auto shadow-md rounded-t-md">
-        <table class="ti-custom-table ti-custom-table-head ti-custom-table-hover table-bordered">
-            <thead>
-                <tr>
-                    <ng-container
-                        *ngFor="let item of ['ลำดับ','รหัสงาน','ชื่อลักษณะงาน (ไทย)','ชื่อลักษณะงาน (อังกฤษ)','การจัดการ']; 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">
-                                <i class="ti ti-dots-vertical fs-l"></i>
-                            </div>
-                        </th>
-                    </ng-container>
-                </tr>
-            </thead>
-            <tbody *ngIf="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"
-                            aria-label="loading">
-                            <span class="sr-only">Loading...</span>
-                        </div>
-                    </td>
-                </tr>
-            </tbody>
-            <tbody *ngIf="!loading&&!jobcodeFilter().length">
-                <tr>
-                    <td class="text-center" colspan="100%">
-                        ไม่พบข้อมูล
-                    </td>
-                </tr>
-            </tbody>
-            <tbody *ngIf="!loading&&jobcodeFilter().length">
-                <tr
-                    *ngFor="let item of jobcodeFilter() |slice:((currentPage-1) * pageSize) : (((currentPage-1) * pageSize) + pageSize);let i = index">
-                    <td class="text-center">
-                        {{((currentPage-1) * pageSize)+(i+1)}}
-                    </td>
-                    <td class="text-center">{{item.jobcodeId}}</td>
-                    <td>{{item.tdesc}}</td>
-                    <td>{{item.edesc}}</td>
-                    <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>
-        </table>
-    </div>
-    <app-pagination [totalItems]="jobcodeFilter().length" [pageSize]="pageSize" (pageChange)="currentPage = $event"
-        (pageSizeChange)="pageSize = $event;currentPage = 1"></app-pagination>
-
+    <app-datagrid-syncfution [searchSettings]="searchSettings" [searchText]="search" [dataSource]="jobCodeList"
+        [columns]="columns" [selectedItems]="selectedItems" modalName="#sub-job-competency-component-modal-edit"
+        (sendSelectData)="currentModal='edit';edit($event)" (sendSelectedItems)="onSelectItemChange($event)">
+    </app-datagrid-syncfution>
 </div>
 
 
@@ -257,16 +200,21 @@
             </div>
             <div class="ti-modal-body ">
                 <p class="mt-1 text-gray-800 dark:text-white/70">
-                    <ng-container *ngIf="modalStatus=='add'||modalStatus=='edit'">
+                    <ng-container *ngIf="currentModal=='add'||currentModal=='edit'">
                         ยืนยันการบันทึกข้อมูลหรือไม่
                     </ng-container>
-                    <ng-container *ngIf="modalStatus=='delete'||modalStatus=='deleteGroup'">
-                        ยืนยันการลบข้อมูลหรือไม่
+                    <ng-container *ngIf="currentModal=='delete'">
+                        <ng-container *ngIf="numSelectItem()">
+                            ยืนยันการลบข้อมูลหรือไม่
+                        </ng-container>
+                        <ng-container *ngIf="!numSelectItem()">
+                            เลือกข้อมูลที่ต้องการลบ
+                        </ng-container>
                     </ng-container>
                 </p>
 
                 <div class="flex justify-end mt-2rem mb-1rem">
-                    <ng-container *ngIf="modalStatus=='add'||modalStatus=='edit'">
+                    <ng-container *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="#company-registration-page-alert-modal">
@@ -277,14 +225,15 @@
                             บันทึกข้อมูล
                         </a>
                     </ng-container>
-                    <ng-container *ngIf="modalStatus=='delete'||modalStatus=='deleteGroup'">
+                    <ng-container *ngIf="currentModal=='delete'">
                         <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="#company-registration-page-alert-modal">
                             ย้อนกลับ
                         </button>
                         <a class="ti-btn ti-btn-danger" href="javascript:void(0);"
-                            data-hs-overlay="#company-registration-page-alert-modal" (click)="deleteJob()">
+                            data-hs-overlay="#company-registration-page-alert-modal" (click)="deleteJob()"
+                            *ngIf="numSelectItem()">
                             ลบข้อมูล
                         </a>
                     </ng-container>