Commit af3d935e623e31633921762a2dc80b3a5f773ac6
1 parent
93c6bbfb
Exists in
master
แบ่งข้อมูล active และ onHold
Showing
2 changed files
with
62 additions
and
8 deletions
Show diff stats
src/app/dashboard/dashboard.component.html
... | ... | @@ -14,7 +14,6 @@ |
14 | 14 | <a href="#" data-toggle="tab" aria-expanded="true">xxxx</a> |
15 | 15 | </li> |
16 | 16 | </ul> |
17 | - <br> | |
18 | 17 | <div class="panel panel-default"> |
19 | 18 | <div class="caption"> |
20 | 19 | <h1 class="icon-bubble font-green-sharp"> |
... | ... | @@ -26,7 +25,7 @@ |
26 | 25 | type="text" |
27 | 26 | placeholder="Search.." |
28 | 27 | class="form-control sbold font" |
29 | - [(ngModel)]="filteredStatus" | |
28 | + | |
30 | 29 | > |
31 | 30 | </div> |
32 | 31 | </h1> |
... | ... | @@ -83,7 +82,7 @@ |
83 | 82 | </div> |
84 | 83 | <div class="panel-body"> |
85 | 84 | <div class="row"> |
86 | - <div class="col-lg-4 col-md-3 col-sm-6 col-xs-12" *ngFor="let item of resultData"> | |
85 | + <div class="col-lg-4 col-md-3 col-sm-6 col-xs-12" *ngFor="let item of resultDataOnHold"> | |
87 | 86 | <a class="dashboard-stat dashboard-stat-v2 red " |
88 | 87 | href="{{item.link}}" |
89 | 88 | target="_blank" | ... | ... |
src/app/dashboard/dashboard.component.ts
... | ... | @@ -11,8 +11,7 @@ import { async } from 'rxjs/internal/scheduler/async'; |
11 | 11 | }) |
12 | 12 | export class DashboardComponent implements OnInit { |
13 | 13 | |
14 | - resultData: any; | |
15 | - resultDataOnHold: any; | |
14 | + | |
16 | 15 | |
17 | 16 | getColorDay(days){ |
18 | 17 | console.log(days) |
... | ... | @@ -37,10 +36,12 @@ export class DashboardComponent implements OnInit { |
37 | 36 | private _router: Router |
38 | 37 | ) { } |
39 | 38 | |
39 | + resultData: any; | |
40 | + resultDataOnHold: any; | |
40 | 41 | |
41 | - | |
42 | - // Active | |
42 | + | |
43 | 43 | async ngOnInit() { |
44 | + // Active | |
44 | 45 | try { |
45 | 46 | const data = { |
46 | 47 | // tslint:disable-next-line:max-line-length |
... | ... | @@ -67,9 +68,39 @@ export class DashboardComponent implements OnInit { |
67 | 68 | setInterval(async() => { |
68 | 69 | await this.getData(); |
69 | 70 | }, 600000); |
70 | - | |
71 | + | |
72 | + | |
73 | + //OnHold | |
74 | + try { | |
75 | + const dataOnHold = { | |
76 | + // tslint:disable-next-line:max-line-length | |
77 | + "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 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) = 'set (ติดตั้ง)' AND LCASE(vtiger_troubletickets. STATUS) IN('Wait For Customer')) GROUP BY vtiger_troubletickets.ticketid ORDER BY vtiger_crmentity.createdtime ASC LIMIT 0 , 100", | |
78 | + "params": ["vtiger_crmentity"] | |
79 | + }; | |
80 | + let response = await this._apiService.post('dynamic', dataOnHold); | |
81 | + if (response !== null) { | |
82 | + this.resultDataOnHold = response; | |
83 | + this.resultDataOnHold.link = decodeURIComponent(decodeURIComponent(this.resultDataOnHold.link)); | |
84 | + console.log('link: ', this.resultDataOnHold.link); | |
85 | + // tslint:disable-next-line:forin | |
86 | + for (const i in this.resultDataOnHold) { | |
87 | + this.resultDataOnHold[i].link = this._common.decodeURI(this.resultDataOnHold[i].link); | |
88 | + this.resultDataOnHold[i].birth_date = this._common.convertDate(this.resultDataOnHold[i].birth_date); | |
89 | + } | |
90 | + } else { | |
91 | + this.resultDataOnHold = []; | |
92 | + } | |
93 | + } catch (error) { | |
94 | + console.log(error); | |
95 | + } | |
96 | + | |
97 | + setInterval(async() => { | |
98 | + await this.getDataOnHold(); | |
99 | + }, 600000); | |
71 | 100 | } |
72 | 101 | |
102 | + | |
103 | + // Active | |
73 | 104 | async getData() { |
74 | 105 | try { |
75 | 106 | const data = { |
... | ... | @@ -96,6 +127,30 @@ export class DashboardComponent implements OnInit { |
96 | 127 | } |
97 | 128 | |
98 | 129 | //On Hold |
130 | + async getDataOnHold() { | |
131 | + try { | |
132 | + const dataOnHold = { | |
133 | + // tslint:disable-next-line:max-line-length | |
134 | + "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 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) = 'set (ติดตั้ง)' AND LCASE(vtiger_troubletickets. STATUS) IN('Wait For Customer')) GROUP BY vtiger_troubletickets.ticketid ORDER BY vtiger_crmentity.createdtime ASC LIMIT 0 , 100", | |
135 | + "params": ["vtiger_crmentity"] | |
136 | + }; | |
137 | + let response = await this._apiService.post('dynamic', dataOnHold); | |
138 | + if (response !== null) { | |
139 | + this.resultDataOnHold = response; | |
140 | + this.resultDataOnHold.link = decodeURIComponent(decodeURIComponent(this.resultDataOnHold.link)); | |
141 | + console.log('link: ', this.resultDataOnHold.link); | |
142 | + // tslint:disable-next-line:forin | |
143 | + for (const i in this.resultDataOnHold) { | |
144 | + this.resultDataOnHold[i].link = this._common.decodeURI(this.resultDataOnHold[i].link); | |
145 | + this.resultDataOnHold[i].birth_date = this._common.convertDate(this.resultDataOnHold[i].birth_date); | |
146 | + } | |
147 | + } else { | |
148 | + this.resultDataOnHold = []; | |
149 | + } | |
150 | + } catch (error) { | |
151 | + console.log(error); | |
152 | + } | |
153 | + } | |
99 | 154 | |
100 | 155 | |
101 | 156 | } | ... | ... |