From 53e0945fa17ccc8e9d3cf22eb96c63e7f78ca9c6 Mon Sep 17 00:00:00 2001
From: DESKTOP-D5ILJ4S\flr_3 <flr_3214@hotmail.co.th>
Date: Fri, 6 Jul 2018 17:47:47 +0700
Subject: [PATCH] เสริจได้แล้ว active

---
 src/app/dashboard/dashboard.component.html | 51 +++++++++++++++++++++------------------------------
 src/app/dashboard/dashboard.component.ts   |  5 +----
 src/app/dashboard/filter.pipe.ts           | 11 ++++++++---
 3 files changed, 30 insertions(+), 37 deletions(-)

diff --git a/src/app/dashboard/dashboard.component.html b/src/app/dashboard/dashboard.component.html
index c771637..5f6de02 100644
--- a/src/app/dashboard/dashboard.component.html
+++ b/src/app/dashboard/dashboard.component.html
@@ -5,39 +5,37 @@
 <div class="portlet-body">
   <div class="tabbable-custom nav-justified">
     <ul class="nav nav-tabs">
-      <li class=" sbold font">
-        <a href="#tab1" data-toggle="tab" aria-expanded="false">Active</a>
+      <li class="active sbold font">
+        <a href="#tab1" data-toggle="tab" aria-expanded="true">Active</a>
       </li>
-      <li class="active sbold">
-        <a href="#tab2" data-toggle="tab" aria-expanded="true">page 2</a>
+      <li class="sbold">
+        <a href="#tab2" data-toggle="tab" aria-expanded="false">page 2</a>
       </li>
       <li class="sbold">
         <a href="#tab3" data-toggle="tab" aria-expanded="false">page 3</a>
       </li>
     </ul>
     <div class="tab-content">
-      <div class="panel tab-pane" id="tab1">
+      <div class="panel tab-pane active" id="tab1">
         <div class="caption">
           <h1 class="icon-bubble font-green-sharp">
             <span class="caption-subject font-green-sharp sbold font"> Active</span>
-              <!-- <input type="text" placeholder="Search.." class="form-control sbold font"> -->
+            <div class="input-icon right" style="margin-left: 820px; margin-top: -20px;" >
+              <i class="icon-magnifier">
+              </i>
+              <input 
+              type="text" 
+              placeholder="Search.." 
+              class="form-control sbold font"    
+              [(ngModel)]="FilterSearch">
+            </div>
           </h1>
-
-          <div class="input-group" style="float: right; margin-top: 11px;">
-              <div class="input-icon right">
-                  <i class="icon-magnifier">
-                  </i>
-                  <input type="text" placeholder="Search.." class="form-control sbold font" [(ngModel)]="FilterSearch">
-                </div>
-          </div>
-
           <hr>
           <br>
         </div>
         <div class="panel-body">
           <div class="row">
-              <!-- <div class="col-lg-4 col-md-3 col-sm-6 col-xs-12" *ngFor="let item of resultData"> -->
-            <div class="col-lg-4 col-md-3 col-sm-6 col-xs-12" *ngFor="let item of resultData | filter:FilterSearch: 'team'"> 
+            <div class="col-lg-4 col-md-3 col-sm-6 col-xs-12" *ngFor="let item of resultData | filter:FilterSearch: '' ">
               <a class="dashboard-stat dashboard-stat-v2 red "
                   href="{{item.link}}" 
                   target="_blank"
@@ -78,16 +76,12 @@
         <div class="caption">
           <h1 class="icon-bubble font-grey-gallery">
             <span class="caption-subject font-grey-gallery sbold font"> On Hold</span>
+            <div class="input-icon right" style="margin-left: 820px; margin-top: -20px;" >
+              <i class="icon-magnifier">
+              </i>
+              <input type="text" placeholder="Search.." class="form-control sbold font">
+            </div>
           </h1>
-
-          <div class="input-group" style="float: right; margin-top: 11px;">
-              <div class="input-icon right">
-                  <i class="icon-magnifier">
-                  </i>
-                  <input type="text" placeholder="Search.." class="form-control sbold font" [(ngModel)]="FilterSearch">
-                </div>
-          </div>
-
           <hr>
           <br>
         </div>
@@ -127,10 +121,7 @@
         </div>
       
       </div>
-      <div class="panel tab-pane active" id="tab2">
-          <input #box type="text" placeholder="Search.." class="form-control sbold font" (keyup)="onKey($event)"><br><br>
-          <p>{{box.value}}</p>
-      </div>
+      <div class="panel tab-pane" id="tab2">page 2</div>
       <div class="panel tab-pane" id="tab3">page 3</div>
     </div>  
   </div>
diff --git a/src/app/dashboard/dashboard.component.ts b/src/app/dashboard/dashboard.component.ts
index 2ddc58f..3fd934a 100644
--- a/src/app/dashboard/dashboard.component.ts
+++ b/src/app/dashboard/dashboard.component.ts
@@ -11,11 +11,8 @@ import { async } from 'rxjs/internal/scheduler/async';
 })
 export class DashboardComponent implements OnInit {
 
-  Search = '';
-  
-  
+   FilterSearch = '';
 
-  
 
   getColorDay(days){
     console.log(days)
diff --git a/src/app/dashboard/filter.pipe.ts b/src/app/dashboard/filter.pipe.ts
index fee8cf4..0f1f71d 100644
--- a/src/app/dashboard/filter.pipe.ts
+++ b/src/app/dashboard/filter.pipe.ts
@@ -5,18 +5,23 @@ import { Pipe, PipeTransform } from '@angular/core';
 })
 export class FilterPipe implements PipeTransform {
 
-  transform(value: any, filterString: string, propName: string): any {
+  transform(value: any, filterString: string, propName: any): any {
+    console.log('propName: ', propName);
     if (value.length === 0) {
       return value;
     }
 
     const resultArray = [];
     for (const item of value) {
-      if (item[propName] === filterString) {
+      console.log('item: ', item);
+      var string1 = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase();
+      var string2 = filterString.toLowerCase();
+      if (string1.indexOf(string2) > -1) {
         resultArray.push(item);
       }
-      
     }
+      
+  
     return resultArray;
   }
 
--
libgit2 0.21.2