From 2d0f0ca8165743c605c6a88af2c6fddbe21fd109 Mon Sep 17 00:00:00 2001 From: DESKTOP-D5ILJ4S\flr_3 Date: Thu, 12 Jul 2018 16:47:52 +0700 Subject: [PATCH] เพิ่ม tap typeapi type search ซ่อน tap --- src/app/dashboard/dashboard.component.html | 992 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- src/app/dashboard/dashboard.component.ts | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/app/dashboard/filter.pipe.ts | 3 +++ 3 files changed, 661 insertions(+), 449 deletions(-) diff --git a/src/app/dashboard/dashboard.component.html b/src/app/dashboard/dashboard.component.html index c50480a..cfea0aa 100644 --- a/src/app/dashboard/dashboard.component.html +++ b/src/app/dashboard/dashboard.component.html @@ -1,13 +1,19 @@ - - - + +
@@ -30,38 +36,37 @@ Active -
-
- - - -
+
+
+ + +
- +
+

- - - -
{{item.days.toFixed(0)}}D
+ + + +
{{item.days.toFixed(0)}}D
-
{{item.STATUS}}
-
- {{item.custgroupName}} -
-
{{item.team}}

+
{{item.type}}
+
{{item.STATUS}}
+
+ {{item.custgroupName}} +
+
{{item.team}}
+
@@ -77,12 +82,12 @@ -
-
-
-
+
+
+
+
- +

On Hold @@ -99,37 +104,37 @@

-
- - - -
{{item.days.toFixed(0)}}D
-
- -
-
- -
-
{{item.STATUS}}
-
- {{item.custgroupName}} -
-
{{item.team}}

- -
- - -
-
{{item.COMMENT | short}}
-
{{item.COMMENT | font}}
-
- -
- +
+ + + +
{{item.days.toFixed(0)}}D
+
+
+ + +
+
{{item.type}}
+
{{item.STATUS}}
+
+ {{item.custgroupName}} +
+
{{item.team}}
+
+ +
+ + +
+
{{item.COMMENT | short}}
+ +
{{item.COMMENT | font}}
+
+ +
+ +
@@ -139,27 +144,24 @@ Active -
-
- - - -
+
+
+ + +
- +
+

- - - -
{{item.days.toFixed(0)}}D
+ + + +
{{item.days.toFixed(0)}}D
@@ -167,10 +169,11 @@
{{item.STATUS}}
-
- {{item.custgroupName}} -
-
{{item.team}}

+
+ {{item.custgroupName}} +
+
{{item.team}}
+
@@ -185,12 +188,12 @@
-
-
-
-
+
+
+
+
- +

On Hold @@ -207,37 +210,35 @@

-
- - - -
{{item.days.toFixed(0)}}D
-
- -
- - -
-
{{item.STATUS}}
-
- {{item.custgroupName}} -
-
{{item.team}}

- -
- - -
-
{{item.COMMENT | short}}
-
{{item.COMMENT | font}}
-
- -
- +
+ + + +
{{item.days.toFixed(0)}}D
+
+
+ + +
+
{{item.STATUS}}
+
+ {{item.custgroupName}} +
+
{{item.team}}
+
+ +
+ + +
+
{{item.COMMENT | short}}
+
{{item.COMMENT | font}}
+
+ +
+ +
@@ -247,27 +248,24 @@ Active -
-
- - - -
+
+
+ + +
- +
+

- - - -
{{item.days.toFixed(0)}}D
+ + + +
{{item.days.toFixed(0)}}D
@@ -275,10 +273,11 @@
{{item.STATUS}}
-
- {{item.custgroupName}} -
-
{{item.team}}

+
+ {{item.custgroupName}} +
+
{{item.team}}
+
@@ -293,12 +292,12 @@
-
-
-
-
+
+
+
+
- +

On Hold @@ -315,369 +314,466 @@

-
- - - -
{{item.days.toFixed(0)}}D
-
- -
- - -
-
{{item.STATUS}}
-
- {{item.custgroupName}} -
-
{{item.team}}

- -
- - -
-
{{item.COMMENT | short}}
-
{{item.COMMENT | font}}
-
- -
- +
+ + + +
{{item.days.toFixed(0)}}D
+
+
+ + +
+
{{item.STATUS}}
+
+ {{item.custgroupName}} +
+
{{item.team}}
+
+ +
+ + +
+
{{item.COMMENT | short}}
+
{{item.COMMENT | font}}
+
+ +
+ +
-
-

- Active -

- -
-
- - - -
-
- -
-
+
+

+ Active +

+ +
+
+ + +
-
-
-
- +
+ +
+
+
+
+
+
+ -
{{item.days.toFixed(0)}}D
-
- -
- - -
-
{{item.STATUS}}
-
- {{item.custgroupName}} -
-
{{item.team}}

- -
- - -
-
{{item.COMMENT | short}}
-
{{item.COMMENT | font}}
-
- -
- +
{{item.days.toFixed(0)}}D
+
+
-
+ + +
+
{{item.STATUS}}
+
+ {{item.custgroupName}} +
+
{{item.team}}
+
+ +
+ + +
+
{{item.COMMENT | short}}
+
{{item.COMMENT | font}}
+
+ +
+
+
+




- - -
-

- On Hold -

-
-
- - - -
-
-
-
+ + +
+

+ On Hold +

+
+
+ + +
-
-
-
- - - -
{{item.days.toFixed(0)}}D
-
- +
+
+
+
+
+
+
+ + + +
{{item.days.toFixed(0)}}D
+
+ +
+ + +
+
{{item.STATUS}}
+
+ {{item.custgroupName}}
-
- -
-
{{item.STATUS}}
-
- {{item.custgroupName}} -
-
{{item.team}}

- -
- - -
-
{{item.COMMENT | short}}
-
{{item.COMMENT | font}}
-
- -
- +
{{item.team}}
+
+
-
+ + +
+
{{item.COMMENT | short}}
+
{{item.COMMENT | font}}
+
+ + +
+
+
-
-

- Active -

- -
-
- - - -
-
- -
-
+
+

+ Active +

+ +
+
+ + +
-
-
-
- +
+ +
+
+
+
+
+
+ -
{{item.days.toFixed(0)}}D
-
- -
- - -
-
{{item.STATUS}}
-
- {{item.custgroupName}} -
-
{{item.team}}

- -
- - -
-
{{item.COMMENT | short}}
-
{{item.COMMENT | font}}
-
- -
- +
{{item.days.toFixed(0)}}D
+
+
-
+ + +
+
{{item.STATUS}}
+
+ {{item.custgroupName}} +
+
{{item.team}}
+
+ +
+ + +
+
{{item.COMMENT | short}}
+
{{item.COMMENT | font}}
+
+ +
+
+
+




- - -
-

- On Hold -

-
-
- - - -
-
-
-
+ + +
+

+ On Hold +

+
+
+ + +
-
-
-
- - - -
{{item.days.toFixed(0)}}D
-
- +
+
+
+
+
+
+
+ + + +
{{item.days.toFixed(0)}}D
+
+ +
+ + +
+
{{item.STATUS}}
+
+ {{item.custgroupName}}
-
- -
-
{{item.STATUS}}
-
- {{item.custgroupName}} -
-
{{item.team}}

- -
- - -
-
{{item.COMMENT | short}}
-
{{item.COMMENT | font}}
-
- -
- +
{{item.team}}
+
+
-
+ + +
+
{{item.COMMENT | short}}
+
{{item.COMMENT | font}}
+
+ + +
+
+
-
-

- Active -

- -
-
- - - -
+
+

+ Active +

+ +
+
+ + + +
+
+ +
+
+
+
+
+
+ + + +
{{item.days.toFixed(0)}}D
+
+
- -
-
+ + +
+
{{item.STATUS}}
+
+ {{item.custgroupName}} +
+
{{item.team}}
+
+ +
+ + +
+
{{item.COMMENT | short}}
+
{{item.COMMENT | font}}
+
+ +
+ +
+
+
+
+
+
+
+ + +
+

+ On Hold +

+
+
+ + +
-
-
-
- +
+
+
+
+
+
+
+ -
{{item.days.toFixed(0)}}D
-
- +
{{item.days.toFixed(0)}}D
+
+ +
+ + +
+
{{item.STATUS}}
+
+ {{item.custgroupName}} +
+
{{item.team}}
+
+
-
- -
-
{{item.STATUS}}
-
- {{item.custgroupName}} -
-
{{item.team}}

- -
- - -
-
{{item.COMMENT | short}}
-
{{item.COMMENT | font}}
-
- -
- + + +
+
{{item.COMMENT | short}}
+
{{item.COMMENT | font}}
+
+ + + +
+
+
+
+ + +



- - -
-

- On Hold -

-
-
- - - -
-
-
-
+ + +
+

+ On Hold +

+
+
+ + +
-
-
-
- - - -
{{item.days.toFixed(0)}}D
-
- +
+
+
+
+
+
+
+ + + +
{{item.days.toFixed(0)}}D
+
+ +
+ + +
+
{{item.type}}
+
{{item.STATUS}}
+
+ {{item.custgroupName}}
-
- -
-
{{item.STATUS}}
-
- {{item.custgroupName}} -
-
{{item.team}}

- -
- - -
-
{{item.COMMENT | short}}
-
{{item.COMMENT | font}}
-
- -
- +
{{item.team}}
+
+
-
+ + +
+
{{item.COMMENT | short}}
+ +
{{item.COMMENT | font}}
+
+ + +
+
+
-
+ +
-
- - - - +
--> \ No newline at end of file diff --git a/src/app/dashboard/dashboard.component.ts b/src/app/dashboard/dashboard.component.ts index 8342d6d..279e23f 100644 --- a/src/app/dashboard/dashboard.component.ts +++ b/src/app/dashboard/dashboard.component.ts @@ -62,6 +62,10 @@ export class DashboardComponent implements OnInit { resultNum6:number = 0; resultDataOnHold6: any; + resultData7: any; + resultNum7:number = 0; + resultDataOnHold7: any; + async ngOnInit() { //----------------------------1------------------------ @@ -414,6 +418,64 @@ export class DashboardComponent implements OnInit { setInterval(async() => { await this.getDataOnHold6(); }, 600000); + + // ----------------------------7------------------------ + try { + const data7 = { + // 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 , 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 ORDER BY vtiger_crmentity.createdtime ASC LIMIT 0 , 100', + 'params': ['vtiger_crmentity'] + }; + const response = await this._apiService.post('dynamic', data7); + if (response !== null) { + this.resultData7 = response; + this.resultData7.link = decodeURIComponent(decodeURIComponent(this.resultData7.link)); + console.log('link: ', this.resultData6.link); + // tslint:disable-next-line:forin + for (const i in this.resultData7) { + this.resultData7[i].link = this._common.decodeURI(this.resultData7[i].link); + this.resultData7[i].birth_date = this._common.convertDate(this.resultData7[i].birth_date); + this.resultNum7 = this.resultData7.length; + } + } else { + this.resultData7 = []; + } + } catch (error) { + console.log(error); + } + + setInterval(async() => { + await this.getData7(); + }, 600000); + + + // OnHold + try { + const dataOnHold7 = { + // 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 , 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 LIMIT 0 , 100', + 'params': ['vtiger_crmentity'] + }; + const response = await this._apiService.post('dynamic', dataOnHold7); + if (response !== null) { + this.resultDataOnHold7 = response; + this.resultDataOnHold7.link = decodeURIComponent(decodeURIComponent(this.resultDataOnHold7.link)); + console.log('link: ', this.resultDataOnHold7.link); + // tslint:disable-next-line:forin + for (const i in this.resultDataOnHold7) { + this.resultDataOnHold7[i].link = this._common.decodeURI(this.resultDataOnHold7[i].link); + this.resultDataOnHold7[i].birth_date = this._common.convertDate(this.resultDataOnHold7[i].birth_date); + } + } else { + this.resultDataOnHold7 = []; + } + } catch (error) { + console.log(error); + } + + setInterval(async() => { + await this.getDataOnHold7(); + }, 600000); } /////////////Get data come to use////////////////////// @@ -729,4 +791,57 @@ async getDataOnHold6() { console.log(error); } } + +// ----------------------------7------------------------ + // Active + async getData7() { + try { + const data7 = { + // 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 , 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 ORDER BY vtiger_crmentity.createdtime ASC LIMIT 0 , 100', + 'params': ['vtiger_crmentity'] + }; + const response = await this._apiService.post('dynamic', data7); + if (response !== null) { + this.resultData7 = response; + this.resultData7.link = decodeURIComponent(decodeURIComponent(this.resultData7.link)); + console.log('link: ', this.resultData7.link); + // tslint:disable-next-line:forin + for (const i in this.resultData7) { + this.resultData7[i].link = this._common.decodeURI(this.resultData7[i].link); + this.resultData7[i].birth_date = this._common.convertDate(this.resultData7[i].birth_date); + } + } else { + this.resultData7 = []; + } + } catch (error) { + console.log(error); + } +} +// On Hold +async getDataOnHold7() { + try { + const dataOnHold7 = { + // 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 , 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 LIMIT 0 , 100', + 'params': ['vtiger_crmentity'] + }; + const response = await this._apiService.post('dynamic', dataOnHold7); + if (response !== null) { + this.resultDataOnHold7 = response; + this.resultDataOnHold7.link = decodeURIComponent(decodeURIComponent(this.resultDataOnHold7.link)); + console.log('link: ', this.resultDataOnHold7.link); + // tslint:disable-next-line:forin + for (const i in this.resultDataOnHold7) { + this.resultDataOnHold7[i].link = this._common.decodeURI(this.resultDataOnHold7[i].link); + this.resultDataOnHold7[i].birth_date = this._common.convertDate(this.resultDataOnHold7[i].birth_date); + } + } else { + this.resultDataOnHold7 = []; + } + } catch (error) { + console.log(error); + } +} + } \ No newline at end of file diff --git a/src/app/dashboard/filter.pipe.ts b/src/app/dashboard/filter.pipe.ts index 09ece2b..760c815 100644 --- a/src/app/dashboard/filter.pipe.ts +++ b/src/app/dashboard/filter.pipe.ts @@ -29,6 +29,9 @@ export class FilterPipe implements PipeTransform { if(item['STATUS']){ st += item['STATUS'].toLowerCase(); } + if(item['type']){ + st += item['type'].toLowerCase(); + } var string2 = filterString.toLowerCase(); if (st.indexOf(string2) > -1) { -- libgit2 0.21.2