From 1ba832b3f0b7526486f6830469962906473ce15e Mon Sep 17 00:00:00 2001 From: DESKTOP-D5ILJ4S\flr_3 Date: Thu, 5 Jul 2018 10:49:26 +0700 Subject: [PATCH] ยิง api ทุก 10 นาที กับ ทำคอมเม้น --- src/app/app.module.ts | 2 ++ src/app/dashboard/dashboard.component.html | 4 ++-- src/app/dashboard/dashboard.component.scss | 4 +--- src/app/dashboard/dashboard.component.ts | 24 +++++++++++++++++------- src/app/dashboard/short.ts | 10 ++++++++++ 5 files changed, 32 insertions(+), 12 deletions(-) create mode 100644 src/app/dashboard/short.ts diff --git a/src/app/app.module.ts b/src/app/app.module.ts index ff9066c..b118ffb 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -13,10 +13,12 @@ import { CommonService } from './services/common/common.service'; import { AppComponent } from './app.component'; import { LayoutComponent } from './layout/layout.component'; import { DashboardComponent } from './dashboard/dashboard.component'; +import { ShortPipe } from './dashboard/short'; @NgModule({ declarations: [ AppComponent, + ShortPipe, LayoutComponent, DashboardComponent ], diff --git a/src/app/dashboard/dashboard.component.html b/src/app/dashboard/dashboard.component.html index 73fa5a5..414e07b 100644 --- a/src/app/dashboard/dashboard.component.html +++ b/src/app/dashboard/dashboard.component.html @@ -8,7 +8,7 @@ [ngStyle] = "{'background-color': getColorDay(item.days.toFixed(0))}"> -
{{(item.days).toFixed(0)}}D
+
{{item.days.toFixed(0)}}D
@@ -19,7 +19,7 @@ {{item.custgroupName}}
{{item.team}}

-
{{item.COMMENT | slice:0:20 }} ....
+
{{item.COMMENT | short}}
diff --git a/src/app/dashboard/dashboard.component.scss b/src/app/dashboard/dashboard.component.scss index 4e84e2a..b0e88d9 100644 --- a/src/app/dashboard/dashboard.component.scss +++ b/src/app/dashboard/dashboard.component.scss @@ -14,9 +14,7 @@ } - - .dashboard-stat { overflow: visible; - height: 200px; + height: 220px; } diff --git a/src/app/dashboard/dashboard.component.ts b/src/app/dashboard/dashboard.component.ts index faed10d..a621089 100644 --- a/src/app/dashboard/dashboard.component.ts +++ b/src/app/dashboard/dashboard.component.ts @@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { ApiService } from '../services/api.service'; import { CommonService } from '../services/common/common.service'; +import { async } from 'rxjs/internal/scheduler/async'; @Component({ selector: 'app-dashboard', @@ -36,13 +37,21 @@ export class DashboardComponent implements OnInit { ) { } async ngOnInit() { - const data = { - // 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 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) != \'closed\') GROUP BY vtiger_troubletickets.ticketid ORDER BY vtiger_crmentity.createdtime ASC LIMIT 0 , 100', - 'params': ['vtiger_crmentity'] - }; + + setInterval(async() => { + await this.getData(); + }, 600000); + + } + + async getData() { try { - const response = await this._apiService.post('dynamic', data); + const data = { + // 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 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) != \'closed\') GROUP BY vtiger_troubletickets.ticketid ORDER BY vtiger_crmentity.createdtime ASC LIMIT 0 , 100', + 'params': ['vtiger_crmentity'] + }; + let response = await this._apiService.post('dynamic', data); if (response !== null) { this.resultData = response; this.resultData.link = decodeURIComponent(decodeURIComponent(this.resultData.link)); @@ -59,7 +68,8 @@ export class DashboardComponent implements OnInit { console.log(error); } } - } + +} // getColor(color) { // console.log(color) diff --git a/src/app/dashboard/short.ts b/src/app/dashboard/short.ts new file mode 100644 index 0000000..c08fdaa --- /dev/null +++ b/src/app/dashboard/short.ts @@ -0,0 +1,10 @@ +import { PipeTransform, Pipe } from "@angular/core"; + +@Pipe ({ + name: 'short' +}) +export class ShortPipe implements PipeTransform { + transform(value: string): string { + return value.substr(0, 30) + ' ...'; + } +} \ No newline at end of file -- libgit2 0.21.2