diff --git a/src/app/dashboard/dashboard.component.html b/src/app/dashboard/dashboard.component.html
index f17233f..c0bf115 100644
--- a/src/app/dashboard/dashboard.component.html
+++ b/src/app/dashboard/dashboard.component.html
@@ -1,8 +1,8 @@
 <div class="portlet-body">
   <div class="tabbable-custom nav-justified">
     <ul class="nav nav-tabs">
-      <li class="active sbold font">
-        <a href="#tab1" data-toggle="tab" aria-expanded="true">ติดตั้ง
+      <li class=" sbold font">
+        <a href="#tab1" data-toggle="tab" aria-expanded="false">ติดตั้ง
           <span class="badge"> {{resultNum}} </span>
         </a>
       </li>
@@ -31,8 +31,8 @@
           <span class="badge"> {{resultNum5}} </span>
         </a>
       </li>
-      <li class="sbold">
-        <a href="#tab6" data-toggle="tab" aria-expanded="false">CUS
+      <li class="active sbold">
+        <a href="#tab6" data-toggle="tab" aria-expanded="true">CUS
           <span class="badge"> {{resultNum6}} </span>
         </a>
       </li>
@@ -43,7 +43,7 @@
       </li>
     </ul>
     <div class="tab-content">
-      <div class="panel tab-pane active" id="tab1">
+      <div class="panel tab-pane " id="tab1">
         <div class="caption">
           <h1 class="icon-bubble font-green-sharp">
             <span class="caption-subject font-green-sharp sbold font"> Active</span>
@@ -570,7 +570,7 @@
           </div>
         </div>
       </div>
-      <div class="panel tab-pane" id="tab6">
+      <div class="panel tab-pane active" id="tab6">
         <div class="caption">
           <h1 class="icon-bubble font-green-sharp">
             <span class="caption-subject font-green-sharp sbold font"> Active</span>
@@ -583,7 +583,14 @@
               <input type="text" placeholder="Search.." class="form-control sbold font" [(ngModel)]="FilterSearch">
             </div>
           </div>
+          <br>
           <hr>
+          <button type="button" class="btn btn-circle button " *ngFor="let name of ButtonValue" (click)="getButton6(name.valueN);getButton6Onhold(name.valueN);"
+            style="margin-left: 5px; margin-top: 2px;">{{ name.name }}</button>
+          <hr>
+          <div *ngIf="showSecret">
+            <p style="text-align: center;">0 Tricket</p>
+          </div>
           <br>
         </div>
         <div class="panel-body">
@@ -639,6 +646,10 @@
           </div>
           <hr>
           <br>
+          <!-- <button (click)=onToggleDetails()>showwww</button>
+          <div *ngIf="showSecret">
+            <p style="text-align: center;">0 Tricket</p>
+          </div> -->
         </div>
         <div class="panel-body">
           <div class="row">
@@ -690,7 +701,8 @@
           </div>
           <br>
           <br>
-          <button type="button" class="btn btn-circle button " *ngFor="let name of ButtonValue" (click)="getButton7(name.valueN);getButton7Onhold(name.valueN);" style="margin-left: 5px; margin-top: 2px;">{{ name.name }}</button>
+          <button type="button" class="btn btn-circle button " *ngFor="let name of ButtonValue" (click)="getButton7(name.valueN);getButton7Onhold(name.valueN);"
+            style="margin-left: 5px; margin-top: 2px;">{{ name.name }}</button>
           <hr>
           <p *ngIf="showSecret" style="text-align: center;">0 Tricket</p>
           <br>
@@ -789,110 +801,110 @@
         </div>
       </div>
       <div class="panel tab-pane" id="tab8">
-          <div class="caption">
-            <h1 class="icon-bubble font-green-sharp">
-              <span class="caption-subject font-green-sharp sbold font"> Active</span>
-            </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 class="caption">
+          <h1 class="icon-bubble font-green-sharp">
+            <span class="caption-subject font-green-sharp sbold font"> Active</span>
+          </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>
-            <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 resultData8 | filter:FilterSearch: '' ">
-                <a class="dashboard-stat dashboard-stat-v2 red " href="{{item.link}}" target="_blank" [ngStyle]="{'background-color': getColorDay(item.days.toFixed(0))}">
-                  <!-- <div [ngStyle]="{'background-color':item.days === '366.0098' ? 'green' : 'red' }"></<div> -->
-                  <!-- <div class="avater">{{(item.days).toFixed(0)}} D</div> -->
-                  <div class="avater" [ngStyle]="{'background-color': getColorDay(item.days.toFixed(0))}" style="font-size: 26px; text-align: center; font-weight: bold;">{{item.days.toFixed(0)}}D</div>
-                  <div class="visual">
-                    <i class="fa fa-comments"></i>
-                  </div>
-                  <table>
-                    <tr>
-                      <div class="details" style="width: calc(100% - 50px);">
-                        <div style="text-align: right; margin-top: -60px; color: black;">{{item.type | textshort}}</div>
-                        <div style="text-align: right; color: black;">{{item.STATUS}}</div>
-                        <div class="number" style=" color: black; display: block; text-align: right; margin-top: -7px;">
-                          <span data-counter="counterup" data-value="">{{item.custgroupName}}</span>
-                        </div>
-                        <div class="desc" style=" color: black;">{{item.team}}</div>
-                        <br>
-                        <!-- <div class="desc" style="text-align: left; text-align: bottom; color: black;">{{(item.COMMENT > 20)? | (item.COMMENT | slice:0:20) + '....':(item.COMMENT)}}</div> -->
-                      </div>
-                    </tr>
-                    <tr>
-                      <div class="details" style="width: calc(100% - 50px);">
-                        <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div>
-                        <div class="a desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</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 resultData8 | filter:FilterSearch: '' ">
+              <a class="dashboard-stat dashboard-stat-v2 red " href="{{item.link}}" target="_blank" [ngStyle]="{'background-color': getColorDay(item.days.toFixed(0))}">
+                <!-- <div [ngStyle]="{'background-color':item.days === '366.0098' ? 'green' : 'red' }"></<div> -->
+                <!-- <div class="avater">{{(item.days).toFixed(0)}} D</div> -->
+                <div class="avater" [ngStyle]="{'background-color': getColorDay(item.days.toFixed(0))}" style="font-size: 26px; text-align: center; font-weight: bold;">{{item.days.toFixed(0)}}D</div>
+                <div class="visual">
+                  <i class="fa fa-comments"></i>
+                </div>
+                <table>
+                  <tr>
+                    <div class="details" style="width: calc(100% - 50px);">
+                      <div style="text-align: right; margin-top: -60px; color: black;">{{item.type | textshort}}</div>
+                      <div style="text-align: right; color: black;">{{item.STATUS}}</div>
+                      <div class="number" style=" color: black; display: block; text-align: right; margin-top: -7px;">
+                        <span data-counter="counterup" data-value="">{{item.custgroupName}}</span>
                       </div>
-                    </tr>
-                  </table>
-                </a>
-              </div>
+                      <div class="desc" style=" color: black;">{{item.team}}</div>
+                      <br>
+                      <!-- <div class="desc" style="text-align: left; text-align: bottom; color: black;">{{(item.COMMENT > 20)? | (item.COMMENT | slice:0:20) + '....':(item.COMMENT)}}</div> -->
+                    </div>
+                  </tr>
+                  <tr>
+                    <div class="details" style="width: calc(100% - 50px);">
+                      <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div>
+                      <div class="a desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
+                    </div>
+                  </tr>
+                </table>
+              </a>
             </div>
           </div>
-          <br>
-          <br>
-          <br>
-          <br>
-          <!-- On Hold -->
-  
-          <div class="caption">
-            <h1 class="icon-bubble font-grey-gallery">
-              <span class="caption-subject font-grey-gallery sbold font"> On Hold</span>
-            </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)]="FilterSearchOnHold">
-              </div>
+        </div>
+        <br>
+        <br>
+        <br>
+        <br>
+        <!-- On Hold -->
+
+        <div class="caption">
+          <h1 class="icon-bubble font-grey-gallery">
+            <span class="caption-subject font-grey-gallery sbold font"> On Hold</span>
+          </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)]="FilterSearchOnHold">
             </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 resultDataOnHold8 | filter:FilterSearchOnHold: '' ">
-                <a class="dashboard-stat dashboard-stat-v2 red " href="{{item.link}}" target="_blank" [ngStyle]="{'background-color': getColorDay(item.days.toFixed(0))}">
-                  <!-- <div [ngStyle]="{'background-color':item.days === '366.0098' ? 'green' : 'red' }"></<div> -->
-                  <!-- <div class="avater">{{(item.days).toFixed(0)}} D</div> -->
-                  <div class="avater" [ngStyle]="{'background-color': getColorDay(item.days.toFixed(0))}" style="font-size: 26px; text-align: center; font-weight: bold;">{{item.days.toFixed(0)}}D</div>
-                  <div class="visual">
-                    <i class="fa fa-comments"></i>
-                  </div>
-                  <table>
-                    <tr>
-                      <div class="details" style="width: calc(100% - 50px);">
-                        <div style="text-align: right; margin-top: -60px; color: black;">{{item.type | textshort}}</div>
-                        <div style="text-align: right; color: black;">{{item.STATUS}}</div>
-                        <div class="number" style=" color: black; display: block; text-align: right; margin-top: -7px;">
-                          <span data-counter="counterup" data-value="">{{item.custgroupName}}</span>
-                        </div>
-                        <div class="desc" style=" color: black;">{{item.team}}</div>
-                        <br>
-                        <!-- <div class="desc" style="text-align: left; text-align: bottom; color: black;">{{(item.COMMENT > 20)? | (item.COMMENT | slice:0:20) + '....':(item.COMMENT)}}</div> -->
-                      </div>
-                    </tr>
-                    <tr>
-                      <div class="details" style="width: calc(100% - 50px);">
-                        <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div>
-                        <div class="a desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</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 resultDataOnHold8 | filter:FilterSearchOnHold: '' ">
+              <a class="dashboard-stat dashboard-stat-v2 red " href="{{item.link}}" target="_blank" [ngStyle]="{'background-color': getColorDay(item.days.toFixed(0))}">
+                <!-- <div [ngStyle]="{'background-color':item.days === '366.0098' ? 'green' : 'red' }"></<div> -->
+                <!-- <div class="avater">{{(item.days).toFixed(0)}} D</div> -->
+                <div class="avater" [ngStyle]="{'background-color': getColorDay(item.days.toFixed(0))}" style="font-size: 26px; text-align: center; font-weight: bold;">{{item.days.toFixed(0)}}D</div>
+                <div class="visual">
+                  <i class="fa fa-comments"></i>
+                </div>
+                <table>
+                  <tr>
+                    <div class="details" style="width: calc(100% - 50px);">
+                      <div style="text-align: right; margin-top: -60px; color: black;">{{item.type | textshort}}</div>
+                      <div style="text-align: right; color: black;">{{item.STATUS}}</div>
+                      <div class="number" style=" color: black; display: block; text-align: right; margin-top: -7px;">
+                        <span data-counter="counterup" data-value="">{{item.custgroupName}}</span>
                       </div>
-                    </tr>
-                  </table>
-                </a>
-              </div>
+                      <div class="desc" style=" color: black;">{{item.team}}</div>
+                      <br>
+                      <!-- <div class="desc" style="text-align: left; text-align: bottom; color: black;">{{(item.COMMENT > 20)? | (item.COMMENT | slice:0:20) + '....':(item.COMMENT)}}</div> -->
+                    </div>
+                  </tr>
+                  <tr>
+                    <div class="details" style="width: calc(100% - 50px);">
+                      <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div>
+                      <div class="a desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
+                    </div>
+                  </tr>
+                </table>
+              </a>
             </div>
           </div>
-     </div>
+        </div>
+      </div>
       <!-- <div class="panel tab-pane active" id="tab8">
         <div class="caption">
           <h1 class="icon-bubble font-green-sharp">
diff --git a/src/app/dashboard/dashboard.component.ts b/src/app/dashboard/dashboard.component.ts
index 95c0da9..54b4972 100644
--- a/src/app/dashboard/dashboard.component.ts
+++ b/src/app/dashboard/dashboard.component.ts
@@ -89,7 +89,7 @@ export class DashboardComponent implements OnInit {
   Show7: any = [];
   Show7Onhold: any = [];
 
-  Namebtn:any = [];
+  ShowNull:any = [];
 
   selectArr: any;
 
@@ -261,9 +261,12 @@ export class DashboardComponent implements OnInit {
     }
   ];
   
-  showSecret = true;
+  showSecret: boolean = false;
   onToggleDetails() {
-    this.showSecret = !this.showSecret;
+    // this.showSecret = !this.showSecret;
+    if(this.ShowNull.length === 0){
+      this.showSecret = !this.showSecret;
+    }
   }
 
   async ngOnInit() {
@@ -1086,7 +1089,10 @@ setInterval(async () => {
       }
 
     }
-
+    // if (resultArray.length === 0 && valueN!=='') {
+    if (resultArray.length === 0 && valueN!=='') {
+      this.showSecret = !this.showSecret;
+    }
     this.resultData6 = resultArray;
   }
 
diff --git a/src/app/dashboard/filter.pipe.ts b/src/app/dashboard/filter.pipe.ts
index 4aaaa09..561d4e6 100644
--- a/src/app/dashboard/filter.pipe.ts
+++ b/src/app/dashboard/filter.pipe.ts
@@ -8,11 +8,10 @@ export class FilterPipe implements PipeTransform {
   transform(value: any, filterString: string, propName: any): any {
     console.log('propName: ', propName);
     
-    
     if (value.length === 0) {
       return value;
     }
-    var txt = "0 hi"
+    
     const resultArray = [];
     for (const item of value) {
       // console.log('item: ', item);
--
libgit2 0.21.2