filter ข้อมูล

src/app/components/performance-management-evaluation/assessment-management/evaluation-grouping/edit-evaluation-grouping/edit-evaluation-grouping.component.html

@@ -47,7 +47,7 @@
             <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"
+                        class="ti-form-input ltr:pl-11 rtl:pr-11 focus:z-10 " placeholder="Search"
                         style="height: 40px;" [(ngModel)]="search" (ngModelChange)="searchChange()">
                     <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">
@@ -213,7 +213,7 @@
                         <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)]="modal.search"
+                                placeholder="Search" [(ngModel)]="modal.search"
                                 (ngModelChange)="searchModalChange(pmstopicListFilter())">
                             <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">

src/app/components/performance-management-evaluation/assessment-management/evaluation-grouping/edit-evaluation-grouping/edit-evaluation-grouping.component.ts

@@ -67,7 +67,9 @@ export class EditEvaluationGroupingComponent {
         return
       }
       const match = data.pmsTopicId.toLowerCase().includes(this.modal.search.toLowerCase()) ||
-        data.tdesc.toLowerCase().includes(this.modal.search.toLowerCase())
+        data.tdesc.toLowerCase().includes(this.modal.search.toLowerCase()) ||
+        data.pmsType.tdesc.toLowerCase().includes(this.modal.search.toLowerCase()) ||
+        (data.pmsType.weight + "").toLowerCase().includes(this.modal.search.toLowerCase())
       return match
     })
   }
@@ -99,7 +101,10 @@ export class EditEvaluationGroupingComponent {
   pmsGroupAssessmentListFilter() {
     return this.pmsGroupAssessment.dataList.filter(x => {
       const data = x.data
-      const match = data.pmsTopic.pmsTopicId.toLowerCase().includes(this.search.toLowerCase()) || data.pmsTopic.tdesc.toLowerCase().includes(this.search.toLowerCase())
+      const match = data.pmsTopic.pmsTopicId.toLowerCase().includes(this.search.toLowerCase()) ||
+        data.pmsTopic.tdesc.toLowerCase().includes(this.search.toLowerCase()) ||
+        data.pmsTopic.pmsType.tdesc.toLowerCase().includes(this.search.toLowerCase()) ||
+        (data.pmsTopic.weight + "").toLowerCase().includes(this.search.toLowerCase())
       return match;
     });
   }

src/app/components/performance-management-evaluation/assessment-management/evaluation-grouping/evaluation-grouping.component.html

@@ -5,7 +5,7 @@
                 <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"
+                            class="ti-form-input ltr:pl-11 rtl:pr-11 focus:z-10 " placeholder="Search"
                             [(ngModel)]="search" (ngModelChange)="searchChange()">
                         <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">

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

@@ -21,7 +21,7 @@
       <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"
+            class="ti-form-input ltr:pl-11 rtl:pr-11 focus:z-10 " placeholder="Search"
             [(ngModel)]="search" (ngModelChange)="searchChange()" style="height: 40px;">
           <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">
@@ -389,7 +389,7 @@
           <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"
+                class="ti-form-input ltr:pl-11 rtl:pr-11 focus:z-10 " placeholder="Search"
                 [(ngModel)]="modal.search" (ngModelChange)="modalSearchChange(pmstypeListFilter())">
               <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">

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

@@ -96,7 +96,8 @@ export class AssessmentTopicsComponent {
     return this.pmstopic.dataList.filter(x => {
       const data = x.data
       const match = data.pmsTopicId.toLowerCase().includes(this.search.toLowerCase()) ||
-        data.tdesc.toLowerCase().includes(this.search.toLowerCase())
+        data.tdesc.toLowerCase().includes(this.search.toLowerCase()) ||
+        data.pmsType.tdesc.toLowerCase().includes(this.search.toLowerCase())
       return match
     })
   }