Commit cb492052130c0542c0c153f114a7681d756ba7d6
1 parent
4d9759b2
Exists in
master
ปุ่มค้นหา department เฉพราะหน้า ติดตั้ง
Showing
2 changed files
with
167 additions
and
22 deletions
Show diff stats
src/app/dashboard/dashboard.component.html
@@ -65,8 +65,15 @@ | @@ -65,8 +65,15 @@ | ||
65 | <input type="text" placeholder="Search.." class="form-control sbold font" [(ngModel)]="FilterSearch"> | 65 | <input type="text" placeholder="Search.." class="form-control sbold font" [(ngModel)]="FilterSearch"> |
66 | </div> | 66 | </div> |
67 | </div> | 67 | </div> |
68 | - <hr> | ||
69 | <br> | 68 | <br> |
69 | + <br> | ||
70 | + <button type="button" class="btn btn-circle button" *ngFor="let nameD of ButtonValueDepart" (click)="getButton1Depart(nameD.valueN);getButton1DepartOnhold(nameD.valueN);" | ||
71 | + style="margin-left: 5px; margin-top: 10px;">{{ nameD.name }} | ||
72 | + </button> | ||
73 | + <hr> | ||
74 | + <div *ngIf="showSecret1"> | ||
75 | + <p style="text-align: left; font-size: 30px;">0 Tricket</p> | ||
76 | + </div> | ||
70 | </div> | 77 | </div> |
71 | <div class="panel-body"> | 78 | <div class="panel-body"> |
72 | <div class="row"> | 79 | <div class="row"> |
@@ -122,6 +129,9 @@ | @@ -122,6 +129,9 @@ | ||
122 | </div> | 129 | </div> |
123 | </div> | 130 | </div> |
124 | <hr> | 131 | <hr> |
132 | + <div *ngIf="showSecret2"> | ||
133 | + <p style="text-align: left; font-size: 30px;">0 Tricket</p> | ||
134 | + </div> | ||
125 | <br> | 135 | <br> |
126 | </div> | 136 | </div> |
127 | <div class="panel-body"> | 137 | <div class="panel-body"> |
src/app/dashboard/dashboard.component.ts
@@ -74,23 +74,49 @@ export class DashboardComponent implements OnInit { | @@ -74,23 +74,49 @@ export class DashboardComponent implements OnInit { | ||
74 | resultDataOnHold9: any; | 74 | resultDataOnHold9: any; |
75 | 75 | ||
76 | Show1: any = []; | 76 | Show1: any = []; |
77 | + Show1Depart: any = []; | ||
77 | Show1Onhold: any = []; | 78 | Show1Onhold: any = []; |
79 | + Show1DepartOnhold: any = []; | ||
80 | + | ||
78 | Show2: any = []; | 81 | Show2: any = []; |
82 | + Show2Depart: any = []; | ||
79 | Show2Onhold: any = []; | 83 | Show2Onhold: any = []; |
84 | + Show2DepartOnhold: any = []; | ||
85 | + | ||
80 | Show3: any = []; | 86 | Show3: any = []; |
87 | + Show3Depart: any = []; | ||
81 | Show3Onhold: any = []; | 88 | Show3Onhold: any = []; |
89 | + Show3DepartOnhold: any = []; | ||
90 | + | ||
82 | Show4: any = []; | 91 | Show4: any = []; |
92 | + Show4Depart: any = []; | ||
83 | Show4Onhold: any = []; | 93 | Show4Onhold: any = []; |
94 | + Show4DepartOnhold: any = []; | ||
95 | + | ||
84 | Show5: any = []; | 96 | Show5: any = []; |
97 | + Show5Depart: any = []; | ||
85 | Show5Onhold: any = []; | 98 | Show5Onhold: any = []; |
99 | + Show5DepartOnhold: any = []; | ||
100 | + | ||
86 | Show6: any = []; | 101 | Show6: any = []; |
102 | + Show6Depart: any = []; | ||
87 | Show6Onhold: any = []; | 103 | Show6Onhold: any = []; |
104 | + Show6DepartOnhold: any = []; | ||
105 | + | ||
88 | Show7: any = []; | 106 | Show7: any = []; |
107 | + Show7Depart: any = []; | ||
89 | Show7Onhold: any = []; | 108 | Show7Onhold: any = []; |
109 | + Show7DepartOnhold: any = []; | ||
110 | + | ||
90 | Show8: any = []; | 111 | Show8: any = []; |
112 | + Show8Depart: any = []; | ||
91 | Show8Onhold: any = []; | 113 | Show8Onhold: any = []; |
114 | + Show8DepartOnhold: any = []; | ||
115 | + | ||
92 | Show9: any = []; | 116 | Show9: any = []; |
117 | + Show9Depart: any = []; | ||
93 | Show9Onhold: any = []; | 118 | Show9Onhold: any = []; |
119 | + Show9DepartOnhold: any = []; | ||
94 | 120 | ||
95 | ShowNull: any = []; | 121 | ShowNull: any = []; |
96 | 122 | ||
@@ -330,6 +356,50 @@ export class DashboardComponent implements OnInit { | @@ -330,6 +356,50 @@ export class DashboardComponent implements OnInit { | ||
330 | } | 356 | } |
331 | ]; | 357 | ]; |
332 | 358 | ||
359 | + // tslint:disable-next-line:member-ordering | ||
360 | + ButtonValueDepart = [ | ||
361 | + { | ||
362 | + id: 1, | ||
363 | + name: 'All', | ||
364 | + valueN: '' | ||
365 | + }, | ||
366 | + { | ||
367 | + id: 2, | ||
368 | + name: 'BD', | ||
369 | + valueN: 'bd' | ||
370 | + }, | ||
371 | + { | ||
372 | + id: 3, | ||
373 | + name: 'R&P', | ||
374 | + valueN: 'r&p' | ||
375 | + }, | ||
376 | + { | ||
377 | + id: 4, | ||
378 | + name: 'Admin', | ||
379 | + valueN: 'admin' | ||
380 | + }, | ||
381 | + { | ||
382 | + id: 5, | ||
383 | + name: 'SmartIT', | ||
384 | + valueN: 'smartit' | ||
385 | + }, | ||
386 | + { | ||
387 | + id: 6, | ||
388 | + name: 'Purchasing', | ||
389 | + valueN: 'purchasing' | ||
390 | + }, | ||
391 | + { | ||
392 | + id: 7, | ||
393 | + name: 'Contact Center', | ||
394 | + valueN: 'contact center' | ||
395 | + }, | ||
396 | + { | ||
397 | + id: 8, | ||
398 | + name: 'Customer Service', | ||
399 | + valueN: 'customer service' | ||
400 | + } | ||
401 | + ]; | ||
402 | + | ||
333 | showSecret: boolean = false; | 403 | showSecret: boolean = false; |
334 | showSecret1: boolean = false; | 404 | showSecret1: boolean = false; |
335 | showSecret2: boolean = false; | 405 | showSecret2: boolean = false; |
@@ -356,8 +426,8 @@ export class DashboardComponent implements OnInit { | @@ -356,8 +426,8 @@ export class DashboardComponent implements OnInit { | ||
356 | try { | 426 | try { |
357 | const data = { | 427 | const data = { |
358 | // tslint:disable-next-line:max-line-length | 428 | // tslint:disable-next-line:max-line-length |
359 | - "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 , 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 , vu.department 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 ", | ||
360 | - "params": ["vtiger_crmentity"] | 429 | + '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 , 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 , vu.department 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 ', |
430 | + 'params': ['vtiger_crmentity'] | ||
361 | }; | 431 | }; |
362 | const response = await this._apiService.post('dynamic', data); | 432 | const response = await this._apiService.post('dynamic', data); |
363 | if (response !== null) { | 433 | if (response !== null) { |
@@ -370,6 +440,7 @@ export class DashboardComponent implements OnInit { | @@ -370,6 +440,7 @@ export class DashboardComponent implements OnInit { | ||
370 | this.resultData[i].birth_date = this._common.convertDate(this.resultData[i].birth_date); | 440 | this.resultData[i].birth_date = this._common.convertDate(this.resultData[i].birth_date); |
371 | this.resultNum = this.resultData.length; | 441 | this.resultNum = this.resultData.length; |
372 | this.Show1.push(this.resultData[i]); | 442 | this.Show1.push(this.resultData[i]); |
443 | + this.Show1Depart.push(this.resultData[i]); | ||
373 | } | 444 | } |
374 | 445 | ||
375 | } else { | 446 | } else { |
@@ -402,9 +473,11 @@ export class DashboardComponent implements OnInit { | @@ -402,9 +473,11 @@ export class DashboardComponent implements OnInit { | ||
402 | this.resultDataOnHold[i].link = this._common.decodeURI(this.resultDataOnHold[i].link); | 473 | this.resultDataOnHold[i].link = this._common.decodeURI(this.resultDataOnHold[i].link); |
403 | this.resultDataOnHold[i].birth_date = this._common.convertDate(this.resultDataOnHold[i].birth_date); | 474 | this.resultDataOnHold[i].birth_date = this._common.convertDate(this.resultDataOnHold[i].birth_date); |
404 | this.Show1Onhold.push(this.resultDataOnHold[i]); | 475 | this.Show1Onhold.push(this.resultDataOnHold[i]); |
476 | + this.Show1DepartOnhold.push(this.resultDataOnHold[i]); | ||
405 | } | 477 | } |
406 | } else { | 478 | } else { |
407 | this.resultDataOnHold = []; | 479 | this.resultDataOnHold = []; |
480 | + this.showSecret = !this.showSecret; | ||
408 | } | 481 | } |
409 | } catch (error) { | 482 | } catch (error) { |
410 | // console.log(error); | 483 | // console.log(error); |
@@ -930,6 +1003,7 @@ setInterval(async () => { | @@ -930,6 +1003,7 @@ setInterval(async () => { | ||
930 | }); | 1003 | }); |
931 | 1004 | ||
932 | for (let i = 0; i < t9.length; i++) { | 1005 | for (let i = 0; i < t9.length; i++) { |
1006 | + // tslint:disable-next-line:no-shadowed-variable | ||
933 | const obj = { | 1007 | const obj = { |
934 | name: '', | 1008 | name: '', |
935 | value: 0 | 1009 | value: 0 |
@@ -1027,7 +1101,7 @@ setInterval(async () => { | @@ -1027,7 +1101,7 @@ setInterval(async () => { | ||
1027 | // console.log('item: ', item); | 1101 | // console.log('item: ', item); |
1028 | 1102 | ||
1029 | let st = ''; | 1103 | let st = ''; |
1030 | - // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ; | 1104 | + |
1031 | if (item['type']) { | 1105 | if (item['type']) { |
1032 | st = item['type'].toLowerCase(); | 1106 | st = item['type'].toLowerCase(); |
1033 | } | 1107 | } |
@@ -1044,6 +1118,42 @@ setInterval(async () => { | @@ -1044,6 +1118,42 @@ setInterval(async () => { | ||
1044 | this.resultData = resultArray; | 1118 | this.resultData = resultArray; |
1045 | // console.log(this.resultData); | 1119 | // console.log(this.resultData); |
1046 | } | 1120 | } |
1121 | + | ||
1122 | + getButton1Depart(valueN) { | ||
1123 | + console.log(valueN); | ||
1124 | + | ||
1125 | + if (this.Show1Depart.length === 0) { | ||
1126 | + return this.Show1Depart; | ||
1127 | + } | ||
1128 | + | ||
1129 | + const resultArray = []; | ||
1130 | + for (const item of this.Show1Depart) { | ||
1131 | + // console.log('item: ', item); | ||
1132 | + | ||
1133 | + let st = ''; | ||
1134 | + | ||
1135 | + if (item['department']) { | ||
1136 | + st = item['department'].toLowerCase(); | ||
1137 | + } | ||
1138 | + | ||
1139 | + const string2 = valueN.toLowerCase(); | ||
1140 | + if (st.startsWith(string2)) { | ||
1141 | + console.log(st); | ||
1142 | + resultArray.push(item); | ||
1143 | + } | ||
1144 | + | ||
1145 | + } | ||
1146 | + if (resultArray.length === 0) { | ||
1147 | + if (valueN !== '') { | ||
1148 | + this.showSecret1 = true; | ||
1149 | + } | ||
1150 | + } else if (resultArray.length > 0) { | ||
1151 | + this.showSecret1 = false; | ||
1152 | + } | ||
1153 | + this.resultData = resultArray; | ||
1154 | + | ||
1155 | + } | ||
1156 | + | ||
1047 | /* buttondataOnhold1 */ | 1157 | /* buttondataOnhold1 */ |
1048 | getButton1Onhold(valueN) { | 1158 | getButton1Onhold(valueN) { |
1049 | console.log(valueN); | 1159 | console.log(valueN); |
@@ -1057,7 +1167,6 @@ setInterval(async () => { | @@ -1057,7 +1167,6 @@ setInterval(async () => { | ||
1057 | // console.log('item: ', item); | 1167 | // console.log('item: ', item); |
1058 | 1168 | ||
1059 | let st = ''; | 1169 | let st = ''; |
1060 | - // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ; | ||
1061 | if (item['type']) { | 1170 | if (item['type']) { |
1062 | st = item['type'].toLowerCase(); | 1171 | st = item['type'].toLowerCase(); |
1063 | } | 1172 | } |
@@ -1074,6 +1183,41 @@ setInterval(async () => { | @@ -1074,6 +1183,41 @@ setInterval(async () => { | ||
1074 | 1183 | ||
1075 | } | 1184 | } |
1076 | 1185 | ||
1186 | + getButton1DepartOnhold(valueN) { | ||
1187 | + console.log(valueN); | ||
1188 | + | ||
1189 | + if (this.Show1DepartOnhold.length === 0) { | ||
1190 | + return this.Show1DepartOnhold; | ||
1191 | + } | ||
1192 | + | ||
1193 | + const resultArray = []; | ||
1194 | + for (const item of this.Show1DepartOnhold) { | ||
1195 | + // console.log('item: ', item); | ||
1196 | + | ||
1197 | + let st = ''; | ||
1198 | + | ||
1199 | + if (item['department']) { | ||
1200 | + st = item['department'].toLowerCase(); | ||
1201 | + } | ||
1202 | + | ||
1203 | + const string2 = valueN.toLowerCase(); | ||
1204 | + if (st.startsWith(string2)) { | ||
1205 | + console.log(st); | ||
1206 | + resultArray.push(item); | ||
1207 | + } | ||
1208 | + | ||
1209 | + } | ||
1210 | + if (resultArray.length === 0) { | ||
1211 | + if (valueN !== '') { | ||
1212 | + this.showSecret2 = true; | ||
1213 | + } | ||
1214 | + } else if (resultArray.length > 0) { | ||
1215 | + this.showSecret2 = false; | ||
1216 | + } | ||
1217 | + this.resultDataOnHold = resultArray; | ||
1218 | + | ||
1219 | + } | ||
1220 | + | ||
1077 | getButton2(valueN) { | 1221 | getButton2(valueN) { |
1078 | console.log(valueN); | 1222 | console.log(valueN); |
1079 | 1223 | ||
@@ -1086,7 +1230,6 @@ setInterval(async () => { | @@ -1086,7 +1230,6 @@ setInterval(async () => { | ||
1086 | // console.log('item: ', item); | 1230 | // console.log('item: ', item); |
1087 | 1231 | ||
1088 | let st = ''; | 1232 | let st = ''; |
1089 | - // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ; | ||
1090 | if (item['type']) { | 1233 | if (item['type']) { |
1091 | st = item['type'].toLowerCase(); | 1234 | st = item['type'].toLowerCase(); |
1092 | } | 1235 | } |
@@ -1115,7 +1258,6 @@ setInterval(async () => { | @@ -1115,7 +1258,6 @@ setInterval(async () => { | ||
1115 | // console.log('item: ', item); | 1258 | // console.log('item: ', item); |
1116 | 1259 | ||
1117 | let st = ''; | 1260 | let st = ''; |
1118 | - // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ; | ||
1119 | if (item['type']) { | 1261 | if (item['type']) { |
1120 | st = item['type'].toLowerCase(); | 1262 | st = item['type'].toLowerCase(); |
1121 | } | 1263 | } |
@@ -1143,7 +1285,6 @@ setInterval(async () => { | @@ -1143,7 +1285,6 @@ setInterval(async () => { | ||
1143 | // console.log('item: ', item); | 1285 | // console.log('item: ', item); |
1144 | 1286 | ||
1145 | let st = ''; | 1287 | let st = ''; |
1146 | - // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ; | ||
1147 | if (item['type']) { | 1288 | if (item['type']) { |
1148 | st = item['type'].toLowerCase(); | 1289 | st = item['type'].toLowerCase(); |
1149 | } | 1290 | } |
@@ -1172,7 +1313,6 @@ setInterval(async () => { | @@ -1172,7 +1313,6 @@ setInterval(async () => { | ||
1172 | // console.log('item: ', item); | 1313 | // console.log('item: ', item); |
1173 | 1314 | ||
1174 | let st = ''; | 1315 | let st = ''; |
1175 | - // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ; | ||
1176 | if (item['type']) { | 1316 | if (item['type']) { |
1177 | st = item['type'].toLowerCase(); | 1317 | st = item['type'].toLowerCase(); |
1178 | } | 1318 | } |
@@ -1200,7 +1340,6 @@ setInterval(async () => { | @@ -1200,7 +1340,6 @@ setInterval(async () => { | ||
1200 | // console.log('item: ', item); | 1340 | // console.log('item: ', item); |
1201 | 1341 | ||
1202 | let st = ''; | 1342 | let st = ''; |
1203 | - // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ; | ||
1204 | if (item['type']) { | 1343 | if (item['type']) { |
1205 | st = item['type'].toLowerCase(); | 1344 | st = item['type'].toLowerCase(); |
1206 | } | 1345 | } |
@@ -1229,7 +1368,6 @@ setInterval(async () => { | @@ -1229,7 +1368,6 @@ setInterval(async () => { | ||
1229 | // console.log('item: ', item); | 1368 | // console.log('item: ', item); |
1230 | 1369 | ||
1231 | let st = ''; | 1370 | let st = ''; |
1232 | - // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ; | ||
1233 | if (item['type']) { | 1371 | if (item['type']) { |
1234 | st = item['type'].toLowerCase(); | 1372 | st = item['type'].toLowerCase(); |
1235 | } | 1373 | } |
@@ -1257,7 +1395,6 @@ setInterval(async () => { | @@ -1257,7 +1395,6 @@ setInterval(async () => { | ||
1257 | // console.log('item: ', item); | 1395 | // console.log('item: ', item); |
1258 | 1396 | ||
1259 | let st = ''; | 1397 | let st = ''; |
1260 | - // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ; | ||
1261 | if (item['type']) { | 1398 | if (item['type']) { |
1262 | st = item['type'].toLowerCase(); | 1399 | st = item['type'].toLowerCase(); |
1263 | } | 1400 | } |
@@ -1273,7 +1410,7 @@ setInterval(async () => { | @@ -1273,7 +1410,7 @@ setInterval(async () => { | ||
1273 | this.resultData5 = resultArray; | 1410 | this.resultData5 = resultArray; |
1274 | } | 1411 | } |
1275 | 1412 | ||
1276 | - /* buttondataOnhold1 */ | 1413 | + /* buttondataOnhold5 */ |
1277 | getButton5Onhold(valueN) { | 1414 | getButton5Onhold(valueN) { |
1278 | console.log(valueN); | 1415 | console.log(valueN); |
1279 | 1416 | ||
@@ -1286,7 +1423,6 @@ setInterval(async () => { | @@ -1286,7 +1423,6 @@ setInterval(async () => { | ||
1286 | // console.log('item: ', item); | 1423 | // console.log('item: ', item); |
1287 | 1424 | ||
1288 | let st = ''; | 1425 | let st = ''; |
1289 | - // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ; | ||
1290 | if (item['type']) { | 1426 | if (item['type']) { |
1291 | st = item['type'].toLowerCase(); | 1427 | st = item['type'].toLowerCase(); |
1292 | } | 1428 | } |
@@ -1314,7 +1450,6 @@ setInterval(async () => { | @@ -1314,7 +1450,6 @@ setInterval(async () => { | ||
1314 | // console.log('item: ', item); | 1450 | // console.log('item: ', item); |
1315 | 1451 | ||
1316 | let st = ''; | 1452 | let st = ''; |
1317 | - // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ; | ||
1318 | if (item['type']) { | 1453 | if (item['type']) { |
1319 | st = item['type'].toLowerCase(); | 1454 | st = item['type'].toLowerCase(); |
1320 | } | 1455 | } |
@@ -1349,7 +1484,7 @@ setInterval(async () => { | @@ -1349,7 +1484,7 @@ setInterval(async () => { | ||
1349 | // console.log('item: ', item); | 1484 | // console.log('item: ', item); |
1350 | 1485 | ||
1351 | let st = ''; | 1486 | let st = ''; |
1352 | - // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ; | 1487 | + |
1353 | if (item['type']) { | 1488 | if (item['type']) { |
1354 | st = item['type'].toLowerCase(); | 1489 | st = item['type'].toLowerCase(); |
1355 | } | 1490 | } |
@@ -1377,7 +1512,7 @@ setInterval(async () => { | @@ -1377,7 +1512,7 @@ setInterval(async () => { | ||
1377 | // console.log('item: ', item); | 1512 | // console.log('item: ', item); |
1378 | 1513 | ||
1379 | let st = ''; | 1514 | let st = ''; |
1380 | - // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ; | 1515 | + |
1381 | if (item['type']) { | 1516 | if (item['type']) { |
1382 | st = item['type'].toLowerCase(); | 1517 | st = item['type'].toLowerCase(); |
1383 | } | 1518 | } |
@@ -1412,7 +1547,7 @@ setInterval(async () => { | @@ -1412,7 +1547,7 @@ setInterval(async () => { | ||
1412 | // console.log('item: ', item); | 1547 | // console.log('item: ', item); |
1413 | 1548 | ||
1414 | let st = ''; | 1549 | let st = ''; |
1415 | - // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ; | 1550 | + |
1416 | if (item['type']) { | 1551 | if (item['type']) { |
1417 | st = item['type'].toLowerCase(); | 1552 | st = item['type'].toLowerCase(); |
1418 | } | 1553 | } |
@@ -1447,7 +1582,7 @@ setInterval(async () => { | @@ -1447,7 +1582,7 @@ setInterval(async () => { | ||
1447 | // console.log('item: ', item); | 1582 | // console.log('item: ', item); |
1448 | 1583 | ||
1449 | let st = ''; | 1584 | let st = ''; |
1450 | - // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ; | 1585 | + |
1451 | if (item['type']) { | 1586 | if (item['type']) { |
1452 | st = item['type'].toLowerCase(); | 1587 | st = item['type'].toLowerCase(); |
1453 | } | 1588 | } |
@@ -1482,7 +1617,7 @@ setInterval(async () => { | @@ -1482,7 +1617,7 @@ setInterval(async () => { | ||
1482 | // console.log('item: ', item); | 1617 | // console.log('item: ', item); |
1483 | 1618 | ||
1484 | let st = ''; | 1619 | let st = ''; |
1485 | - // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ; | 1620 | + |
1486 | if (item['type']) { | 1621 | if (item['type']) { |
1487 | st = item['type'].toLowerCase(); | 1622 | st = item['type'].toLowerCase(); |
1488 | } | 1623 | } |
@@ -1556,7 +1691,7 @@ setInterval(async () => { | @@ -1556,7 +1691,7 @@ setInterval(async () => { | ||
1556 | // console.log('item: ', item); | 1691 | // console.log('item: ', item); |
1557 | 1692 | ||
1558 | let st = ''; | 1693 | let st = ''; |
1559 | - // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ; | 1694 | + |
1560 | if (item['type']) { | 1695 | if (item['type']) { |
1561 | st = item['type'].toLowerCase(); | 1696 | st = item['type'].toLowerCase(); |
1562 | } | 1697 | } |
@@ -1965,7 +2100,7 @@ setInterval(async () => { | @@ -1965,7 +2100,7 @@ setInterval(async () => { | ||
1965 | for (const i in this.resultData8) { | 2100 | for (const i in this.resultData8) { |
1966 | this.resultData8[i].link = this._common.decodeURI(this.resultData8[i].link); | 2101 | this.resultData8[i].link = this._common.decodeURI(this.resultData8[i].link); |
1967 | this.resultData8[i].birth_date = this._common.convertDate(this.resultData8[i].birth_date); | 2102 | this.resultData8[i].birth_date = this._common.convertDate(this.resultData8[i].birth_date); |
1968 | - this.Show7.push(this.resultData8[i]); | 2103 | + this.Show8.push(this.resultData8[i]); |
1969 | } | 2104 | } |
1970 | } else { | 2105 | } else { |
1971 | this.resultData8 = []; | 2106 | this.resultData8 = []; |