diff --git a/src/app/dashboard/dashboard.component.html b/src/app/dashboard/dashboard.component.html
index c0bf115..1309ef3 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=" sbold font">
-        <a href="#tab1" data-toggle="tab" aria-expanded="false">ติดตั้ง
+      <li class="active sbold font">
+        <a href="#tab1" data-toggle="tab" aria-expanded="true">ติดตั้ง
           <span class="badge"> {{resultNum}} </span>
         </a>
       </li>
@@ -31,8 +31,8 @@
           <span class="badge"> {{resultNum5}} </span>
         </a>
       </li>
-      <li class="active sbold">
-        <a href="#tab6" data-toggle="tab" aria-expanded="true">CUS
+      <li class="sbold">
+        <a href="#tab6" data-toggle="tab" aria-expanded="false">CUS
           <span class="badge"> {{resultNum6}} </span>
         </a>
       </li>
@@ -43,7 +43,7 @@
       </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>
@@ -570,7 +570,7 @@
           </div>
         </div>
       </div>
-      <div class="panel tab-pane active" id="tab6">
+      <div class="panel tab-pane " id="tab6">
         <div class="caption">
           <h1 class="icon-bubble font-green-sharp">
             <span class="caption-subject font-green-sharp sbold font"> Active</span>
@@ -704,7 +704,9 @@
           <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>
+          <div *ngIf="showSecret1">
+            <p style="text-align: center;">0 Tricket</p>
+          </div>
           <br>
         </div>
         <div class="panel-body">
@@ -763,6 +765,9 @@
           <button *ngFor="let name of ButtonValue" (click)="getButton(name.valueN)">{{ name.name }}</button> -->
           <hr>
           <br>
+          <div *ngIf="showSecret2">
+            <p style="text-align: center;">0 Tricket</p>
+          </div>
         </div>
         <div class="panel-body">
           <div class="row">
diff --git a/src/app/dashboard/dashboard.component.ts b/src/app/dashboard/dashboard.component.ts
index 0dac226..faca105 100644
--- a/src/app/dashboard/dashboard.component.ts
+++ b/src/app/dashboard/dashboard.component.ts
@@ -259,12 +259,15 @@ export class DashboardComponent implements OnInit {
   ];
   
   showSecret: boolean = false;
-  onToggleDetails() {
-    // this.showSecret = !this.showSecret;
-    if(this.ShowNull.length === 0){
-      this.showSecret = !this.showSecret;
-    }
-  }
+  showSecret1: boolean = false;
+  showSecret2: boolean = false;
+
+  // onToggleDetails() {
+  //   // this.showSecret = !this.showSecret;
+  //   if(this.ShowNull.length === 0){
+  //     this.showSecret = !this.showSecret;
+  //   }
+  // }
 
   async ngOnInit() {
     //----------------------------1------------------------
@@ -1133,9 +1136,6 @@ setInterval(async () => {
     }
 
     const resultArray = [];
-    if(this.resultData7 === []){
-      this.showSecret = !this.showSecret;
-    }
     for (const item of this.Show7) {
       // console.log('item: ', item);
 
@@ -1149,9 +1149,16 @@ setInterval(async () => {
       if (st.indexOf(string2) > -1) {
         // console.log(st);
         resultArray.push(item);
-      }
-
+      } 
     }
+      if (resultArray.length === 0) {
+        if (valueN !== "") {
+          this.showSecret1 = true;
+        }
+      }else if(resultArray.length > 0) {
+        this.showSecret1 = false;
+      }
+   
     this.resultData7 = resultArray;
   }
 
@@ -1180,11 +1187,15 @@ setInterval(async () => {
       }
 
     }
-
+    if (resultArray.length === 0) {
+      if (valueN !== "") {
+        this.showSecret2 = true;
+      }
+    }else if(resultArray.length > 0) {
+      this.showSecret2 = false;
+    }
     this.resultDataOnHold7 = resultArray;
-    // if(this.resultDataOnHold7 === []){
-    //   this.showSecret = !this.showSecret;
-    // }
+    
   }
 
   /////////////Get data come to use//////////////////////
--
libgit2 0.21.2