Commit 37ec6be645255dda7672b2f63ab8611074ec003d
1 parent
b4e2bc6d
Exists in
master
เพิ่ม api department ใน 3 หน้า 1.หน้าติดตั้ง 2.หน้า after 3.หน้า follow
Showing
3 changed files
with
163 additions
and
72 deletions
Show diff stats
src/app/dashboard/dashboard.component.html
| 1 | <div class="portlet-body"> | 1 | <div class="portlet-body"> |
| 2 | <div class="tabbable-custom nav-justified"> | 2 | <div class="tabbable-custom nav-justified"> |
| 3 | <ul class="nav nav-tabs"> | 3 | <ul class="nav nav-tabs"> |
| 4 | - <li class="sbold font"> | ||
| 5 | - <a href="#tab1" data-toggle="tab" aria-expanded="false">ติดตั้ง | 4 | + <li class="active sbold font"> |
| 5 | + <a href="#tab1" data-toggle="tab" aria-expanded="true">ติดตั้ง | ||
| 6 | <span class="badge"> {{resultNum}} </span> | 6 | <span class="badge"> {{resultNum}} </span> |
| 7 | </a> | 7 | </a> |
| 8 | </li> | 8 | </li> |
| @@ -41,8 +41,8 @@ | @@ -41,8 +41,8 @@ | ||
| 41 | <span class="badge"> {{resultNum8}} </span> | 41 | <span class="badge"> {{resultNum8}} </span> |
| 42 | </a> | 42 | </a> |
| 43 | </li> | 43 | </li> |
| 44 | - <li class="active sbold"> | ||
| 45 | - <a href="#tab9" data-toggle="tab" aria-expanded="true">Follow | 44 | + <li class="sbold"> |
| 45 | + <a href="#tab9" data-toggle="tab" aria-expanded="false">Follow | ||
| 46 | <span class="badge"> {{resultNum9}} </span> | 46 | <span class="badge"> {{resultNum9}} </span> |
| 47 | </a> | 47 | </a> |
| 48 | </li> | 48 | </li> |
| @@ -53,7 +53,7 @@ | @@ -53,7 +53,7 @@ | ||
| 53 | </li> --> | 53 | </li> --> |
| 54 | </ul> | 54 | </ul> |
| 55 | <div class="tab-content"> | 55 | <div class="tab-content"> |
| 56 | - <div class="panel tab-pane " id="tab1"> | 56 | + <div class="panel tab-pane active" id="tab1"> |
| 57 | <div class="caption"> | 57 | <div class="caption"> |
| 58 | <h1 class="icon-bubble font-green-sharp"> | 58 | <h1 class="icon-bubble font-green-sharp"> |
| 59 | <span class="caption-subject font-green-sharp sbold font"> Active</span> | 59 | <span class="caption-subject font-green-sharp sbold font"> Active</span> |
| @@ -87,7 +87,7 @@ | @@ -87,7 +87,7 @@ | ||
| 87 | <div class="number" style=" color: black; display: block; text-align: right; margin-top: -7px;"> | 87 | <div class="number" style=" color: black; display: block; text-align: right; margin-top: -7px;"> |
| 88 | <span data-counter="counterup" data-value="">{{item.custgroupName}}</span> | 88 | <span data-counter="counterup" data-value="">{{item.custgroupName}}</span> |
| 89 | </div> | 89 | </div> |
| 90 | - <div class="desc" style=" color: black;">{{item.team}}</div> | 90 | + <div class="desc" style=" color: black;">{{item.team}} ({{item.department}})</div> |
| 91 | <br> | 91 | <br> |
| 92 | <!-- <div class="desc" style="text-align: left; text-align: bottom; color: black;">{{(item.COMMENT > 20)? | (item.COMMENT | slice:0:20) + '....':(item.COMMENT)}}</div> --> | 92 | <!-- <div class="desc" style="text-align: left; text-align: bottom; color: black;">{{(item.COMMENT > 20)? | (item.COMMENT | slice:0:20) + '....':(item.COMMENT)}}</div> --> |
| 93 | </div> | 93 | </div> |
| @@ -142,7 +142,7 @@ | @@ -142,7 +142,7 @@ | ||
| 142 | <div class="number" style=" color: black; display: block; text-align: right; margin-top: -7px;"> | 142 | <div class="number" style=" color: black; display: block; text-align: right; margin-top: -7px;"> |
| 143 | <span data-counter="counterup" data-value="">{{item.custgroupName}}</span> | 143 | <span data-counter="counterup" data-value="">{{item.custgroupName}}</span> |
| 144 | </div> | 144 | </div> |
| 145 | - <div class="desc" style=" color: black;">{{item.team}}</div> | 145 | + <div class="desc" style=" color: black;">{{item.team}} ({{item.department}})</div> |
| 146 | <br> | 146 | <br> |
| 147 | <!-- <div class="desc" style="text-align: left; text-align: bottom; color: black;">{{(item.COMMENT > 20)? | (item.COMMENT | slice:0:20) + '....':(item.COMMENT)}}</div> --> | 147 | <!-- <div class="desc" style="text-align: left; text-align: bottom; color: black;">{{(item.COMMENT > 20)? | (item.COMMENT | slice:0:20) + '....':(item.COMMENT)}}</div> --> |
| 148 | </div> | 148 | </div> |
| @@ -711,8 +711,9 @@ | @@ -711,8 +711,9 @@ | ||
| 711 | </div> | 711 | </div> |
| 712 | <br> | 712 | <br> |
| 713 | <br> | 713 | <br> |
| 714 | - <button type="button" class="btn btn-circle button " *ngFor="let name of ButtonValue" (click)="getButton7(name.valueN);getButton7Onhold(name.valueN);" | ||
| 715 | - style="margin-left: 5px; margin-top: 2px;">{{ name.name }}</button> | 714 | + <button type="button" class="btn btn-circle button" *ngFor="let name of ButtonValue" (click)="getButton7(name.valueN);getButton7Onhold(name.valueN);" |
| 715 | + style="margin-left: 5px; margin-top: 10px;"><span class="badge2" [hidden]="!name.num1" style="float: right; position: absolute; margin-top: -15px; margin-left: 19px;"> {{ name.num1 }} </span> {{ name.name }} | ||
| 716 | + </button> | ||
| 716 | <hr> | 717 | <hr> |
| 717 | <div *ngIf="showSecret1"> | 718 | <div *ngIf="showSecret1"> |
| 718 | <p style="text-align: left; font-size: 30px;">0 Tricket</p> | 719 | <p style="text-align: left; font-size: 30px;">0 Tricket</p> |
| @@ -737,7 +738,7 @@ | @@ -737,7 +738,7 @@ | ||
| 737 | <div class="number" style=" color: black; display: block; text-align: right; margin-top: -7px;"> | 738 | <div class="number" style=" color: black; display: block; text-align: right; margin-top: -7px;"> |
| 738 | <span data-counter="counterup" data-value="">{{item.custgroupName}}</span> | 739 | <span data-counter="counterup" data-value="">{{item.custgroupName}}</span> |
| 739 | </div> | 740 | </div> |
| 740 | - <div class="desc" style=" color: black;">{{item.team}}</div> | 741 | + <div class="desc" style=" color: black;">{{item.team}} ({{item.department}})</div> |
| 741 | <br> | 742 | <br> |
| 742 | <!-- <div class="desc" style="text-align: left; text-align: bottom; color: black;">{{(item.COMMENT > 20)? | (item.COMMENT | slice:0:20) + '....':(item.COMMENT)}}</div> --> | 743 | <!-- <div class="desc" style="text-align: left; text-align: bottom; color: black;">{{(item.COMMENT > 20)? | (item.COMMENT | slice:0:20) + '....':(item.COMMENT)}}</div> --> |
| 743 | </div> | 744 | </div> |
| @@ -797,7 +798,7 @@ | @@ -797,7 +798,7 @@ | ||
| 797 | <div class="number" style=" color: black; display: block; text-align: right; margin-top: -7px;"> | 798 | <div class="number" style=" color: black; display: block; text-align: right; margin-top: -7px;"> |
| 798 | <span data-counter="counterup" data-value="">{{item.custgroupName}}</span> | 799 | <span data-counter="counterup" data-value="">{{item.custgroupName}}</span> |
| 799 | </div> | 800 | </div> |
| 800 | - <div class="desc" style=" color: black;">{{item.team}}</div> | 801 | + <div class="desc" style=" color: black;">{{item.team}} ({{item.department}})</div> |
| 801 | <br> | 802 | <br> |
| 802 | <!-- <div class="desc" style="text-align: left; text-align: bottom; color: black;">{{(item.COMMENT > 20)? | (item.COMMENT | slice:0:20) + '....':(item.COMMENT)}}</div> --> | 803 | <!-- <div class="desc" style="text-align: left; text-align: bottom; color: black;">{{(item.COMMENT > 20)? | (item.COMMENT | slice:0:20) + '....':(item.COMMENT)}}</div> --> |
| 803 | </div> | 804 | </div> |
| @@ -920,12 +921,11 @@ | @@ -920,12 +921,11 @@ | ||
| 920 | </div> | 921 | </div> |
| 921 | </div> | 922 | </div> |
| 922 | </div> | 923 | </div> |
| 923 | - <div class="panel tab-pane active" id="tab9"> | 924 | + <div class="panel tab-pane" id="tab9"> |
| 924 | <div class="caption"> | 925 | <div class="caption"> |
| 925 | <h1 class="icon-bubble font-green-sharp"> | 926 | <h1 class="icon-bubble font-green-sharp"> |
| 926 | <span class="caption-subject font-green-sharp sbold font"> Active</span> | 927 | <span class="caption-subject font-green-sharp sbold font"> Active</span> |
| 927 | </h1> | 928 | </h1> |
| 928 | - | ||
| 929 | <div class="input-group" style="float: right; margin-top: 11px;"> | 929 | <div class="input-group" style="float: right; margin-top: 11px;"> |
| 930 | <div class="input-icon right"> | 930 | <div class="input-icon right"> |
| 931 | <i class="icon-magnifier"> | 931 | <i class="icon-magnifier"> |
| @@ -935,8 +935,8 @@ | @@ -935,8 +935,8 @@ | ||
| 935 | </div> | 935 | </div> |
| 936 | <br> | 936 | <br> |
| 937 | <br> | 937 | <br> |
| 938 | - <button type="button" class="btn btn-circle button " *ngFor="let name of ButtonValue" (click)="getButton9(name.valueN);getButton9Onhold(name.valueN);" | ||
| 939 | - style="margin-left: 5px; margin-top: 10px;"><span class="badge2" style="float: right; position: absolute; margin-top: -15px; margin-left: 19px;"> {{ name.num }} </span> {{ name.name }} | 938 | + <button type="button" class="btn btn-circle button" *ngFor="let name of ButtonValue" (click)="getButton9(name.valueN);getButton9Onhold(name.valueN);" |
| 939 | + style="margin-left: 5px; margin-top: 10px;"><span class="badge2" [hidden]="!name.num" style="float: right; position: absolute; margin-top: -15px; margin-left: 19px;"> {{ name.num }} </span> {{ name.name }} | ||
| 940 | </button> | 940 | </button> |
| 941 | <!-- <span class="badge"> {{resultNum7}} </span> --> | 941 | <!-- <span class="badge"> {{resultNum7}} </span> --> |
| 942 | <hr> | 942 | <hr> |
| @@ -966,7 +966,7 @@ | @@ -966,7 +966,7 @@ | ||
| 966 | <div class="number" style=" color: black; display: block; text-align: right; margin-top: -7px;"> | 966 | <div class="number" style=" color: black; display: block; text-align: right; margin-top: -7px;"> |
| 967 | <span data-counter="counterup" data-value="">{{item.custgroupName}}</span> | 967 | <span data-counter="counterup" data-value="">{{item.custgroupName}}</span> |
| 968 | </div> | 968 | </div> |
| 969 | - <div class="desc" style=" color: black;">{{item.team}}</div> | 969 | + <div class="desc" style=" color: black;">{{item.team}} ({{item.department}})</div> |
| 970 | <br> | 970 | <br> |
| 971 | <!-- <div class="desc" style="text-align: left; text-align: bottom; color: black;">{{(item.COMMENT > 20)? | (item.COMMENT | slice:0:20) + '....':(item.COMMENT)}}</div> --> | 971 | <!-- <div class="desc" style="text-align: left; text-align: bottom; color: black;">{{(item.COMMENT > 20)? | (item.COMMENT | slice:0:20) + '....':(item.COMMENT)}}</div> --> |
| 972 | </div> | 972 | </div> |
| @@ -1028,7 +1028,7 @@ | @@ -1028,7 +1028,7 @@ | ||
| 1028 | <div class="number" style=" color: black; display: block; text-align: right; margin-top: -7px;"> | 1028 | <div class="number" style=" color: black; display: block; text-align: right; margin-top: -7px;"> |
| 1029 | <span data-counter="counterup" data-value="">{{item.custgroupName}}</span> | 1029 | <span data-counter="counterup" data-value="">{{item.custgroupName}}</span> |
| 1030 | </div> | 1030 | </div> |
| 1031 | - <div class="desc" style=" color: black;">{{item.team}}</div> | 1031 | + <div class="desc" style=" color: black;">{{item.team}} ({{item.department}})</div> |
| 1032 | <br> | 1032 | <br> |
| 1033 | <!-- <div class="desc" style="text-align: left; text-align: bottom; color: black;">{{(item.COMMENT > 20)? | (item.COMMENT | slice:0:20) + '....':(item.COMMENT)}}</div> --> | 1033 | <!-- <div class="desc" style="text-align: left; text-align: bottom; color: black;">{{(item.COMMENT > 20)? | (item.COMMENT | slice:0:20) + '....':(item.COMMENT)}}</div> --> |
| 1034 | </div> | 1034 | </div> |
src/app/dashboard/dashboard.component.ts
| @@ -98,199 +98,233 @@ export class DashboardComponent implements OnInit { | @@ -98,199 +98,233 @@ export class DashboardComponent implements OnInit { | ||
| 98 | id: 33, | 98 | id: 33, |
| 99 | name: 'All', | 99 | name: 'All', |
| 100 | valueN: '', | 100 | valueN: '', |
| 101 | - num : 0 | 101 | + num : 0, |
| 102 | + num1 : 0 | ||
| 102 | }, | 103 | }, |
| 103 | { | 104 | { |
| 104 | id: 1, | 105 | id: 1, |
| 105 | name: 'ACC', | 106 | name: 'ACC', |
| 106 | valueN: 'acc', | 107 | valueN: 'acc', |
| 107 | - num : 0 | 108 | + num : 0, |
| 109 | + num1 : 0 | ||
| 110 | + | ||
| 108 | }, | 111 | }, |
| 109 | { | 112 | { |
| 110 | id: 2, | 113 | id: 2, |
| 111 | name: 'ADE', | 114 | name: 'ADE', |
| 112 | valueN: 'ade', | 115 | valueN: 'ade', |
| 113 | - num : 0 | 116 | + num : 0, |
| 117 | + num1 : 0 | ||
| 114 | }, | 118 | }, |
| 115 | { | 119 | { |
| 116 | id: 3, | 120 | id: 3, |
| 117 | name: 'ADM', | 121 | name: 'ADM', |
| 118 | valueN: 'adm', | 122 | valueN: 'adm', |
| 119 | - num : 0 | 123 | + num : 0, |
| 124 | + num1 : 0 | ||
| 120 | }, | 125 | }, |
| 121 | { | 126 | { |
| 122 | id: 4, | 127 | id: 4, |
| 123 | name: 'APD', | 128 | name: 'APD', |
| 124 | valueN: 'apd', | 129 | valueN: 'apd', |
| 125 | - num : 0 | 130 | + num : 0, |
| 131 | + num1 : 0 | ||
| 126 | }, | 132 | }, |
| 127 | { | 133 | { |
| 128 | id: 5, | 134 | id: 5, |
| 129 | name: 'BNW', | 135 | name: 'BNW', |
| 130 | valueN: 'bnw', | 136 | valueN: 'bnw', |
| 131 | - num : 0 | 137 | + num : 0, |
| 138 | + num1 : 0 | ||
| 132 | }, | 139 | }, |
| 133 | { | 140 | { |
| 134 | id: 6, | 141 | id: 6, |
| 135 | name: 'CRS', | 142 | name: 'CRS', |
| 136 | valueN: 'crs', | 143 | valueN: 'crs', |
| 137 | - num : 0 | 144 | + num : 0, |
| 145 | + num1 : 0 | ||
| 138 | }, | 146 | }, |
| 139 | { | 147 | { |
| 140 | id: 7, | 148 | id: 7, |
| 141 | name: 'CUS', | 149 | name: 'CUS', |
| 142 | valueN: 'cus', | 150 | valueN: 'cus', |
| 143 | - num : 0 | 151 | + num : 0, |
| 152 | + num1 : 0 | ||
| 144 | }, | 153 | }, |
| 145 | { | 154 | { |
| 146 | id: 8, | 155 | id: 8, |
| 147 | name: 'DVR', | 156 | name: 'DVR', |
| 148 | valueN: 'dvr', | 157 | valueN: 'dvr', |
| 149 | - num : 0 | 158 | + num : 0, |
| 159 | + num1 : 0 | ||
| 150 | }, | 160 | }, |
| 151 | { | 161 | { |
| 152 | id: 9, | 162 | id: 9, |
| 153 | name: 'ETC', | 163 | name: 'ETC', |
| 154 | valueN: 'etc', | 164 | valueN: 'etc', |
| 155 | - num : 0 | 165 | + num : 0, |
| 166 | + num1 : 0 | ||
| 156 | }, | 167 | }, |
| 157 | { | 168 | { |
| 158 | id: 10, | 169 | id: 10, |
| 159 | name: 'HWE', | 170 | name: 'HWE', |
| 160 | valueN: 'hwe', | 171 | valueN: 'hwe', |
| 161 | - num : 0 | 172 | + num : 0, |
| 173 | + num1 : 0 | ||
| 162 | }, | 174 | }, |
| 163 | { | 175 | { |
| 164 | id: 11, | 176 | id: 11, |
| 165 | name: 'ITS', | 177 | name: 'ITS', |
| 166 | valueN: 'its', | 178 | valueN: 'its', |
| 167 | - num : 0 | 179 | + num : 0, |
| 180 | + num1 : 0 | ||
| 168 | }, | 181 | }, |
| 169 | { | 182 | { |
| 170 | id: 12, | 183 | id: 12, |
| 171 | name: 'LWS', | 184 | name: 'LWS', |
| 172 | valueN: 'lws', | 185 | valueN: 'lws', |
| 173 | - num : 0 | 186 | + num : 0, |
| 187 | + num1 : 0 | ||
| 174 | }, | 188 | }, |
| 175 | { | 189 | { |
| 176 | id: 13, | 190 | id: 13, |
| 177 | name: 'NDS', | 191 | name: 'NDS', |
| 178 | valueN: 'nds', | 192 | valueN: 'nds', |
| 179 | - num : 0 | 193 | + num : 0, |
| 194 | + num1 : 0 | ||
| 180 | }, | 195 | }, |
| 181 | { | 196 | { |
| 182 | id: 14, | 197 | id: 14, |
| 183 | name: 'NED', | 198 | name: 'NED', |
| 184 | valueN: 'ned', | 199 | valueN: 'ned', |
| 185 | - num : 0 | 200 | + num : 0, |
| 201 | + num1 : 0 | ||
| 186 | }, | 202 | }, |
| 187 | { | 203 | { |
| 188 | id: 15, | 204 | id: 15, |
| 189 | name: 'NES', | 205 | name: 'NES', |
| 190 | valueN: 'nes', | 206 | valueN: 'nes', |
| 191 | - num : 0 | 207 | + num : 0, |
| 208 | + num1 : 0 | ||
| 192 | }, | 209 | }, |
| 193 | { | 210 | { |
| 194 | id: 16, | 211 | id: 16, |
| 195 | name: 'NET', | 212 | name: 'NET', |
| 196 | valueN: 'net', | 213 | valueN: 'net', |
| 197 | - num : 0 | 214 | + num : 0, |
| 215 | + num1 : 0 | ||
| 198 | }, | 216 | }, |
| 199 | { | 217 | { |
| 200 | id: 17, | 218 | id: 17, |
| 201 | name: 'NEW', | 219 | name: 'NEW', |
| 202 | valueN: 'new', | 220 | valueN: 'new', |
| 203 | - num : 0 | 221 | + num : 0, |
| 222 | + num1 : 0 | ||
| 204 | }, | 223 | }, |
| 205 | { | 224 | { |
| 206 | id: 18, | 225 | id: 18, |
| 207 | name: 'OSC', | 226 | name: 'OSC', |
| 208 | valueN: 'osc', | 227 | valueN: 'osc', |
| 209 | - num : 0 | 228 | + num : 0, |
| 229 | + num1 : 0 | ||
| 210 | }, | 230 | }, |
| 211 | { | 231 | { |
| 212 | id: 19, | 232 | id: 19, |
| 213 | name: 'PM', | 233 | name: 'PM', |
| 214 | valueN: 'pm ', | 234 | valueN: 'pm ', |
| 215 | - num : 0 | 235 | + num : 0, |
| 236 | + num1 : 0 | ||
| 216 | }, | 237 | }, |
| 217 | { | 238 | { |
| 218 | id: 20, | 239 | id: 20, |
| 219 | name: 'PRS', | 240 | name: 'PRS', |
| 220 | valueN: 'prs', | 241 | valueN: 'prs', |
| 221 | - num : 0 | 242 | + num : 0, |
| 243 | + num1 : 0 | ||
| 222 | }, | 244 | }, |
| 223 | { | 245 | { |
| 224 | id: 21, | 246 | id: 21, |
| 225 | name: 'RND', | 247 | name: 'RND', |
| 226 | valueN: 'rnd', | 248 | valueN: 'rnd', |
| 227 | - num : 0 | 249 | + num : 0, |
| 250 | + num1 : 0 | ||
| 228 | }, | 251 | }, |
| 229 | { | 252 | { |
| 230 | id: 22, | 253 | id: 22, |
| 231 | name: 'SDE', | 254 | name: 'SDE', |
| 232 | valueN: 'sde', | 255 | valueN: 'sde', |
| 233 | - num : 0 | 256 | + num : 0, |
| 257 | + num1 : 0 | ||
| 234 | }, | 258 | }, |
| 235 | { | 259 | { |
| 236 | id: 23, | 260 | id: 23, |
| 237 | name: 'SDN', | 261 | name: 'SDN', |
| 238 | valueN: 'sdn', | 262 | valueN: 'sdn', |
| 239 | - num : 0 | 263 | + num : 0, |
| 264 | + num1 : 0 | ||
| 240 | }, | 265 | }, |
| 241 | { | 266 | { |
| 242 | id: 24, | 267 | id: 24, |
| 243 | name: 'SET', | 268 | name: 'SET', |
| 244 | valueN: 'set', | 269 | valueN: 'set', |
| 245 | - num : 0 | 270 | + num : 0, |
| 271 | + num1 : 0 | ||
| 246 | }, | 272 | }, |
| 247 | { | 273 | { |
| 248 | id: 25, | 274 | id: 25, |
| 249 | name: 'SEV', | 275 | name: 'SEV', |
| 250 | valueN: 'sev', | 276 | valueN: 'sev', |
| 251 | - num : 0 | 277 | + num : 0, |
| 278 | + num1 : 0 | ||
| 252 | }, | 279 | }, |
| 253 | { | 280 | { |
| 254 | id: 26, | 281 | id: 26, |
| 255 | name: 'SID', | 282 | name: 'SID', |
| 256 | valueN: 'sid', | 283 | valueN: 'sid', |
| 257 | - num : 0 | 284 | + num : 0, |
| 285 | + num1 : 0 | ||
| 258 | }, | 286 | }, |
| 259 | { | 287 | { |
| 260 | id: 27, | 288 | id: 27, |
| 261 | name: 'SSH', | 289 | name: 'SSH', |
| 262 | valueN: 'ssh', | 290 | valueN: 'ssh', |
| 263 | - num : 0 | 291 | + num : 0, |
| 292 | + num1 : 0 | ||
| 264 | }, | 293 | }, |
| 265 | { | 294 | { |
| 266 | id: 28, | 295 | id: 28, |
| 267 | name: 'SUV', | 296 | name: 'SUV', |
| 268 | valueN: 'suv', | 297 | valueN: 'suv', |
| 269 | - num : 0 | 298 | + num : 0, |
| 299 | + num1 : 0 | ||
| 270 | }, | 300 | }, |
| 271 | { | 301 | { |
| 272 | id: 29, | 302 | id: 29, |
| 273 | name: 'SYS', | 303 | name: 'SYS', |
| 274 | valueN: 'sys', | 304 | valueN: 'sys', |
| 275 | - num : 0 | 305 | + num : 0, |
| 306 | + num1 : 0 | ||
| 276 | }, | 307 | }, |
| 277 | { | 308 | { |
| 278 | id: 30, | 309 | id: 30, |
| 279 | name: 'TST', | 310 | name: 'TST', |
| 280 | valueN: 'tst', | 311 | valueN: 'tst', |
| 281 | - num : 0 | 312 | + num : 0, |
| 313 | + num1 : 0 | ||
| 282 | }, | 314 | }, |
| 283 | { | 315 | { |
| 284 | id: 31, | 316 | id: 31, |
| 285 | name: 'UDI', | 317 | name: 'UDI', |
| 286 | valueN: 'udi', | 318 | valueN: 'udi', |
| 287 | - num : 0 | 319 | + num : 0, |
| 320 | + num1 : 0 | ||
| 288 | }, | 321 | }, |
| 289 | { | 322 | { |
| 290 | id: 32, | 323 | id: 32, |
| 291 | name: 'WEB', | 324 | name: 'WEB', |
| 292 | valueN: 'web', | 325 | valueN: 'web', |
| 293 | - num : 0 | 326 | + num : 0, |
| 327 | + num1 : 0 | ||
| 294 | } | 328 | } |
| 295 | ]; | 329 | ]; |
| 296 | 330 | ||
| @@ -301,9 +335,11 @@ export class DashboardComponent implements OnInit { | @@ -301,9 +335,11 @@ export class DashboardComponent implements OnInit { | ||
| 301 | // summary:any = {}; | 335 | // summary:any = {}; |
| 302 | // summary = {}; | 336 | // summary = {}; |
| 303 | Type9: any = []; | 337 | Type9: any = []; |
| 338 | + Type7: any = []; | ||
| 304 | NumType9: number = 0; | 339 | NumType9: number = 0; |
| 305 | ShowType: any = []; | 340 | ShowType: any = []; |
| 306 | sum: any = []; | 341 | sum: any = []; |
| 342 | + sum1: any = []; | ||
| 307 | 343 | ||
| 308 | // onToggleDetails() { | 344 | // onToggleDetails() { |
| 309 | // // this.showSecret = !this.showSecret; | 345 | // // this.showSecret = !this.showSecret; |
| @@ -318,7 +354,7 @@ export class DashboardComponent implements OnInit { | @@ -318,7 +354,7 @@ export class DashboardComponent implements OnInit { | ||
| 318 | try { | 354 | try { |
| 319 | const data = { | 355 | const data = { |
| 320 | // tslint:disable-next-line:max-line-length | 356 | // tslint:disable-next-line:max-line-length |
| 321 | - "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) = '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", | 357 | + "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 , vtiger_users.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 ", |
| 322 | "params": ["vtiger_crmentity"] | 358 | "params": ["vtiger_crmentity"] |
| 323 | }; | 359 | }; |
| 324 | let response = await this._apiService.post('dynamic', data); | 360 | let response = await this._apiService.post('dynamic', data); |
| @@ -351,7 +387,7 @@ export class DashboardComponent implements OnInit { | @@ -351,7 +387,7 @@ export class DashboardComponent implements OnInit { | ||
| 351 | try { | 387 | try { |
| 352 | const dataOnHold = { | 388 | const dataOnHold = { |
| 353 | // tslint:disable-next-line:max-line-length | 389 | // tslint:disable-next-line:max-line-length |
| 354 | - "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) = 'SET (ติดตั้ง)' AND LCASE(vtiger_troubletickets. STATUS) IN('Wait For Customer')) GROUP BY vtiger_troubletickets.ticketid ORDER BY vtiger_crmentity.createdtime ASC LIMIT 0 , 100", | 390 | + "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 , vtiger_users.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) IN('Wait For Customer')) GROUP BY vtiger_troubletickets.ticketid ORDER BY vtiger_crmentity.createdtime ASC ", |
| 355 | "params": ["vtiger_crmentity"] | 391 | "params": ["vtiger_crmentity"] |
| 356 | }; | 392 | }; |
| 357 | let response = await this._apiService.post('dynamic', dataOnHold); | 393 | let response = await this._apiService.post('dynamic', dataOnHold); |
| @@ -684,27 +720,79 @@ export class DashboardComponent implements OnInit { | @@ -684,27 +720,79 @@ export class DashboardComponent implements OnInit { | ||
| 684 | try { | 720 | try { |
| 685 | const data7 = { | 721 | const data7 = { |
| 686 | // tslint:disable-next-line:max-line-length | 722 | // tslint:disable-next-line:max-line-length |
| 687 | - "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 ", | 723 | + "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 ,( unix_timestamp(now()) - unix_timestamp(vtiger_crmentity.modifiedtime)) / 86400 AS days2 , 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 , vtiger_users.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 ", |
| 688 | "params": ["vtiger_crmentity"] | 724 | "params": ["vtiger_crmentity"] |
| 689 | }; | 725 | }; |
| 690 | const response = await this._apiService.post('dynamic', data7); | 726 | const response = await this._apiService.post('dynamic', data7); |
| 691 | if (response !== null) { | 727 | if (response !== null) { |
| 728 | + const t7 = []; | ||
| 729 | + const obj = { | ||
| 730 | + name: '', | ||
| 731 | + value: 0 | ||
| 732 | + }; | ||
| 733 | + let flag = false; | ||
| 692 | this.resultData7 = response; | 734 | this.resultData7 = response; |
| 693 | this.resultData7.link = decodeURIComponent(decodeURIComponent(this.resultData7.link)); | 735 | this.resultData7.link = decodeURIComponent(decodeURIComponent(this.resultData7.link)); |
| 694 | - console.log('link: ', this.resultData6.link); | 736 | + console.log('link: ', this.resultData7.link); |
| 695 | // tslint:disable-next-line:forin | 737 | // tslint:disable-next-line:forin |
| 696 | - for (const i in this.resultData7) { | ||
| 697 | - this.resultData7[i].link = this._common.decodeURI(this.resultData7[i].link); | ||
| 698 | - this.resultData7[i].birth_date = this._common.convertDate(this.resultData7[i].birth_date); | 738 | + this.resultData7 = this.resultData7.map(r => { |
| 739 | + console.log(r); | ||
| 740 | + // t7: r.type | ||
| 741 | + r.link = this._common.decodeURI(r.link); | ||
| 742 | + r.birth_date = this._common.convertDate(r.birth_date); | ||
| 699 | this.resultNum7 = this.resultData7.length; | 743 | this.resultNum7 = this.resultData7.length; |
| 700 | - this.Show7.push(this.resultData7[i]); | 744 | + this.Show7.push(r); |
| 745 | + this.Type7.push(r.type); | ||
| 746 | + t7.push(r.type); | ||
| 747 | + r.t7 = t7; | ||
| 748 | + return r; | ||
| 749 | + }); | ||
| 750 | + | ||
| 751 | + for (let i = 0; i < t7.length; i++) { | ||
| 752 | + // tslint:disable-next-line:no-shadowed-variable | ||
| 753 | + const obj = { | ||
| 754 | + name: '', | ||
| 755 | + value: 0 | ||
| 756 | + }; | ||
| 757 | + if (this.sum1.length <= 0) { | ||
| 758 | + obj.name = t7[i].substring(0, 3).toLowerCase(); | ||
| 759 | + obj.value = 1; | ||
| 760 | + this.sum1.push(obj); | ||
| 761 | + } else { | ||
| 762 | + for (let j = 0; j < this.sum1.length; j++) { | ||
| 763 | + if (this.sum1[j].name === t7[i].substring(0, 3).toLowerCase()) { | ||
| 764 | + this.sum1[j].value += 1; | ||
| 765 | + flag = false; | ||
| 766 | + break; | ||
| 767 | + } else { | ||
| 768 | + flag = true; | ||
| 769 | + } | ||
| 770 | + } | ||
| 771 | + if (flag) { | ||
| 772 | + obj.name = t7[i].substring(0, 3).toLowerCase(); | ||
| 773 | + obj.value = 1; | ||
| 774 | + flag = false; | ||
| 775 | + this.sum1.push(obj); | ||
| 776 | + } | ||
| 777 | + } | ||
| 778 | + } | ||
| 779 | + for (let k = 0; k < this.ButtonValue.length; k++) { | ||
| 780 | + for (let o = 0; o < this.sum1.length; o++) { | ||
| 781 | + if (this.ButtonValue[k].valueN === this.sum1[o].name) { | ||
| 782 | + this.ButtonValue[k].num1 = this.sum1[o].value; | ||
| 783 | + this.ButtonValue[0].num1 = this.resultNum7; | ||
| 784 | + } | ||
| 785 | + } | ||
| 701 | } | 786 | } |
| 702 | 787 | ||
| 703 | - // this.Show = Object.assign(this.resultData7); | 788 | + console.log('summ', this.ButtonValue); |
| 789 | + console.log('summ', this.sum1); | ||
| 704 | 790 | ||
| 705 | } else { | 791 | } else { |
| 706 | this.resultData7 = []; | 792 | this.resultData7 = []; |
| 707 | } | 793 | } |
| 794 | + // if(summary){ | ||
| 795 | + // } | ||
| 708 | } catch (error) { | 796 | } catch (error) { |
| 709 | // console.log(error); | 797 | // console.log(error); |
| 710 | } | 798 | } |
| @@ -718,8 +806,8 @@ export class DashboardComponent implements OnInit { | @@ -718,8 +806,8 @@ export class DashboardComponent implements OnInit { | ||
| 718 | try { | 806 | try { |
| 719 | const dataOnHold7 = { | 807 | const dataOnHold7 = { |
| 720 | // tslint:disable-next-line:max-line-length | 808 | // tslint:disable-next-line:max-line-length |
| 721 | - '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', | ||
| 722 | - 'params': ['vtiger_crmentity'] | 809 | + "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 , 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 , vtiger_users.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) IN('Wait For Customer')) GROUP BY vtiger_troubletickets.ticketid ORDER BY vtiger_crmentity.createdtime ASC ", |
| 810 | + "params": ["vtiger_crmentity"] | ||
| 723 | }; | 811 | }; |
| 724 | const response = await this._apiService.post('dynamic', dataOnHold7); | 812 | const response = await this._apiService.post('dynamic', dataOnHold7); |
| 725 | if (response !== null) { | 813 | if (response !== null) { |
| @@ -810,7 +898,7 @@ setInterval(async () => { | @@ -810,7 +898,7 @@ setInterval(async () => { | ||
| 810 | try { | 898 | try { |
| 811 | const data9 = { | 899 | const data9 = { |
| 812 | // tslint:disable-next-line:max-line-length | 900 | // tslint:disable-next-line:max-line-length |
| 813 | - "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 , 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 HAVING days2 > 2 ORDER BY vtiger_crmentity.modifiedtime ASC", | 901 | + "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 , 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 , vtiger_users.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 HAVING days2 > 2 ORDER BY vtiger_crmentity.modifiedtime ASC", |
| 814 | "params": ["vtiger_crmentity"] | 902 | "params": ["vtiger_crmentity"] |
| 815 | }; | 903 | }; |
| 816 | const response = await this._apiService.post('dynamic', data9); | 904 | const response = await this._apiService.post('dynamic', data9); |
| @@ -873,8 +961,7 @@ setInterval(async () => { | @@ -873,8 +961,7 @@ setInterval(async () => { | ||
| 873 | this.ButtonValue[0].num = this.resultNum9; | 961 | this.ButtonValue[0].num = this.resultNum9; |
| 874 | } | 962 | } |
| 875 | } | 963 | } |
| 876 | - | ||
| 877 | - } | 964 | + } |
| 878 | 965 | ||
| 879 | console.log('summ',this.ButtonValue); | 966 | console.log('summ',this.ButtonValue); |
| 880 | console.log('summ',this.sum); | 967 | console.log('summ',this.sum); |
| @@ -898,7 +985,7 @@ setInterval(async () => { | @@ -898,7 +985,7 @@ setInterval(async () => { | ||
| 898 | try { | 985 | try { |
| 899 | const dataOnHold9 = { | 986 | const dataOnHold9 = { |
| 900 | // tslint:disable-next-line:max-line-length | 987 | // tslint:disable-next-line:max-line-length |
| 901 | - "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 , 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 ", | 988 | + "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 , 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 , vtiger_users.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) IN('Wait For Customer')) GROUP BY vtiger_troubletickets.ticketid ORDER BY vtiger_crmentity.createdtime ASC ", |
| 902 | "params": ["vtiger_crmentity"] | 989 | "params": ["vtiger_crmentity"] |
| 903 | }; | 990 | }; |
| 904 | const response = await this._apiService.post('dynamic', dataOnHold9); | 991 | const response = await this._apiService.post('dynamic', dataOnHold9); |
| @@ -925,6 +1012,7 @@ setInterval(async () => { | @@ -925,6 +1012,7 @@ setInterval(async () => { | ||
| 925 | 1012 | ||
| 926 | } | 1013 | } |
| 927 | 1014 | ||
| 1015 | +//////// getbutton //////// | ||
| 928 | getButton1(valueN) { | 1016 | getButton1(valueN) { |
| 929 | // console.log(valueN); | 1017 | // console.log(valueN); |
| 930 | 1018 | ||
| @@ -1498,7 +1586,7 @@ setInterval(async () => { | @@ -1498,7 +1586,7 @@ setInterval(async () => { | ||
| 1498 | try { | 1586 | try { |
| 1499 | const data = { | 1587 | const data = { |
| 1500 | // tslint:disable-next-line:max-line-length | 1588 | // tslint:disable-next-line:max-line-length |
| 1501 | - "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) = '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", | 1589 | + "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 , vtiger_users.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 ", |
| 1502 | "params": ["vtiger_crmentity"] | 1590 | "params": ["vtiger_crmentity"] |
| 1503 | }; | 1591 | }; |
| 1504 | let response = await this._apiService.post('dynamic', data); | 1592 | let response = await this._apiService.post('dynamic', data); |
| @@ -1523,7 +1611,7 @@ setInterval(async () => { | @@ -1523,7 +1611,7 @@ setInterval(async () => { | ||
| 1523 | try { | 1611 | try { |
| 1524 | const dataOnHold = { | 1612 | const dataOnHold = { |
| 1525 | // tslint:disable-next-line:max-line-length | 1613 | // tslint:disable-next-line:max-line-length |
| 1526 | - "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) = 'SET (ติดตั้ง)' AND LCASE(vtiger_troubletickets. STATUS) IN('Wait For Customer')) GROUP BY vtiger_troubletickets.ticketid ORDER BY vtiger_crmentity.createdtime ASC LIMIT 0 , 100", | 1614 | + "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 , 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 , vtiger_users.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) IN('Wait For Customer')) GROUP BY vtiger_troubletickets.ticketid ORDER BY vtiger_crmentity.createdtime ASC ", |
| 1527 | "params": ["vtiger_crmentity"] | 1615 | "params": ["vtiger_crmentity"] |
| 1528 | }; | 1616 | }; |
| 1529 | let response = await this._apiService.post('dynamic', dataOnHold); | 1617 | let response = await this._apiService.post('dynamic', dataOnHold); |
| @@ -1810,7 +1898,7 @@ setInterval(async () => { | @@ -1810,7 +1898,7 @@ setInterval(async () => { | ||
| 1810 | try { | 1898 | try { |
| 1811 | const data7 = { | 1899 | const data7 = { |
| 1812 | // tslint:disable-next-line:max-line-length | 1900 | // tslint:disable-next-line:max-line-length |
| 1813 | - "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 ", | 1901 | + "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 ,( unix_timestamp(now()) - unix_timestamp(vtiger_crmentity.modifiedtime)) / 86400 AS days2 , 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 , vtiger_users.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 ", |
| 1814 | "params": ["vtiger_crmentity"] | 1902 | "params": ["vtiger_crmentity"] |
| 1815 | }; | 1903 | }; |
| 1816 | const response = await this._apiService.post('dynamic', data7); | 1904 | const response = await this._apiService.post('dynamic', data7); |
| @@ -1836,8 +1924,8 @@ setInterval(async () => { | @@ -1836,8 +1924,8 @@ setInterval(async () => { | ||
| 1836 | try { | 1924 | try { |
| 1837 | const dataOnHold7 = { | 1925 | const dataOnHold7 = { |
| 1838 | // tslint:disable-next-line:max-line-length | 1926 | // tslint:disable-next-line:max-line-length |
| 1839 | - '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', | ||
| 1840 | - 'params': ['vtiger_crmentity'] | 1927 | + "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 , 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 , vtiger_users.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) IN('Wait For Customer')) GROUP BY vtiger_troubletickets.ticketid ORDER BY vtiger_crmentity.createdtime ASC ", |
| 1928 | + "params": ["vtiger_crmentity"] | ||
| 1841 | }; | 1929 | }; |
| 1842 | const response = await this._apiService.post('dynamic', dataOnHold7); | 1930 | const response = await this._apiService.post('dynamic', dataOnHold7); |
| 1843 | if (response !== null) { | 1931 | if (response !== null) { |
| @@ -1916,7 +2004,7 @@ setInterval(async () => { | @@ -1916,7 +2004,7 @@ setInterval(async () => { | ||
| 1916 | try { | 2004 | try { |
| 1917 | const data9 = { | 2005 | const data9 = { |
| 1918 | // tslint:disable-next-line:max-line-length | 2006 | // tslint:disable-next-line:max-line-length |
| 1919 | - "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 , 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 HAVING days2 > 2 ORDER BY vtiger_crmentity.modifiedtime ASC", | 2007 | + "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 , 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 , vtiger_users.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 HAVING days2 > 2 ORDER BY vtiger_crmentity.modifiedtime ASC", |
| 1920 | "params": ["vtiger_crmentity"] | 2008 | "params": ["vtiger_crmentity"] |
| 1921 | }; | 2009 | }; |
| 1922 | const response = await this._apiService.post('dynamic', data9); | 2010 | const response = await this._apiService.post('dynamic', data9); |
| @@ -1942,7 +2030,7 @@ setInterval(async () => { | @@ -1942,7 +2030,7 @@ setInterval(async () => { | ||
| 1942 | try { | 2030 | try { |
| 1943 | const dataOnHold9 = { | 2031 | const dataOnHold9 = { |
| 1944 | // tslint:disable-next-line:max-line-length | 2032 | // tslint:disable-next-line:max-line-length |
| 1945 | - "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 , 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 ", | 2033 | + "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 , 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 , vtiger_users.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) IN('Wait For Customer')) GROUP BY vtiger_troubletickets.ticketid ORDER BY vtiger_crmentity.createdtime ASC ", |
| 1946 | "params": ["vtiger_crmentity"] | 2034 | "params": ["vtiger_crmentity"] |
| 1947 | }; | 2035 | }; |
| 1948 | const response = await this._apiService.post('dynamic', dataOnHold9); | 2036 | const response = await this._apiService.post('dynamic', dataOnHold9); |
src/app/dashboard/filter.pipe.ts
| @@ -33,6 +33,9 @@ export class FilterPipe implements PipeTransform { | @@ -33,6 +33,9 @@ export class FilterPipe implements PipeTransform { | ||
| 33 | if (item['type']) { | 33 | if (item['type']) { |
| 34 | st += item['type'].toLowerCase(); | 34 | st += item['type'].toLowerCase(); |
| 35 | } | 35 | } |
| 36 | + if (item['department']) { | ||
| 37 | + st += item['department'].toLowerCase(); | ||
| 38 | + } | ||
| 36 | 39 | ||
| 37 | var string2 = filterString.toLowerCase(); | 40 | var string2 = filterString.toLowerCase(); |
| 38 | if (st.indexOf(string2) > -1) { | 41 | if (st.indexOf(string2) > -1) { |