SourceCode / smartzone-home

Download as
Browse Code ยป

Commit 477eccd4aec15f39ae4859d1145a22a8ff00b1a7

Authored by trainee
1 parent c98368f8
Exists in master

style button

Showing 3 changed files with 304 additions and 41 deletions   Show diff stats
src/app/dashboard/dashboard.component.html
  Diff comments   View file @477eccd
@@ -14,20 +14,30 @@ @@ -14,20 +14,30 @@
14 </a> 14 </a>
15 </li> 15 </li>
16 <li class="sbold"> 16 <li class="sbold">
17 - <a href="#tab2" data-toggle="tab" aria-expanded="false">RND <span class="badge"> {{resultNum2}} </span></a> 17 + <a href="#tab2" data-toggle="tab" aria-expanded="false">RND
  18 + <span class="badge"> {{resultNum2}} </span>
  19 + </a>
18 </li> 20 </li>
19 <li class="sbold"> 21 <li class="sbold">
20 - <a href="#tab3" data-toggle="tab" aria-expanded="false">SDE+SDN <span class="badge"> {{resultNum3}} </span></a> 22 + <a href="#tab3" data-toggle="tab" aria-expanded="false">SDE+SDN
  23 + <span class="badge"> {{resultNum3}} </span>
  24 + </a>
21 </li> 25 </li>
22 <li class="sbold"> 26 <li class="sbold">
23 - <a href="#tab4" data-toggle="tab" aria-expanded="false">AP Down <span class="badge"> {{resultNum4}} </span></a> 27 + <a href="#tab4" data-toggle="tab" aria-expanded="false">AP Down
  28 + <span class="badge"> {{resultNum4}} </span>
  29 + </a>
24 </li> 30 </li>
25 <li class="sbold"> 31 <li class="sbold">
26 - <a href="#tab5" data-toggle="tab" aria-expanded="false">BNW+NDS+NED+NES+NET <span class="badge"> {{resultNum5}} </span></a> 32 + <a href="#tab5" data-toggle="tab" aria-expanded="false">BNW+NDS+NED+NES+NET
  33 + <span class="badge"> {{resultNum5}} </span>
  34 + </a>
27 </li> 35 </li>
28 <li class="sbold"> 36 <li class="sbold">
29 - <a href="#tab6" data-toggle="tab" aria-expanded="false">CUS <span class="badge"> {{resultNum6}} </span></a>  
30 - </li> 37 + <a href="#tab6" data-toggle="tab" aria-expanded="false">CUS
  38 + <span class="badge"> {{resultNum6}} </span>
  39 + </a>
  40 + </li>
31 </ul> 41 </ul>
32 <div class="tab-content"> 42 <div class="tab-content">
33 <div class="panel tab-pane active" id="tab1"> 43 <div class="panel tab-pane active" id="tab1">
@@ -42,14 +52,15 @@ @@ -42,14 +52,15 @@
42 <input type="text" placeholder="Search.." class="form-control sbold font" [(ngModel)]="FilterSearch"> 52 <input type="text" placeholder="Search.." class="form-control sbold font" [(ngModel)]="FilterSearch">
43 </div> 53 </div>
44 </div> 54 </div>
45 - <br><br>  
46 - <button *ngFor="let name of ButtonValue" (click)="getButton1(name.valueN)">{{ name.name }}</button> 55 + <br>
  56 + <br>
  57 + <button class="btn btn-default " *ngFor="let name of ButtonValue" (click)="getButton1(name.valueN)" style="margin-left: 5px; margin-top: 2px;">{{ name.name }}</button>
47 <hr> 58 <hr>
48 <br> 59 <br>
49 </div> 60 </div>
50 <div class="panel-body"> 61 <div class="panel-body">
51 <div class="row"> 62 <div class="row">
52 - <div class="col-lg-4 col-md-3 col-sm-6 col-xs-12" *ngFor="let item of resultData | filter:FilterSearch: '' | filter:FilterSearchButton: 'name.valueN' " > 63 + <div class="col-lg-4 col-md-3 col-sm-6 col-xs-12" *ngFor="let item of resultData | filter:FilterSearch: '' | filter:FilterSearchButton: 'name.valueN' ">
53 <a class="dashboard-stat dashboard-stat-v2 red " href="{{item.link}}" target="_blank" [ngStyle]="{'background-color': getColorDay(item.days.toFixed(0))}"> 64 <a class="dashboard-stat dashboard-stat-v2 red " href="{{item.link}}" target="_blank" [ngStyle]="{'background-color': getColorDay(item.days.toFixed(0))}">
54 <!-- <div [ngStyle]="{'background-color':item.days === '366.0098' ? 'green' : 'red' }"></<div> --> 65 <!-- <div [ngStyle]="{'background-color':item.days === '366.0098' ? 'green' : 'red' }"></<div> -->
55 <!-- <div class="avater">{{(item.days).toFixed(0)}} D</div> --> 66 <!-- <div class="avater">{{(item.days).toFixed(0)}} D</div> -->
@@ -99,6 +110,9 @@ @@ -99,6 +110,9 @@
99 <input type="text" placeholder="Search.." class="form-control sbold font" [(ngModel)]="FilterSearchOnHold"> 110 <input type="text" placeholder="Search.." class="form-control sbold font" [(ngModel)]="FilterSearchOnHold">
100 </div> 111 </div>
101 </div> 112 </div>
  113 + <br>
  114 + <br>
  115 + <button class="btn btn-default " *ngFor="let name of ButtonValue" (click)="getButton1Onhold(name.valueN)" style="margin-left: 5px; margin-top: 2px;">{{ name.name }}</button>
102 <hr> 116 <hr>
103 <br> 117 <br>
104 </div> 118 </div>
@@ -115,7 +129,7 @@ @@ -115,7 +129,7 @@
115 <table> 129 <table>
116 <tr> 130 <tr>
117 <div class="details" style="width: calc(100% - 50px);"> 131 <div class="details" style="width: calc(100% - 50px);">
118 - <div style="text-align: right; margin-top: -60px; color: black;">{{item.type}}</div> 132 + <div style="text-align: right; margin-top: -60px; color: black;">{{item.type | textshort}}</div>
119 <div style="text-align: right; color: black;">{{item.STATUS}}</div> 133 <div style="text-align: right; color: black;">{{item.STATUS}}</div>
120 <div class="number" style=" color: black; display: block; text-align: right; margin-top: -7px;"> 134 <div class="number" style=" color: black; display: block; text-align: right; margin-top: -7px;">
121 <span data-counter="counterup" data-value="">{{item.custgroupName}}</span> 135 <span data-counter="counterup" data-value="">{{item.custgroupName}}</span>
@@ -151,8 +165,9 @@ @@ -151,8 +165,9 @@
151 <input type="text" placeholder="Search.." class="form-control sbold font" [(ngModel)]="FilterSearch"> 165 <input type="text" placeholder="Search.." class="form-control sbold font" [(ngModel)]="FilterSearch">
152 </div> 166 </div>
153 </div> 167 </div>
154 - <br><br>  
155 - <button *ngFor="let name of ButtonValue" (click)="getButton2(name.valueN)">{{ name.name }}</button> 168 + <br>
  169 + <br>
  170 + <button class="btn btn-default " *ngFor="let name of ButtonValue" (click)="getButton2(name.valueN)" style="margin-left: 5px; margin-top: 2px;">{{ name.name }}</button>
156 <hr> 171 <hr>
157 <br> 172 <br>
158 </div> 173 </div>
@@ -171,7 +186,7 @@ @@ -171,7 +186,7 @@
171 <div class="details" style="width: calc(100% - 50px);"> 186 <div class="details" style="width: calc(100% - 50px);">
172 <div style="text-align: right; margin-top: -60px; color: black;">{{item.type | textshort}}</div> 187 <div style="text-align: right; margin-top: -60px; color: black;">{{item.type | textshort}}</div>
173 <div style="text-align: right; color: black;">{{item.STATUS}}</div> 188 <div style="text-align: right; color: black;">{{item.STATUS}}</div>
174 - <div class="number" style=" color: black; display: block; text-align: right;"> 189 + <div class="number" style=" color: black; display: block; text-align: right; margin-top: -7px;">
175 <span data-counter="counterup" data-value="">{{item.custgroupName}}</span> 190 <span data-counter="counterup" data-value="">{{item.custgroupName}}</span>
176 </div> 191 </div>
177 <div class="desc" style=" color: black;">{{item.team}}</div> 192 <div class="desc" style=" color: black;">{{item.team}}</div>
@@ -207,6 +222,9 @@ @@ -207,6 +222,9 @@
207 <input type="text" placeholder="Search.." class="form-control sbold font" [(ngModel)]="FilterSearchOnHold"> 222 <input type="text" placeholder="Search.." class="form-control sbold font" [(ngModel)]="FilterSearchOnHold">
208 </div> 223 </div>
209 </div> 224 </div>
  225 + <br>
  226 + <br>
  227 + <button class="btn btn-default " *ngFor="let name of ButtonValue" (click)="getButton2Onhold(name.valueN)" style="margin-left: 5px; margin-top: 2px;">{{ name.name }}</button>
210 <hr> 228 <hr>
211 <br> 229 <br>
212 </div> 230 </div>
@@ -223,8 +241,9 @@ @@ -223,8 +241,9 @@
223 <table> 241 <table>
224 <tr> 242 <tr>
225 <div class="details" style="width: calc(100% - 50px);"> 243 <div class="details" style="width: calc(100% - 50px);">
226 - <div style="text-align: right; margin-top: -50px; color: black;">{{item.STATUS}}</div>  
227 - <div class="number" style=" color: black; display: block; text-align: right;"> 244 + <div style="text-align: right; margin-top: -60px; color: black;">{{item.type | textshort}}</div>
  245 + <div style="text-align: right; color: black;">{{item.STATUS}}</div>
  246 + <div class="number" style=" color: black; display: block; text-align: right; margin-top: -7px;">
228 <span data-counter="counterup" data-value="">{{item.custgroupName}}</span> 247 <span data-counter="counterup" data-value="">{{item.custgroupName}}</span>
229 </div> 248 </div>
230 <div class="desc" style=" color: black;">{{item.team}}</div> 249 <div class="desc" style=" color: black;">{{item.team}}</div>
@@ -257,8 +276,9 @@ @@ -257,8 +276,9 @@
257 <input type="text" placeholder="Search.." class="form-control sbold font" [(ngModel)]="FilterSearch"> 276 <input type="text" placeholder="Search.." class="form-control sbold font" [(ngModel)]="FilterSearch">
258 </div> 277 </div>
259 </div> 278 </div>
260 - <br><br>  
261 - <button *ngFor="let name of ButtonValue" (click)="getButton3(name.valueN)">{{ name.name }}</button> 279 + <br>
  280 + <br>
  281 + <button class="btn btn-default " *ngFor="let name of ButtonValue" (click)="getButton3(name.valueN)" style="margin-left: 5px; margin-top: 2px;">{{ name.name }}</button>
262 <hr> 282 <hr>
263 <br> 283 <br>
264 </div> 284 </div>
@@ -277,7 +297,7 @@ @@ -277,7 +297,7 @@
277 <div class="details" style="width: calc(100% - 50px);"> 297 <div class="details" style="width: calc(100% - 50px);">
278 <div style="text-align: right; margin-top: -60px; color: black;">{{item.type | textshort}}</div> 298 <div style="text-align: right; margin-top: -60px; color: black;">{{item.type | textshort}}</div>
279 <div style="text-align: right; color: black;">{{item.STATUS}}</div> 299 <div style="text-align: right; color: black;">{{item.STATUS}}</div>
280 - <div class="number" style=" color: black; display: block; text-align: right;"> 300 + <div class="number" style=" color: black; display: block; text-align: right; margin-top: -7px;">
281 <span data-counter="counterup" data-value="">{{item.custgroupName}}</span> 301 <span data-counter="counterup" data-value="">{{item.custgroupName}}</span>
282 </div> 302 </div>
283 <div class="desc" style=" color: black;">{{item.team}}</div> 303 <div class="desc" style=" color: black;">{{item.team}}</div>
@@ -313,6 +333,9 @@ @@ -313,6 +333,9 @@
313 <input type="text" placeholder="Search.." class="form-control sbold font" [(ngModel)]="FilterSearchOnHold"> 333 <input type="text" placeholder="Search.." class="form-control sbold font" [(ngModel)]="FilterSearchOnHold">
314 </div> 334 </div>
315 </div> 335 </div>
  336 + <br>
  337 + <br>
  338 + <button class="btn btn-default " *ngFor="let name of ButtonValue" (click)="getButton3Onhold(name.valueN)" style="margin-left: 5px; margin-top: 2px;">{{ name.name }}</button>
316 <hr> 339 <hr>
317 <br> 340 <br>
318 </div> 341 </div>
@@ -329,8 +352,9 @@ @@ -329,8 +352,9 @@
329 <table> 352 <table>
330 <tr> 353 <tr>
331 <div class="details" style="width: calc(100% - 50px);"> 354 <div class="details" style="width: calc(100% - 50px);">
332 - <div style="text-align: right; margin-top: -50px; color: black;">{{item.STATUS}}</div>  
333 - <div class="number" style=" color: black; display: block; text-align: right;"> 355 + <div style="text-align: right; margin-top: -60px; color: black;">{{item.type | textshort}}</div>
  356 + <div style="text-align: right; color: black;">{{item.STATUS}}</div>
  357 + <div class="number" style=" color: black; display: block; text-align: right; margin-top: -7px;">
334 <span data-counter="counterup" data-value="">{{item.custgroupName}}</span> 358 <span data-counter="counterup" data-value="">{{item.custgroupName}}</span>
335 </div> 359 </div>
336 <div class="desc" style=" color: black;">{{item.team}}</div> 360 <div class="desc" style=" color: black;">{{item.team}}</div>
@@ -363,8 +387,9 @@ @@ -363,8 +387,9 @@
363 <input type="text" placeholder="Search.." class="form-control sbold font" [(ngModel)]="FilterSearch"> 387 <input type="text" placeholder="Search.." class="form-control sbold font" [(ngModel)]="FilterSearch">
364 </div> 388 </div>
365 </div> 389 </div>
366 - <br><br>  
367 - <button *ngFor="let name of ButtonValue" (click)="getButton4(name.valueN)">{{ name.name }}</button> 390 + <br>
  391 + <br>
  392 + <button class="btn btn-default " *ngFor="let name of ButtonValue" (click)="getButton4(name.valueN)" style="margin-left: 5px; margin-top: 2px;">{{ name.name }}</button>
368 <hr> 393 <hr>
369 <br> 394 <br>
370 </div> 395 </div>
@@ -383,7 +408,7 @@ @@ -383,7 +408,7 @@
383 <div class="details" style="width: calc(100% - 50px);"> 408 <div class="details" style="width: calc(100% - 50px);">
384 <div style="text-align: right; margin-top: -60px; color: black;">{{item.type | textshort}}</div> 409 <div style="text-align: right; margin-top: -60px; color: black;">{{item.type | textshort}}</div>
385 <div style="text-align: right; color: black;">{{item.STATUS}}</div> 410 <div style="text-align: right; color: black;">{{item.STATUS}}</div>
386 - <div class="number" style=" color: black; display: block; text-align: right;"> 411 + <div class="number" style=" color: black; display: block; text-align: right; margin-top: -7px;">
387 <span data-counter="counterup" data-value="">{{item.custgroupName}}</span> 412 <span data-counter="counterup" data-value="">{{item.custgroupName}}</span>
388 </div> 413 </div>
389 <div class="desc" style=" color: black;">{{item.team}}</div> 414 <div class="desc" style=" color: black;">{{item.team}}</div>
@@ -419,6 +444,9 @@ @@ -419,6 +444,9 @@
419 <input type="text" placeholder="Search.." class="form-control sbold font" [(ngModel)]="FilterSearchOnHold"> 444 <input type="text" placeholder="Search.." class="form-control sbold font" [(ngModel)]="FilterSearchOnHold">
420 </div> 445 </div>
421 </div> 446 </div>
  447 + <br>
  448 + <br>
  449 + <button class="btn btn-default " *ngFor="let name of ButtonValue" (click)="getButton4Onhold(name.valueN)" style="margin-left: 5px; margin-top: 2px;">{{ name.name }}</button>
422 <hr> 450 <hr>
423 <br> 451 <br>
424 </div> 452 </div>
@@ -435,8 +463,9 @@ @@ -435,8 +463,9 @@
435 <table> 463 <table>
436 <tr> 464 <tr>
437 <div class="details" style="width: calc(100% - 50px);"> 465 <div class="details" style="width: calc(100% - 50px);">
438 - <div style="text-align: right; margin-top: -50px; color: black;">{{item.STATUS}}</div>  
439 - <div class="number" style=" color: black; display: block; text-align: right;"> 466 + <div style="text-align: right; margin-top: -60px; color: black;">{{item.type | textshort}}</div>
  467 + <div style="text-align: right; color: black;">{{item.STATUS}}</div>
  468 + <div class="number" style=" color: black; display: block; text-align: right; margin-top: -7px;">
440 <span data-counter="counterup" data-value="">{{item.custgroupName}}</span> 469 <span data-counter="counterup" data-value="">{{item.custgroupName}}</span>
441 </div> 470 </div>
442 <div class="desc" style=" color: black;">{{item.team}}</div> 471 <div class="desc" style=" color: black;">{{item.team}}</div>
@@ -469,8 +498,9 @@ @@ -469,8 +498,9 @@
469 <input type="text" placeholder="Search.." class="form-control sbold font" [(ngModel)]="FilterSearch"> 498 <input type="text" placeholder="Search.." class="form-control sbold font" [(ngModel)]="FilterSearch">
470 </div> 499 </div>
471 </div> 500 </div>
472 - <br><br>  
473 - <button *ngFor="let name of ButtonValue" (click)="getButton5(name.valueN)">{{ name.name }}</button> 501 + <br>
  502 + <br>
  503 + <button class="btn btn-default " *ngFor="let name of ButtonValue" (click)="getButton5(name.valueN)" style="margin-left: 5px; margin-top: 2px;">{{ name.name }}</button>
474 <hr> 504 <hr>
475 <br> 505 <br>
476 </div> 506 </div>
@@ -489,7 +519,7 @@ @@ -489,7 +519,7 @@
489 <div class="details" style="width: calc(100% - 50px);"> 519 <div class="details" style="width: calc(100% - 50px);">
490 <div style="text-align: right; margin-top: -60px; color: black;">{{item.type | textshort}}</div> 520 <div style="text-align: right; margin-top: -60px; color: black;">{{item.type | textshort}}</div>
491 <div style="text-align: right; color: black;">{{item.STATUS}}</div> 521 <div style="text-align: right; color: black;">{{item.STATUS}}</div>
492 - <div class="number" style=" color: black; display: block; text-align: right;"> 522 + <div class="number" style=" color: black; display: block; text-align: right; margin-top: -7px;">
493 <span data-counter="counterup" data-value="">{{item.custgroupName}}</span> 523 <span data-counter="counterup" data-value="">{{item.custgroupName}}</span>
494 </div> 524 </div>
495 <div class="desc" style=" color: black;">{{item.team}}</div> 525 <div class="desc" style=" color: black;">{{item.team}}</div>
@@ -525,6 +555,9 @@ @@ -525,6 +555,9 @@
525 <input type="text" placeholder="Search.." class="form-control sbold font" [(ngModel)]="FilterSearchOnHold"> 555 <input type="text" placeholder="Search.." class="form-control sbold font" [(ngModel)]="FilterSearchOnHold">
526 </div> 556 </div>
527 </div> 557 </div>
  558 + <br>
  559 + <br>
  560 + <button class="btn btn-default " *ngFor="let name of ButtonValue" (click)="getButton5Onhold(name.valueN)" style="margin-left: 5px; margin-top: 2px;">{{ name.name }}</button>
528 <hr> 561 <hr>
529 <br> 562 <br>
530 </div> 563 </div>
@@ -541,8 +574,9 @@ @@ -541,8 +574,9 @@
541 <table> 574 <table>
542 <tr> 575 <tr>
543 <div class="details" style="width: calc(100% - 50px);"> 576 <div class="details" style="width: calc(100% - 50px);">
544 - <div style="text-align: right; margin-top: -50px; color: black;">{{item.STATUS}}</div>  
545 - <div class="number" style=" color: black; display: block; text-align: right;"> 577 + <div style="text-align: right; margin-top: -60px; color: black;">{{item.type | textshort}}</div>
  578 + <div style="text-align: right; color: black;">{{item.STATUS}}</div>
  579 + <div class="number" style=" color: black; display: block; text-align: right; margin-top: -7px;">
546 <span data-counter="counterup" data-value="">{{item.custgroupName}}</span> 580 <span data-counter="counterup" data-value="">{{item.custgroupName}}</span>
547 </div> 581 </div>
548 <div class="desc" style=" color: black;">{{item.team}}</div> 582 <div class="desc" style=" color: black;">{{item.team}}</div>
@@ -575,8 +609,9 @@ @@ -575,8 +609,9 @@
575 <input type="text" placeholder="Search.." class="form-control sbold font" [(ngModel)]="FilterSearch"> 609 <input type="text" placeholder="Search.." class="form-control sbold font" [(ngModel)]="FilterSearch">
576 </div> 610 </div>
577 </div> 611 </div>
578 - <br><br>  
579 - <button *ngFor="let name of ButtonValue" (click)="getButton6(name.valueN)">{{ name.name }}</button> 612 + <br>
  613 + <br>
  614 + <button class="btn btn-default " *ngFor="let name of ButtonValue" (click)="getButton6(name.valueN)" style="margin-left: 5px; margin-top: 2px;">{{ name.name }}</button>
580 <hr> 615 <hr>
581 <br> 616 <br>
582 </div> 617 </div>
@@ -595,7 +630,7 @@ @@ -595,7 +630,7 @@
595 <div class="details" style="width: calc(100% - 50px);"> 630 <div class="details" style="width: calc(100% - 50px);">
596 <div style="text-align: right; margin-top: -60px; color: black;">{{item.type | textshort}}</div> 631 <div style="text-align: right; margin-top: -60px; color: black;">{{item.type | textshort}}</div>
597 <div style="text-align: right; color: black;">{{item.STATUS}}</div> 632 <div style="text-align: right; color: black;">{{item.STATUS}}</div>
598 - <div class="number" style=" color: black; display: block; text-align: right;"> 633 + <div class="number" style=" color: black; display: block; text-align: right; margin-top: -7px;">
599 <span data-counter="counterup" data-value="">{{item.custgroupName}}</span> 634 <span data-counter="counterup" data-value="">{{item.custgroupName}}</span>
600 </div> 635 </div>
601 <div class="desc" style=" color: black;">{{item.team}}</div> 636 <div class="desc" style=" color: black;">{{item.team}}</div>
@@ -631,6 +666,9 @@ @@ -631,6 +666,9 @@
631 <input type="text" placeholder="Search.." class="form-control sbold font" [(ngModel)]="FilterSearchOnHold"> 666 <input type="text" placeholder="Search.." class="form-control sbold font" [(ngModel)]="FilterSearchOnHold">
632 </div> 667 </div>
633 </div> 668 </div>
  669 + <br>
  670 + <br>
  671 + <button class="btn btn-default " *ngFor="let name of ButtonValue" (click)="getButton6Onhold(name.valueN)" style="margin-left: 5px; margin-top: 2px;">{{ name.name }}</button>
634 <hr> 672 <hr>
635 <br> 673 <br>
636 </div> 674 </div>
@@ -647,8 +685,9 @@ @@ -647,8 +685,9 @@
647 <table> 685 <table>
648 <tr> 686 <tr>
649 <div class="details" style="width: calc(100% - 50px);"> 687 <div class="details" style="width: calc(100% - 50px);">
650 - <div style="text-align: right; margin-top: -50px; color: black;">{{item.STATUS}}</div>  
651 - <div class="number" style=" color: black; display: block; text-align: right;"> 688 + <div style="text-align: right; margin-top: -60px; color: black;">{{item.type | textshort}}</div>
  689 + <div style="text-align: right; color: black;">{{item.STATUS}}</div>
  690 + <div class="number" style=" color: black; display: block; text-align: right; margin-top: -7px;">
652 <span data-counter="counterup" data-value="">{{item.custgroupName}}</span> 691 <span data-counter="counterup" data-value="">{{item.custgroupName}}</span>
653 </div> 692 </div>
654 <div class="desc" style=" color: black;">{{item.team}}</div> 693 <div class="desc" style=" color: black;">{{item.team}}</div>
@@ -675,7 +714,7 @@ @@ -675,7 +714,7 @@
675 <h1 class="icon-bubble font-green-sharp"> 714 <h1 class="icon-bubble font-green-sharp">
676 <span class="caption-subject font-green-sharp sbold font"> Active</span> 715 <span class="caption-subject font-green-sharp sbold font"> Active</span>
677 </h1> 716 </h1>
678 - 717 +
679 <div class="input-group" style="float: right; margin-top: 11px;"> 718 <div class="input-group" style="float: right; margin-top: 11px;">
680 <div class="input-icon right"> 719 <div class="input-icon right">
681 <i class="icon-magnifier"> 720 <i class="icon-magnifier">
@@ -683,10 +722,11 @@ @@ -683,10 +722,11 @@
683 <input type="text" placeholder="Search.." class="form-control sbold font" [(ngModel)]="FilterSearch"> 722 <input type="text" placeholder="Search.." class="form-control sbold font" [(ngModel)]="FilterSearch">
684 </div> 723 </div>
685 </div> 724 </div>
686 - <br><br>  
687 - <button *ngFor="let name of ButtonValue" (click)="getButton7(name.valueN)">{{ name.name }}</button> 725 + <br>
  726 + <br>
  727 + <button class="btn btn-default " *ngFor="let name of ButtonValue" (click)="getButton7(name.valueN)" style="margin-left: 5px; margin-top: 2px;">{{ name.name }}</button>
688 <hr> 728 <hr>
689 - 729 +
690 <br> 730 <br>
691 </div> 731 </div>
692 <div class="panel-body"> 732 <div class="panel-body">
@@ -741,6 +781,9 @@ @@ -741,6 +781,9 @@
741 <input type="text" placeholder="Search.." class="form-control sbold font" [(ngModel)]="FilterSearchOnHold"> 781 <input type="text" placeholder="Search.." class="form-control sbold font" [(ngModel)]="FilterSearchOnHold">
742 </div> 782 </div>
743 </div> 783 </div>
  784 + <br>
  785 + <br>
  786 + <button class="btn btn-default " *ngFor="let name of ButtonValue" (click)="getButton7Onhold(name.valueN)" style="margin-left: 5px; margin-top: 2px;">{{ name.name }}</button>
744 <!-- <br><br> 787 <!-- <br><br>
745 <button *ngFor="let name of ButtonValue" (click)="getButton(name.valueN)">{{ name.name }}</button> --> 788 <button *ngFor="let name of ButtonValue" (click)="getButton(name.valueN)">{{ name.name }}</button> -->
746 <hr> 789 <hr>
@@ -759,7 +802,7 @@ @@ -759,7 +802,7 @@
759 <table> 802 <table>
760 <tr> 803 <tr>
761 <div class="details" style="width: calc(100% - 50px);"> 804 <div class="details" style="width: calc(100% - 50px);">
762 - <div style="text-align: right; margin-top: -60px; color: black;">{{item.type}}</div> 805 + <div style="text-align: right; margin-top: -60px; color: black;">{{item.type | textshort}}</div>
763 <div style="text-align: right; color: black;">{{item.STATUS}}</div> 806 <div style="text-align: right; color: black;">{{item.STATUS}}</div>
764 <div class="number" style=" color: black; display: block; text-align: right; margin-top: -7px;"> 807 <div class="number" style=" color: black; display: block; text-align: right; margin-top: -7px;">
765 <span data-counter="counterup" data-value="">{{item.custgroupName}}</span> 808 <span data-counter="counterup" data-value="">{{item.custgroupName}}</span>
src/app/dashboard/dashboard.component.scss
  Diff comments   View file @477eccd
@@ -31,6 +31,10 @@ @@ -31,6 +31,10 @@
31 padding: 30px; 31 padding: 30px;
32 } 32 }
33 33
  34 +.co {
  35 + background-color: aquamarine;
  36 +}
  37 +
34 .form-control { 38 .form-control {
35 outline: 0 !important; 39 outline: 0 !important;
36 } 40 }
src/app/dashboard/dashboard.component.ts
  Diff comments   View file @477eccd
@@ -71,12 +71,19 @@ export class DashboardComponent implements OnInit { @@ -71,12 +71,19 @@ export class DashboardComponent implements OnInit {
71 resultDataOnHold7: any; 71 resultDataOnHold7: any;
72 72
73 Show1: any = []; 73 Show1: any = [];
  74 + Show1Onhold: any = [];
74 Show2: any = []; 75 Show2: any = [];
  76 + Show2Onhold: any = [];
75 Show3: any = []; 77 Show3: any = [];
  78 + Show3Onhold: any = [];
76 Show4: any = []; 79 Show4: any = [];
  80 + Show4Onhold: any = [];
77 Show5: any = []; 81 Show5: any = [];
  82 + Show5Onhold: any = [];
78 Show6: any = []; 83 Show6: any = [];
  84 + Show6Onhold: any = [];
79 Show7: any = []; 85 Show7: any = [];
  86 + Show7Onhold: any = [];
80 87
81 ButtonValue = [ 88 ButtonValue = [
82 { 89 {
@@ -213,7 +220,7 @@ export class DashboardComponent implements OnInit { @@ -213,7 +220,7 @@ export class DashboardComponent implements OnInit {
213 }, 220 },
214 ]; 221 ];
215 222
216 - 223 +
217 async ngOnInit() { 224 async ngOnInit() {
218 //----------------------------1------------------------ 225 //----------------------------1------------------------
219 // Active 226 // Active
@@ -264,6 +271,7 @@ export class DashboardComponent implements OnInit { @@ -264,6 +271,7 @@ export class DashboardComponent implements OnInit {
264 for (const i in this.resultDataOnHold) { 271 for (const i in this.resultDataOnHold) {
265 this.resultDataOnHold[i].link = this._common.decodeURI(this.resultDataOnHold[i].link); 272 this.resultDataOnHold[i].link = this._common.decodeURI(this.resultDataOnHold[i].link);
266 this.resultDataOnHold[i].birth_date = this._common.convertDate(this.resultDataOnHold[i].birth_date); 273 this.resultDataOnHold[i].birth_date = this._common.convertDate(this.resultDataOnHold[i].birth_date);
  274 + this.Show1Onhold.push(this.resultDataOnHold[i]);
267 } 275 }
268 } else { 276 } else {
269 this.resultDataOnHold = []; 277 this.resultDataOnHold = [];
@@ -326,6 +334,7 @@ export class DashboardComponent implements OnInit { @@ -326,6 +334,7 @@ export class DashboardComponent implements OnInit {
326 for (const i in this.resultDataOnHold2) { 334 for (const i in this.resultDataOnHold2) {
327 this.resultDataOnHold2[i].link = this._common.decodeURI(this.resultDataOnHold2[i].link); 335 this.resultDataOnHold2[i].link = this._common.decodeURI(this.resultDataOnHold2[i].link);
328 this.resultDataOnHold2[i].birth_date = this._common.convertDate(this.resultDataOnHold2[i].birth_date); 336 this.resultDataOnHold2[i].birth_date = this._common.convertDate(this.resultDataOnHold2[i].birth_date);
  337 + this.Show2Onhold.push(this.resultDataOnHold2[i]);
329 } 338 }
330 } else { 339 } else {
331 this.resultDataOnHold2 = []; 340 this.resultDataOnHold2 = [];
@@ -387,6 +396,7 @@ export class DashboardComponent implements OnInit { @@ -387,6 +396,7 @@ export class DashboardComponent implements OnInit {
387 for (const i in this.resultDataOnHold3) { 396 for (const i in this.resultDataOnHold3) {
388 this.resultDataOnHold3[i].link = this._common.decodeURI(this.resultDataOnHold3[i].link); 397 this.resultDataOnHold3[i].link = this._common.decodeURI(this.resultDataOnHold3[i].link);
389 this.resultDataOnHold3[i].birth_date = this._common.convertDate(this.resultDataOnHold3[i].birth_date); 398 this.resultDataOnHold3[i].birth_date = this._common.convertDate(this.resultDataOnHold3[i].birth_date);
  399 + this.Show3Onhold.push(this.resultDataOnHold3[i]);
390 } 400 }
391 } else { 401 } else {
392 this.resultDataOnHold3 = []; 402 this.resultDataOnHold3 = [];
@@ -446,6 +456,7 @@ export class DashboardComponent implements OnInit { @@ -446,6 +456,7 @@ export class DashboardComponent implements OnInit {
446 for (const i in this.resultDataOnHold4) { 456 for (const i in this.resultDataOnHold4) {
447 this.resultDataOnHold4[i].link = this._common.decodeURI(this.resultDataOnHold4[i].link); 457 this.resultDataOnHold4[i].link = this._common.decodeURI(this.resultDataOnHold4[i].link);
448 this.resultDataOnHold4[i].birth_date = this._common.convertDate(this.resultDataOnHold4[i].birth_date); 458 this.resultDataOnHold4[i].birth_date = this._common.convertDate(this.resultDataOnHold4[i].birth_date);
  459 + this.Show4Onhold.push(this.resultDataOnHold4[i]);
449 } 460 }
450 } else { 461 } else {
451 this.resultDataOnHold4 = []; 462 this.resultDataOnHold4 = [];
@@ -505,6 +516,7 @@ export class DashboardComponent implements OnInit { @@ -505,6 +516,7 @@ export class DashboardComponent implements OnInit {
505 for (const i in this.resultDataOnHold5) { 516 for (const i in this.resultDataOnHold5) {
506 this.resultDataOnHold5[i].link = this._common.decodeURI(this.resultDataOnHold5[i].link); 517 this.resultDataOnHold5[i].link = this._common.decodeURI(this.resultDataOnHold5[i].link);
507 this.resultDataOnHold5[i].birth_date = this._common.convertDate(this.resultDataOnHold5[i].birth_date); 518 this.resultDataOnHold5[i].birth_date = this._common.convertDate(this.resultDataOnHold5[i].birth_date);
  519 + this.Show5Onhold.push(this.resultDataOnHold5[i]);
508 } 520 }
509 } else { 521 } else {
510 this.resultDataOnHold5 = []; 522 this.resultDataOnHold5 = [];
@@ -563,6 +575,7 @@ export class DashboardComponent implements OnInit { @@ -563,6 +575,7 @@ export class DashboardComponent implements OnInit {
563 for (const i in this.resultDataOnHold6) { 575 for (const i in this.resultDataOnHold6) {
564 this.resultDataOnHold6[i].link = this._common.decodeURI(this.resultDataOnHold6[i].link); 576 this.resultDataOnHold6[i].link = this._common.decodeURI(this.resultDataOnHold6[i].link);
565 this.resultDataOnHold6[i].birth_date = this._common.convertDate(this.resultDataOnHold6[i].birth_date); 577 this.resultDataOnHold6[i].birth_date = this._common.convertDate(this.resultDataOnHold6[i].birth_date);
  578 + this.Show6Onhold.push(this.resultDataOnHold6[i]);
566 } 579 }
567 } else { 580 } else {
568 this.resultDataOnHold6 = []; 581 this.resultDataOnHold6 = [];
@@ -626,6 +639,7 @@ export class DashboardComponent implements OnInit { @@ -626,6 +639,7 @@ export class DashboardComponent implements OnInit {
626 for (const i in this.resultDataOnHold7) { 639 for (const i in this.resultDataOnHold7) {
627 this.resultDataOnHold7[i].link = this._common.decodeURI(this.resultDataOnHold7[i].link); 640 this.resultDataOnHold7[i].link = this._common.decodeURI(this.resultDataOnHold7[i].link);
628 this.resultDataOnHold7[i].birth_date = this._common.convertDate(this.resultDataOnHold7[i].birth_date); 641 this.resultDataOnHold7[i].birth_date = this._common.convertDate(this.resultDataOnHold7[i].birth_date);
  642 + this.Show7Onhold.push(this.resultDataOnHold7[i]);
629 } 643 }
630 } else { 644 } else {
631 this.resultDataOnHold7 = []; 645 this.resultDataOnHold7 = [];
@@ -666,6 +680,34 @@ export class DashboardComponent implements OnInit { @@ -666,6 +680,34 @@ export class DashboardComponent implements OnInit {
666 680
667 this.resultData = resultArray; 681 this.resultData = resultArray;
668 } 682 }
  683 +/* buttondataOnhold1 */
  684 + getButton1Onhold(valueN){
  685 + console.log(valueN);
  686 +
  687 + if (this.Show1Onhold.length === 0) {
  688 + return this.Show1Onhold;
  689 + }
  690 +
  691 + const resultArray = [];
  692 + for (const item of this.Show1Onhold) {
  693 + console.log('item: ', item);
  694 +
  695 + var st = '';
  696 + // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ;
  697 + if(item['type']){
  698 + st = item['type'].toLowerCase();
  699 + }
  700 +
  701 + var string2 = valueN.toLowerCase();
  702 + if (st.indexOf(string2) > -1) {
  703 + console.log(st);
  704 + resultArray.push(item);
  705 + }
  706 +
  707 + }
  708 +
  709 + this.resultDataOnHold = resultArray;
  710 + }
669 711
670 getButton2(valueN){ 712 getButton2(valueN){
671 console.log(valueN); 713 console.log(valueN);
@@ -695,6 +737,35 @@ export class DashboardComponent implements OnInit { @@ -695,6 +737,35 @@ export class DashboardComponent implements OnInit {
695 this.resultData2 = resultArray; 737 this.resultData2 = resultArray;
696 } 738 }
697 739
  740 + /* buttondataOnhold2 */
  741 + getButton2Onhold(valueN){
  742 + console.log(valueN);
  743 +
  744 + if (this.Show2Onhold.length === 0) {
  745 + return this.Show2Onhold;
  746 + }
  747 +
  748 + const resultArray = [];
  749 + for (const item of this.Show2Onhold) {
  750 + console.log('item: ', item);
  751 +
  752 + var st = '';
  753 + // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ;
  754 + if(item['type']){
  755 + st = item['type'].toLowerCase();
  756 + }
  757 +
  758 + var string2 = valueN.toLowerCase();
  759 + if (st.indexOf(string2) > -1) {
  760 + console.log(st);
  761 + resultArray.push(item);
  762 + }
  763 +
  764 + }
  765 +
  766 + this.resultDataOnHold2 = resultArray;
  767 + }
  768 +
698 getButton3(valueN){ 769 getButton3(valueN){
699 console.log(valueN); 770 console.log(valueN);
700 771
@@ -723,6 +794,35 @@ export class DashboardComponent implements OnInit { @@ -723,6 +794,35 @@ export class DashboardComponent implements OnInit {
723 this.resultData3 = resultArray; 794 this.resultData3 = resultArray;
724 } 795 }
725 796
  797 + /* buttondataOnhold3 */
  798 + getButton3Onhold(valueN){
  799 + console.log(valueN);
  800 +
  801 + if (this.Show3Onhold.length === 0) {
  802 + return this.Show3Onhold;
  803 + }
  804 +
  805 + const resultArray = [];
  806 + for (const item of this.Show3Onhold) {
  807 + console.log('item: ', item);
  808 +
  809 + var st = '';
  810 + // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ;
  811 + if(item['type']){
  812 + st = item['type'].toLowerCase();
  813 + }
  814 +
  815 + var string2 = valueN.toLowerCase();
  816 + if (st.indexOf(string2) > -1) {
  817 + console.log(st);
  818 + resultArray.push(item);
  819 + }
  820 +
  821 + }
  822 +
  823 + this.resultDataOnHold3 = resultArray;
  824 + }
  825 +
726 getButton4(valueN){ 826 getButton4(valueN){
727 console.log(valueN); 827 console.log(valueN);
728 828
@@ -751,6 +851,35 @@ export class DashboardComponent implements OnInit { @@ -751,6 +851,35 @@ export class DashboardComponent implements OnInit {
751 this.resultData4 = resultArray; 851 this.resultData4 = resultArray;
752 } 852 }
753 853
  854 + /* buttondataOnhold4 */
  855 + getButton4Onhold(valueN){
  856 + console.log(valueN);
  857 +
  858 + if (this.Show4Onhold.length === 0) {
  859 + return this.Show4Onhold;
  860 + }
  861 +
  862 + const resultArray = [];
  863 + for (const item of this.Show4Onhold) {
  864 + console.log('item: ', item);
  865 +
  866 + var st = '';
  867 + // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ;
  868 + if(item['type']){
  869 + st = item['type'].toLowerCase();
  870 + }
  871 +
  872 + var string2 = valueN.toLowerCase();
  873 + if (st.indexOf(string2) > -1) {
  874 + console.log(st);
  875 + resultArray.push(item);
  876 + }
  877 +
  878 + }
  879 +
  880 + this.resultDataOnHold4 = resultArray;
  881 + }
  882 +
754 getButton5(valueN){ 883 getButton5(valueN){
755 console.log(valueN); 884 console.log(valueN);
756 885
@@ -779,6 +908,35 @@ export class DashboardComponent implements OnInit { @@ -779,6 +908,35 @@ export class DashboardComponent implements OnInit {
779 this.resultData5 = resultArray; 908 this.resultData5 = resultArray;
780 } 909 }
781 910
  911 + /* buttondataOnhold1 */
  912 + getButton5Onhold(valueN){
  913 + console.log(valueN);
  914 +
  915 + if (this.Show5Onhold.length === 0) {
  916 + return this.Show5Onhold;
  917 + }
  918 +
  919 + const resultArray = [];
  920 + for (const item of this.Show5Onhold) {
  921 + console.log('item: ', item);
  922 +
  923 + var st = '';
  924 + // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ;
  925 + if(item['type']){
  926 + st = item['type'].toLowerCase();
  927 + }
  928 +
  929 + var string2 = valueN.toLowerCase();
  930 + if (st.indexOf(string2) > -1) {
  931 + console.log(st);
  932 + resultArray.push(item);
  933 + }
  934 +
  935 + }
  936 +
  937 + this.resultDataOnHold5 = resultArray;
  938 + }
  939 +
782 getButton6(valueN){ 940 getButton6(valueN){
783 console.log(valueN); 941 console.log(valueN);
784 942
@@ -807,6 +965,35 @@ export class DashboardComponent implements OnInit { @@ -807,6 +965,35 @@ export class DashboardComponent implements OnInit {
807 this.resultData6 = resultArray; 965 this.resultData6 = resultArray;
808 } 966 }
809 967
  968 + /* buttondataOnhold6 */
  969 + getButton6Onhold(valueN){
  970 + console.log(valueN);
  971 +
  972 + if (this.Show6Onhold.length === 0) {
  973 + return this.Show6Onhold;
  974 + }
  975 +
  976 + const resultArray = [];
  977 + for (const item of this.Show6Onhold) {
  978 + console.log('item: ', item);
  979 +
  980 + var st = '';
  981 + // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ;
  982 + if(item['type']){
  983 + st = item['type'].toLowerCase();
  984 + }
  985 +
  986 + var string2 = valueN.toLowerCase();
  987 + if (st.indexOf(string2) > -1) {
  988 + console.log(st);
  989 + resultArray.push(item);
  990 + }
  991 +
  992 + }
  993 +
  994 + this.resultDataOnHold6 = resultArray;
  995 + }
  996 +
810 getButton7(valueN){ 997 getButton7(valueN){
811 console.log(valueN); 998 console.log(valueN);
812 999
@@ -835,6 +1022,35 @@ export class DashboardComponent implements OnInit { @@ -835,6 +1022,35 @@ export class DashboardComponent implements OnInit {
835 this.resultData7 = resultArray; 1022 this.resultData7 = resultArray;
836 } 1023 }
837 1024
  1025 + /* buttondataOnhold7 */
  1026 + getButton7Onhold(valueN){
  1027 + console.log(valueN);
  1028 +
  1029 + if (this.Show7Onhold.length === 0) {
  1030 + return this.Show7Onhold;
  1031 + }
  1032 +
  1033 + const resultArray = [];
  1034 + for (const item of this.Show7Onhold) {
  1035 + console.log('item: ', item);
  1036 +
  1037 + var st = '';
  1038 + // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ;
  1039 + if(item['type']){
  1040 + st = item['type'].toLowerCase();
  1041 + }
  1042 +
  1043 + var string2 = valueN.toLowerCase();
  1044 + if (st.indexOf(string2) > -1) {
  1045 + console.log(st);
  1046 + resultArray.push(item);
  1047 + }
  1048 +
  1049 + }
  1050 +
  1051 + this.resultDataOnHold7 = resultArray;
  1052 + }
  1053 +
838 /////////////Get data come to use////////////////////// 1054 /////////////Get data come to use//////////////////////
839 1055
840 1056