diff --git a/src/app/dashboard/dashboard.component.html b/src/app/dashboard/dashboard.component.html
index 5aa2886..dce2dd8 100644
--- a/src/app/dashboard/dashboard.component.html
+++ b/src/app/dashboard/dashboard.component.html
@@ -41,6 +41,11 @@
           <span class="badge"> {{resultNum8}} </span>
         </a>
       </li>
+      <li class="sbold">
+        <a href="#tab9" data-toggle="tab" aria-expanded="false">Follow
+          <span class="badge"> {{resultNum9}} </span>
+        </a>
+      </li>
     </ul>
     <div class="tab-content">
       <div class="panel tab-pane active" id="tab1">
@@ -910,6 +915,127 @@
           </div>
         </div>
       </div>
+      <div class="panel tab-pane" id="tab9">
+        <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>
+          <br>
+          <br>
+          <button type="button" class="btn btn-circle button " *ngFor="let name of ButtonValue" (click)="getButton9(name.valueN);getButton9Onhold(name.valueN);"
+            style="margin-left: 5px; margin-top: 2px;">{{ name.name }}</button>
+          <hr>
+          <div *ngIf="showSecret1">
+            <p style="text-align: left; font-size: 30px;">0 Tricket</p>
+          </div>
+          <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 resultData9 | 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 class="avater2" [ngStyle]="{'background-color': getColorDay(item.days.toFixed(0))}" style="font-size: 26px; text-align: center; font-weight: bold;">{{item.days2.toFixed(0)}}D</div>
+                </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 class="a desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
+                    </div>
+                  </tr>
+                </table>
+              </a>
+            </div>
+          </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>
+          <button *ngFor="let name of ButtonValue" (click)="getButton(name.valueN)">{{ name.name }}</button> -->
+          <hr>
+          <br>
+          <div *ngIf="showSecret2">
+            <p style="text-align: left; font-size: 30px;">0 Tricket</p>
+          </div>
+        </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 resultDataOnHold9 | 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 class="a desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
+                    </div>
+                  </tr>
+                </table>
+              </a>
+            </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.scss b/src/app/dashboard/dashboard.component.scss
index d6cbbc6..2a95658 100644
--- a/src/app/dashboard/dashboard.component.scss
+++ b/src/app/dashboard/dashboard.component.scss
@@ -11,8 +11,22 @@
   padding-top: 15px;
   top: -20px;
   left: -3px;
-  
 }
+.avater2 {
+  background-color: black;
+  color: black;
+  position: relative;
+  width: 70px;
+  height: 70px;
+  border-radius: 50% !important;
+  border-style: solid;
+  border-color: black;
+  text-align: center;
+  padding-top: 15px;
+  top: -55px;
+  left: 70px;
+}
+
 
 .a {
   white-space: nowrap; 
diff --git a/src/app/dashboard/dashboard.component.ts b/src/app/dashboard/dashboard.component.ts
index b31d27d..dd22577 100644
--- a/src/app/dashboard/dashboard.component.ts
+++ b/src/app/dashboard/dashboard.component.ts
@@ -74,6 +74,10 @@ export class DashboardComponent implements OnInit {
   resultNum8: number = 0;
   resultDataOnHold8: any;
 
+  resultData9: any;
+  resultNum9: number = 0;
+  resultDataOnHold9: any;
+
   Show1: any = [];
   Show1Onhold: any = [];
   Show2: any = [];
@@ -88,6 +92,10 @@ export class DashboardComponent implements OnInit {
   Show6Onhold: any = [];
   Show7: any = [];
   Show7Onhold: any = [];
+  Show8: any = [];
+  Show8Onhold: any = [];
+  Show9: any = [];
+  Show9Onhold: any = [];
 
   ShowNull:any = [];
   ButtonValue = [
@@ -763,6 +771,69 @@ setInterval(async () => {
   await this.getDataOnHold8();
 }, 600000);
 
+ // ----------------------------9------------------------
+ try {
+  const data9 = {
+    // tslint:disable-next-line:max-line-length
+    "query": "SELECT vtiger_account.accountname AS custgroupName , vtiger_troubletickets.ticketid AS id , IF( vtiger_groups.groupname IS NOT NULL , vtiger_groups.groupname , vu.user_name) AS team , vtiger_troubletickets.title , vtiger_troubletickets. STATUS , vtiger_troubletickets.priority , CONCAT( 'http%3A%2F%2Fvtiger.sourcecode.co.th%2Findex.php%3Faction%3DDetailView%26module%3DHelpDesk%26parenttab%3DSupport%26record%3D' , vtiger_troubletickets.ticketid) AS link ,( SELECT CONCAT( xx.createdtime , ' : ' , xx.comments) FROM vtiger_ticketcomments xx WHERE xx.ticketid = vtiger_troubletickets.ticketid ORDER BY xx.createdtime DESC LIMIT 1) AS COMMENT , CASE vtiger_troubletickets. STATUS WHEN 'Closed' THEN( unix_timestamp(vtiger_crmentity.modifiedtime) - unix_timestamp(vtiger_crmentity.createdtime)) / 86400 ELSE( unix_timestamp(now()) - unix_timestamp(vtiger_crmentity.createdtime)) / 86400 END AS days ,( unix_timestamp(now()) - unix_timestamp(vtiger_crmentity.modifiedtime)) / 86400 AS days2 , vtiger_ticketcf.cf_568 AS type , IFNULL(( SELECT 'Wait for response by' FROM vtiger_ticket_history WHERE vtiger_troubletickets.ticketid = vtiger_ticket_history.ticketid AND assigned_type = 'Wait for response' ORDER BY updatetime DESC LIMIT 0 , 1) , 'Created by') userType , IFNULL(( SELECT concat('' , assigned_by , '') FROM vtiger_ticket_history WHERE vtiger_troubletickets.ticketid = vtiger_ticket_history.ticketid AND assigned_type = 'Wait for response' ORDER BY updatetime DESC LIMIT 0 , 1) , vtiger_users.user_name) username , vtiger_crmentity.description , vtiger_crmentity.createdtime , vtiger_crmentity.modifiedtime , vtiger_cf_568.cf_568id FROM vtiger_crmentity JOIN vtiger_users ON vtiger_users.id = vtiger_crmentity.smcreatorid JOIN vtiger_troubletickets ON vtiger_crmentity.crmid = vtiger_troubletickets.ticketid JOIN vtiger_account ON vtiger_account.accountid = vtiger_troubletickets.parent_id JOIN vtiger_ticketcf ON vtiger_ticketcf.ticketid = vtiger_troubletickets.ticketid JOIN vtiger_cf_568 ON vtiger_cf_568.cf_568 = vtiger_ticketcf.cf_568 LEFT OUTER JOIN vtiger_groups ON vtiger_crmentity.smownerid = vtiger_groups.groupid LEFT OUTER JOIN vtiger_users vu ON vtiger_crmentity.smownerid = vu.id WHERE 1 AND vtiger_crmentity.setype = 'HelpDesk' AND vtiger_crmentity.deleted = 0 AND vtiger_ticketcf.cf_568 != '' AND vtiger_cf_568.cf_568id NOT IN(8 , 9 , 10) AND( LCASE(vtiger_cf_568.cf_568) != 'set (ติดตั้ง)' AND LCASE(vtiger_troubletickets. STATUS) NOT IN('closed' , 'Wait For Customer')) GROUP BY vtiger_troubletickets.ticketid HAVING days2 > 2 ORDER BY vtiger_crmentity.modifiedtime ASC",
+    "params": ["vtiger_crmentity"]
+  };
+  const response = await this._apiService.post('dynamic', data9);
+  if (response !== null) {
+    this.resultData9 = response;
+    this.resultData9.link = decodeURIComponent(decodeURIComponent(this.resultData9.link));
+    console.log('link: ', this.resultData9.link);
+    // tslint:disable-next-line:forin
+    for (const i in this.resultData9) {
+      this.resultData9[i].link = this._common.decodeURI(this.resultData9[i].link);
+      this.resultData9[i].birth_date = this._common.convertDate(this.resultData9[i].birth_date);
+      this.resultNum9 = this.resultData9.length;
+      this.Show9.push(this.resultData9[i]);
+    }
+
+    // this.Show = Object.assign(this.resultData7);
+
+  } else {
+    this.resultData9 = [];
+  }
+} catch (error) {
+  console.log(error);
+}
+
+setInterval(async () => {
+  await this.getData9();
+}, 600000);
+
+
+// OnHold
+try {
+  const dataOnHold9 = {
+    // tslint:disable-next-line:max-line-length
+    "query": "SELECT vtiger_account.accountname AS custgroupName , vtiger_troubletickets.ticketid AS id , IF( vtiger_groups.groupname IS NOT NULL , vtiger_groups.groupname , vu.user_name) AS team , vtiger_troubletickets.title , vtiger_troubletickets. STATUS , vtiger_troubletickets.priority , CONCAT( 'http%3A%2F%2Fvtiger.sourcecode.co.th%2Findex.php%3Faction%3DDetailView%26module%3DHelpDesk%26parenttab%3DSupport%26record%3D' , vtiger_troubletickets.ticketid) AS link ,( SELECT CONCAT( xx.createdtime , ' : ' , xx.comments) FROM vtiger_ticketcomments xx WHERE xx.ticketid = vtiger_troubletickets.ticketid ORDER BY xx.createdtime DESC LIMIT 1) AS COMMENT , CASE vtiger_troubletickets. STATUS WHEN 'Closed' THEN( unix_timestamp(vtiger_crmentity.modifiedtime) - unix_timestamp(vtiger_crmentity.createdtime)) / 86400 ELSE( unix_timestamp(now()) - unix_timestamp(vtiger_crmentity.createdtime)) / 86400 END AS days ,( unix_timestamp(now()) - unix_timestamp(vtiger_crmentity.modifiedtime)) / 86400 AS days2 , vtiger_ticketcf.cf_568 AS type , IFNULL(( SELECT 'Wait for response by' FROM vtiger_ticket_history WHERE vtiger_troubletickets.ticketid = vtiger_ticket_history.ticketid AND assigned_type = 'Wait for response' ORDER BY updatetime DESC LIMIT 0 , 1) , 'Created by') userType , IFNULL(( SELECT concat('' , assigned_by , '') FROM vtiger_ticket_history WHERE vtiger_troubletickets.ticketid = vtiger_ticket_history.ticketid AND assigned_type = 'Wait for response' ORDER BY updatetime DESC LIMIT 0 , 1) , vtiger_users.user_name) username , vtiger_crmentity.description , vtiger_crmentity.createdtime , vtiger_crmentity.modifiedtime , vtiger_cf_568.cf_568id FROM vtiger_crmentity JOIN vtiger_users ON vtiger_users.id = vtiger_crmentity.smcreatorid JOIN vtiger_troubletickets ON vtiger_crmentity.crmid = vtiger_troubletickets.ticketid JOIN vtiger_account ON vtiger_account.accountid = vtiger_troubletickets.parent_id JOIN vtiger_ticketcf ON vtiger_ticketcf.ticketid = vtiger_troubletickets.ticketid JOIN vtiger_cf_568 ON vtiger_cf_568.cf_568 = vtiger_ticketcf.cf_568 LEFT OUTER JOIN vtiger_groups ON vtiger_crmentity.smownerid = vtiger_groups.groupid LEFT OUTER JOIN vtiger_users vu ON vtiger_crmentity.smownerid = vu.id WHERE 1 AND vtiger_crmentity.setype = 'HelpDesk' AND vtiger_crmentity.deleted = 0 AND vtiger_ticketcf.cf_568 != '' AND vtiger_cf_568.cf_568id NOT IN(8 , 9 , 10) AND( LCASE(vtiger_cf_568.cf_568) != 'set (ติดตั้ง)' AND LCASE(vtiger_troubletickets. STATUS) IN('Wait For Customer')) GROUP BY vtiger_troubletickets.ticketid ORDER BY vtiger_crmentity.createdtime ASC ",
+    "params": ["vtiger_crmentity"]
+  };
+  const response = await this._apiService.post('dynamic', dataOnHold9);
+  if (response !== null) {
+    this.resultDataOnHold9 = response;
+    this.resultDataOnHold9.link = decodeURIComponent(decodeURIComponent(this.resultDataOnHold9.link));
+    console.log('link: ', this.resultDataOnHold9.link);
+    // tslint:disable-next-line:forin
+    for (const i in this.resultDataOnHold9) {
+      this.resultDataOnHold9[i].link = this._common.decodeURI(this.resultDataOnHold9[i].link);
+      this.resultDataOnHold9[i].birth_date = this._common.convertDate(this.resultDataOnHold9[i].birth_date);
+      this.Show9Onhold.push(this.resultDataOnHold9[i]);
+    }
+  } else {
+    this.resultDataOnHold9 = [];
+  }
+} catch (error) {
+  console.log(error);
+}
+
+setInterval(async () => {
+  await this.getDataOnHold9();
+}, 600000);
+
 }
   // btnSelect(selVal) {
   //   // console.log(selVal);
@@ -1146,7 +1217,7 @@ setInterval(async () => {
       }
 
       var string2 = valueN.toLowerCase();
-      if (st.indexOf(string2) > -1) {
+      if (st.startsWith(string2)) {
         // console.log(st);
         resultArray.push(item);
       } 
@@ -1181,7 +1252,7 @@ setInterval(async () => {
       }
 
       var string2 = valueN.toLowerCase();
-      if (st.indexOf(string2) > -1) {
+      if (st.startsWith(string2)) {
         console.log(st);
         resultArray.push(item);
       }
@@ -1198,6 +1269,146 @@ setInterval(async () => {
     
   }
 
+  getButton8(valueN) {
+    console.log(valueN);
+
+    if (this.Show8.length === 0) {
+      return this.Show8;
+    }
+
+    const resultArray = [];
+    for (const item of this.Show8) {
+      // console.log('item: ', item);
+
+      var st = '';
+      //  st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ;
+      if (item['type']) {
+        st = item['type'].toLowerCase();
+      }
+
+      var string2 = valueN.toLowerCase();
+      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.resultData8 = resultArray;
+  }
+
+/* buttondataOnhold8 */
+  getButton8Onhold(valueN) {
+  console.log(valueN);
+
+  if (this.Show8Onhold.length === 0) {
+    return this.Show8Onhold;
+  }
+
+  const resultArray = [];
+  for (const item of this.Show8Onhold) {
+    console.log('item: ', item);
+
+    var st = '';
+    //  st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ;
+    if (item['type']) {
+      st = item['type'].toLowerCase();
+    }
+
+    var string2 = valueN.toLowerCase();
+    if (st.indexOf(string2) > -1) {
+      console.log(st);
+      resultArray.push(item);
+    }
+
+  }
+  if (resultArray.length === 0) {
+    if (valueN !== "") {
+      this.showSecret2 = true;
+    }
+  }else if(resultArray.length > 0) {
+    this.showSecret2 = false;
+  }
+  this.resultDataOnHold8 = resultArray;
+  
+}
+
+  getButton9(valueN) {
+  console.log(valueN);
+
+  if (this.Show9.length === 0) {
+    return this.Show9;
+  }
+
+  const resultArray = [];
+  for (const item of this.Show9) {
+    // console.log('item: ', item);
+
+    var st = '';
+    //  st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ;
+    if (item['type']) {
+      st = item['type'].toLowerCase();
+    }
+
+    var string2 = valueN.toLowerCase();
+    if (st.startsWith(string2)) {
+      // console.log(st);
+      resultArray.push(item);
+    } 
+  }
+    if (resultArray.length === 0) {
+      if (valueN !== "") {
+        this.showSecret1 = true;
+      }
+    }else if(resultArray.length > 0) {
+      this.showSecret1 = false;
+    }
+ 
+  this.resultData9 = resultArray;
+}
+
+ /* buttondataOnhold9 */
+ getButton9Onhold(valueN) {
+  console.log(valueN);
+
+  if (this.Show9Onhold.length === 0) {
+    return this.Show9Onhold;
+  }
+
+  const resultArray = [];
+  for (const item of this.Show9Onhold) {
+    console.log('item: ', item);
+
+    var st = '';
+    //  st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ;
+    if (item['type']) {
+      st = item['type'].toLowerCase();
+    }
+
+    var string2 = valueN.toLowerCase();
+    if (st.startsWith(string2)) {
+      console.log(st);
+      resultArray.push(item);
+    }
+
+  }
+  if (resultArray.length === 0) {
+    if (valueN !== "") {
+      this.showSecret2 = true;
+    }
+  }else if(resultArray.length > 0) {
+    this.showSecret2 = false;
+  }
+  this.resultDataOnHold9 = resultArray;
+  
+}
+
   /////////////Get data come to use//////////////////////
 
 
@@ -1304,6 +1515,7 @@ setInterval(async () => {
       console.log(error);
     }
   }
+
   //----------------------------3------------------------
   // Active
   async getData3() {
@@ -1617,4 +1829,57 @@ setInterval(async () => {
       console.log(error);
     }
   }
+
+  // ----------------------------9------------------------
+  // Active
+  async getData9() {
+    try {
+      const data9 = {
+        // tslint:disable-next-line:max-line-length
+        "query": "SELECT vtiger_account.accountname AS custgroupName , vtiger_troubletickets.ticketid AS id , IF( vtiger_groups.groupname IS NOT NULL , vtiger_groups.groupname , vu.user_name) AS team , vtiger_troubletickets.title , vtiger_troubletickets. STATUS , vtiger_troubletickets.priority , CONCAT( 'http%3A%2F%2Fvtiger.sourcecode.co.th%2Findex.php%3Faction%3DDetailView%26module%3DHelpDesk%26parenttab%3DSupport%26record%3D' , vtiger_troubletickets.ticketid) AS link ,( SELECT CONCAT( xx.createdtime , ' : ' , xx.comments) FROM vtiger_ticketcomments xx WHERE xx.ticketid = vtiger_troubletickets.ticketid ORDER BY xx.createdtime DESC LIMIT 1) AS COMMENT , CASE vtiger_troubletickets. STATUS WHEN 'Closed' THEN( unix_timestamp(vtiger_crmentity.modifiedtime) - unix_timestamp(vtiger_crmentity.createdtime)) / 86400 ELSE( unix_timestamp(now()) - unix_timestamp(vtiger_crmentity.createdtime)) / 86400 END AS days ,( unix_timestamp(now()) - unix_timestamp(vtiger_crmentity.modifiedtime)) / 86400 AS days2 , vtiger_ticketcf.cf_568 AS type , IFNULL(( SELECT 'Wait for response by' FROM vtiger_ticket_history WHERE vtiger_troubletickets.ticketid = vtiger_ticket_history.ticketid AND assigned_type = 'Wait for response' ORDER BY updatetime DESC LIMIT 0 , 1) , 'Created by') userType , IFNULL(( SELECT concat('' , assigned_by , '') FROM vtiger_ticket_history WHERE vtiger_troubletickets.ticketid = vtiger_ticket_history.ticketid AND assigned_type = 'Wait for response' ORDER BY updatetime DESC LIMIT 0 , 1) , vtiger_users.user_name) username , vtiger_crmentity.description , vtiger_crmentity.createdtime , vtiger_crmentity.modifiedtime , vtiger_cf_568.cf_568id FROM vtiger_crmentity JOIN vtiger_users ON vtiger_users.id = vtiger_crmentity.smcreatorid JOIN vtiger_troubletickets ON vtiger_crmentity.crmid = vtiger_troubletickets.ticketid JOIN vtiger_account ON vtiger_account.accountid = vtiger_troubletickets.parent_id JOIN vtiger_ticketcf ON vtiger_ticketcf.ticketid = vtiger_troubletickets.ticketid JOIN vtiger_cf_568 ON vtiger_cf_568.cf_568 = vtiger_ticketcf.cf_568 LEFT OUTER JOIN vtiger_groups ON vtiger_crmentity.smownerid = vtiger_groups.groupid LEFT OUTER JOIN vtiger_users vu ON vtiger_crmentity.smownerid = vu.id WHERE 1 AND vtiger_crmentity.setype = 'HelpDesk' AND vtiger_crmentity.deleted = 0 AND vtiger_ticketcf.cf_568 != '' AND vtiger_cf_568.cf_568id NOT IN(8 , 9 , 10) AND( LCASE(vtiger_cf_568.cf_568) != 'set (ติดตั้ง)' AND LCASE(vtiger_troubletickets. STATUS) NOT IN('closed' , 'Wait For Customer')) GROUP BY vtiger_troubletickets.ticketid HAVING days2 > 2 ORDER BY vtiger_crmentity.modifiedtime ASC",
+        "params": ["vtiger_crmentity"]
+      };
+      const response = await this._apiService.post('dynamic', data9);
+      if (response !== null) {
+        this.resultData9 = response;
+        this.resultData9.link = decodeURIComponent(decodeURIComponent(this.resultData9.link));
+        console.log('link: ', this.resultData9.link);
+        // tslint:disable-next-line:forin
+        for (const i in this.resultData9) {
+          this.resultData9[i].link = this._common.decodeURI(this.resultData9[i].link);
+          this.resultData9[i].birth_date = this._common.convertDate(this.resultData9[i].birth_date);
+          this.Show9.push(this.resultData9[i]);
+        }
+      } else {
+        this.resultData9 = [];
+      }
+    } catch (error) {
+      console.log(error);
+    }
+  }
+  // On Hold
+  async getDataOnHold9() {
+    try {
+      const dataOnHold9 = {
+        // tslint:disable-next-line:max-line-length
+        "query": "SELECT vtiger_account.accountname AS custgroupName , vtiger_troubletickets.ticketid AS id , IF( vtiger_groups.groupname IS NOT NULL , vtiger_groups.groupname , vu.user_name) AS team , vtiger_troubletickets.title , vtiger_troubletickets. STATUS , vtiger_troubletickets.priority , CONCAT( 'http%3A%2F%2Fvtiger.sourcecode.co.th%2Findex.php%3Faction%3DDetailView%26module%3DHelpDesk%26parenttab%3DSupport%26record%3D' , vtiger_troubletickets.ticketid) AS link ,( SELECT CONCAT( xx.createdtime , ' : ' , xx.comments) FROM vtiger_ticketcomments xx WHERE xx.ticketid = vtiger_troubletickets.ticketid ORDER BY xx.createdtime DESC LIMIT 1) AS COMMENT , CASE vtiger_troubletickets. STATUS WHEN 'Closed' THEN( unix_timestamp(vtiger_crmentity.modifiedtime) - unix_timestamp(vtiger_crmentity.createdtime)) / 86400 ELSE( unix_timestamp(now()) - unix_timestamp(vtiger_crmentity.createdtime)) / 86400 END AS days ,( unix_timestamp(now()) - unix_timestamp(vtiger_crmentity.modifiedtime)) / 86400 AS days2 , vtiger_ticketcf.cf_568 AS type , IFNULL(( SELECT 'Wait for response by' FROM vtiger_ticket_history WHERE vtiger_troubletickets.ticketid = vtiger_ticket_history.ticketid AND assigned_type = 'Wait for response' ORDER BY updatetime DESC LIMIT 0 , 1) , 'Created by') userType , IFNULL(( SELECT concat('' , assigned_by , '') FROM vtiger_ticket_history WHERE vtiger_troubletickets.ticketid = vtiger_ticket_history.ticketid AND assigned_type = 'Wait for response' ORDER BY updatetime DESC LIMIT 0 , 1) , vtiger_users.user_name) username , vtiger_crmentity.description , vtiger_crmentity.createdtime , vtiger_crmentity.modifiedtime , vtiger_cf_568.cf_568id FROM vtiger_crmentity JOIN vtiger_users ON vtiger_users.id = vtiger_crmentity.smcreatorid JOIN vtiger_troubletickets ON vtiger_crmentity.crmid = vtiger_troubletickets.ticketid JOIN vtiger_account ON vtiger_account.accountid = vtiger_troubletickets.parent_id JOIN vtiger_ticketcf ON vtiger_ticketcf.ticketid = vtiger_troubletickets.ticketid JOIN vtiger_cf_568 ON vtiger_cf_568.cf_568 = vtiger_ticketcf.cf_568 LEFT OUTER JOIN vtiger_groups ON vtiger_crmentity.smownerid = vtiger_groups.groupid LEFT OUTER JOIN vtiger_users vu ON vtiger_crmentity.smownerid = vu.id WHERE 1 AND vtiger_crmentity.setype = 'HelpDesk' AND vtiger_crmentity.deleted = 0 AND vtiger_ticketcf.cf_568 != '' AND vtiger_cf_568.cf_568id NOT IN(8 , 9 , 10) AND( LCASE(vtiger_cf_568.cf_568) != 'set (ติดตั้ง)' AND LCASE(vtiger_troubletickets. STATUS) IN('Wait For Customer')) GROUP BY vtiger_troubletickets.ticketid ORDER BY vtiger_crmentity.createdtime ASC ",
+        "params": ["vtiger_crmentity"]
+      };
+      const response = await this._apiService.post('dynamic', dataOnHold9);
+      if (response !== null) {
+        this.resultDataOnHold9 = response;
+        this.resultDataOnHold9.link = decodeURIComponent(decodeURIComponent(this.resultDataOnHold9.link));
+        console.log('link: ', this.resultDataOnHold9.link);
+        // tslint:disable-next-line:forin
+        for (const i in this.resultDataOnHold9) {
+          this.resultDataOnHold9[i].link = this._common.decodeURI(this.resultDataOnHold9[i].link);
+          this.resultDataOnHold9[i].birth_date = this._common.convertDate(this.resultDataOnHold9[i].birth_date);
+        }
+      } else {
+        this.resultDataOnHold9 = [];
+      }
+    } catch (error) {
+      console.log(error);
+    }
+  }
 }
\ No newline at end of file
diff --git a/src/app/dashboard/texrshort.ts b/src/app/dashboard/texrshort.ts
index d822426..f70a511 100644
--- a/src/app/dashboard/texrshort.ts
+++ b/src/app/dashboard/texrshort.ts
@@ -8,8 +8,8 @@ export class TextShortPipe implements PipeTransform {
         if(value === null){
             value = '';
         }
-        if (value.length > 28) {
-            return value.substr(0, 28) + ' ...';
+        if (value.length > 20) {
+            return value.substr(0, 20) + ' ...';
         }
         return value;
     }
--
libgit2 0.21.2