From 1b630ad721c408dd3a1333982f7676072b0a500b Mon Sep 17 00:00:00 2001 From: DESKTOP-D5ILJ4S\flr_3 Date: Tue, 17 Jul 2018 17:39:06 +0700 Subject: [PATCH] กดปุ่มเพื่อค้นหา --- src/app/dashboard/dashboard.component.html | 240 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------ src/app/dashboard/dashboard.component.ts | 161 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------- src/app/dashboard/filter.pipe.ts | 2 +- 3 files changed, 308 insertions(+), 95 deletions(-) diff --git a/src/app/dashboard/dashboard.component.html b/src/app/dashboard/dashboard.component.html index adcd531..b571a36 100644 --- a/src/app/dashboard/dashboard.component.html +++ b/src/app/dashboard/dashboard.component.html @@ -1,10 +1,8 @@ - -
-
+

Active @@ -57,9 +55,6 @@

-
-
-

@@ -116,9 +111,6 @@
-
-
-

@@ -171,9 +163,6 @@ -
-
-

@@ -228,9 +217,6 @@ -
-
-

@@ -282,9 +268,6 @@ -
-
-

@@ -339,9 +322,6 @@ -
-
-

@@ -393,9 +373,6 @@ -
-
-

@@ -450,9 +427,6 @@ -
-
-

@@ -504,9 +478,6 @@ -
-
-

@@ -561,9 +532,6 @@ -
-
-

@@ -615,9 +583,6 @@ -
-
-

@@ -672,9 +637,6 @@ -
-
-

@@ -728,7 +690,7 @@

- +

@@ -785,9 +747,6 @@ -
-
-
@@ -829,7 +788,112 @@ -
+ + +
+

0 Tricket

// comment - - +
// comment +
{{(item.days).toFixed(0)}} D
// comment
{{item.days.toFixed(0)}}D
@@ -868,48 +946,42 @@
{{item.team}}

- +
{{(item.COMMENT > 20)? | (item.COMMENT | slice:0:20) + '....':(item.COMMENT)}}
// comment
{{item.COMMENT | short}}
- +
{{item.COMMENT | font}}
// comment
{{item.COMMENT | font}}
+
+ // comment -
-
-
-
- - - - - - \ No newline at end of file + + ------ // coment end------- +
+ --> + + + \ No newline at end of file diff --git a/src/app/dashboard/dashboard.component.ts b/src/app/dashboard/dashboard.component.ts index 251461f..0e85e3b 100644 --- a/src/app/dashboard/dashboard.component.ts +++ b/src/app/dashboard/dashboard.component.ts @@ -20,7 +20,7 @@ export class DashboardComponent implements OnInit { getColorDay(days) { - console.log(days) + // console.log(days) if (days >= 0 && days <= 7) { return '#32c5d2'; @@ -70,6 +70,10 @@ export class DashboardComponent implements OnInit { resultNum7: number = 0; resultDataOnHold7: any; + resultData8: any; + resultNum8: number = 0; + resultDataOnHold8: any; + Show1: any = []; Show1Onhold: any = []; Show2: any = []; @@ -85,8 +89,17 @@ export class DashboardComponent implements OnInit { Show7: any = []; Show7Onhold: any = []; + Namebtn:any = []; + + selectArr: any; + ButtonValue = [ { + id: 33, + name: 'All', + valueN: '' + }, + { id: 1, name: 'ACC', valueN: 'acc' @@ -245,12 +258,7 @@ export class DashboardComponent implements OnInit { id: 32, name: 'WEB', valueN: 'web' - }, - { - id: 33, - name: 'All', - valueN: '' - }, + } ]; showSecret = false; @@ -689,10 +697,90 @@ export class DashboardComponent implements OnInit { setInterval(async () => { await this.getDataOnHold7(); }, 600000); + + +// ----------------------------8------------------------ +try { + const data8 = { + // 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 , concat( vtiger_ticketcf.cf_568 , ' (' , vtiger_cf_568.day_amount , ')') 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) = 'ITS (SmartIT)' AND LCASE(vtiger_troubletickets. STATUS) not in('closed' , 'Wait For Customer')) GROUP BY vtiger_troubletickets.ticketid ORDER BY vtiger_crmentity.createdtime ASC ", + "params": ["vtiger_crmentity"] + }; + const response = await this._apiService.post('dynamic', data8); + if (response !== null) { + this.resultData8 = response; + this.resultData8.link = decodeURIComponent(decodeURIComponent(this.resultData8.link)); + console.log('link: ', this.resultData8.link); + // tslint:disable-next-line:forin + for (const i in this.resultData8) { + this.resultData8[i].link = this._common.decodeURI(this.resultData8[i].link); + this.resultData8[i].birth_date = this._common.convertDate(this.resultData8[i].birth_date); + this.resultNum8 = this.resultData8.length; + } + + // this.Show = Object.assign(this.resultData7); + console.log('hi', this.Show7) + + } else { + this.resultData8 = []; + } +} catch (error) { + console.log(error); +} + +setInterval(async () => { + await this.getData8(); +}, 600000); + + +// OnHold +try { + const dataOnHold8 = { + // 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 , concat( vtiger_ticketcf.cf_568 , ' (' , vtiger_cf_568.day_amount , ')') 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) = 'ITS (SmartIT)' 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', dataOnHold8); + if (response !== null) { + this.resultDataOnHold8 = response; + this.resultDataOnHold8.link = decodeURIComponent(decodeURIComponent(this.resultDataOnHold8.link)); + console.log('link: ', this.resultDataOnHold8.link); + // tslint:disable-next-line:forin + for (const i in this.resultDataOnHold8) { + this.resultDataOnHold8[i].link = this._common.decodeURI(this.resultDataOnHold8[i].link); + this.resultDataOnHold8[i].birth_date = this._common.convertDate(this.resultDataOnHold8[i].birth_date); + } + } else { + this.resultDataOnHold8 = []; + } +} catch (error) { + console.log(error); +} + +setInterval(async () => { + await this.getDataOnHold8(); +}, 600000); + +} + + + + btnSelect(selVal) { + // console.log(selVal); + let arr = []; + for (let i in selVal) { + arr.push(selVal); + } + + // console.log('select1 : ', arr); + + this.Namebtn = arr; + + console.log('select : ', this.Namebtn); } getButton1(valueN) { - console.log(valueN); + // console.log(valueN); if (this.Show1.length === 0) { return this.Show1; @@ -710,14 +798,15 @@ export class DashboardComponent implements OnInit { var string2 = valueN.toLowerCase(); if (st.indexOf(string2) > -1) { - console.log(st); + // console.log(st); resultArray.push(item); + // console.log(resultArray); } } this.resultData = resultArray; - console.log(this.resultData); + // console.log(this.resultData); } /* buttondataOnhold1 */ getButton1Onhold(valueN) { @@ -1457,4 +1546,56 @@ export class DashboardComponent implements OnInit { } } +// ----------------------------8------------------------ + // Active + async getData8() { + try { + const data8 = { + // 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 , concat( vtiger_ticketcf.cf_568 , ' (' , vtiger_cf_568.day_amount , ')') 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) = 'ITS (SmartIT)' AND LCASE(vtiger_troubletickets. STATUS) not in('closed' , 'Wait For Customer')) GROUP BY vtiger_troubletickets.ticketid ORDER BY vtiger_crmentity.createdtime ASC ", + "params": ["vtiger_crmentity"] + }; + const response = await this._apiService.post('dynamic', data8); + if (response !== null) { + this.resultData8 = response; + this.resultData8.link = decodeURIComponent(decodeURIComponent(this.resultData8.link)); + console.log('link: ', this.resultData8.link); + // tslint:disable-next-line:forin + for (const i in this.resultData8) { + this.resultData8[i].link = this._common.decodeURI(this.resultData8[i].link); + this.resultData8[i].birth_date = this._common.convertDate(this.resultData8[i].birth_date); + this.Show7.push(this.resultData8[i]); + } + } else { + this.resultData8 = []; + } + } catch (error) { + console.log(error); + } + } + // On Hold + async getDataOnHold8() { + try { + const dataOnHold8 = { + // 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 , concat( vtiger_ticketcf.cf_568 , ' (' , vtiger_cf_568.day_amount , ')') 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) = 'ITS (SmartIT)' 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', dataOnHold8); + if (response !== null) { + this.resultDataOnHold8 = response; + this.resultDataOnHold8.link = decodeURIComponent(decodeURIComponent(this.resultDataOnHold8.link)); + console.log('link: ', this.resultDataOnHold8.link); + // tslint:disable-next-line:forin + for (const i in this.resultDataOnHold8) { + this.resultDataOnHold8[i].link = this._common.decodeURI(this.resultDataOnHold8[i].link); + this.resultDataOnHold8[i].birth_date = this._common.convertDate(this.resultDataOnHold8[i].birth_date); + } + } else { + this.resultDataOnHold8 = []; + } + } 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 2984883..4aaaa09 100644 --- a/src/app/dashboard/filter.pipe.ts +++ b/src/app/dashboard/filter.pipe.ts @@ -15,7 +15,7 @@ export class FilterPipe implements PipeTransform { var txt = "0 hi" const resultArray = []; for (const item of value) { - console.log('item: ', item); + // console.log('item: ', item); var st = ''; //st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ; -- libgit2 0.21.2