SourceCode / smartzone-home

Download as
Browse Code »

Commit 3f0c59dbb4854fb2ee60415f3c1428b9da26ff0f

Authored by trainee
1 parent 2db09f73
Exists in master

nottification number

Showing 2 changed files with 18 additions and 6 deletions   Show diff stats
src/app/dashboard/dashboard.component.html
  Diff comments   View file @3f0c59d
@@ -6,22 +6,22 @@ @@ -6,22 +6,22 @@
6 <div class="tabbable-custom nav-justified"> 6 <div class="tabbable-custom nav-justified">
7 <ul class="nav nav-tabs"> 7 <ul class="nav nav-tabs">
8 <li class="active sbold font"> 8 <li class="active sbold font">
9 - <a href="#tab1" data-toggle="tab" aria-expanded="true">ติดตั้ง <span class="badge"> 5 </span></a> 9 + <a href="#tab1" data-toggle="tab" aria-expanded="true">ติดตั้ง <span class="badge"> {{resultNum}} </span></a>
10 </li> 10 </li>
11 <li class="sbold"> 11 <li class="sbold">
12 - <a href="#tab2" data-toggle="tab" aria-expanded="false">RND <span class="badge"> 3 </span></a> 12 + <a href="#tab2" data-toggle="tab" aria-expanded="false">RND <span class="badge"> {{resultNum2}} </span></a>
13 </li> 13 </li>
14 <li class="sbold"> 14 <li class="sbold">
15 - <a href="#tab3" data-toggle="tab" aria-expanded="false">SDE+SDN <span class="badge"> 10 </span></a> 15 + <a href="#tab3" data-toggle="tab" aria-expanded="false">SDE+SDN <span class="badge"> {{resultNum3}} </span></a>
16 </li> 16 </li>
17 <li class="sbold"> 17 <li class="sbold">
18 - <a href="#tab4" data-toggle="tab" aria-expanded="false">AP Down <span class="badge"> 60 </span></a> 18 + <a href="#tab4" data-toggle="tab" aria-expanded="false">AP Down <span class="badge"> {{resultNum4}} </span></a>
19 </li> 19 </li>
20 <li class="sbold"> 20 <li class="sbold">
21 - <a href="#tab5" data-toggle="tab" aria-expanded="false">BNW+NDS+NED+NES+NET <span class="badge"> 19 </span></a> 21 + <a href="#tab5" data-toggle="tab" aria-expanded="false">BNW+NDS+NED+NES+NET <span class="badge"> {{resultNum5}} </span></a>
22 </li> 22 </li>
23 <li class="sbold"> 23 <li class="sbold">
24 - <a href="#tab6" data-toggle="tab" aria-expanded="false">CUS <span class="badge"> 1 </span></a> 24 + <a href="#tab6" data-toggle="tab" aria-expanded="false">CUS <span class="badge"> {{resultNum6}} </span></a>
25 </li> 25 </li>
26 </ul> 26 </ul>
27 <div class="tab-content"> 27 <div class="tab-content">
src/app/dashboard/dashboard.component.ts
  Diff comments   View file @3f0c59d
@@ -39,21 +39,27 @@ export class DashboardComponent implements OnInit { @@ -39,21 +39,27 @@ export class DashboardComponent implements OnInit {
39 ) { } 39 ) { }
40 40
41 resultData: any; 41 resultData: any;
  42 + resultNum:number = 0;
42 resultDataOnHold: any; 43 resultDataOnHold: any;
43 44
44 resultData2: any; 45 resultData2: any;
  46 + resultNum2:number = 0;
45 resultDataOnHold2: any; 47 resultDataOnHold2: any;
46 48
47 resultData3: any; 49 resultData3: any;
  50 + resultNum3:number = 0;
48 resultDataOnHold3: any; 51 resultDataOnHold3: any;
49 52
50 resultData4: any; 53 resultData4: any;
  54 + resultNum4:number = 0;
51 resultDataOnHold4: any; 55 resultDataOnHold4: any;
52 56
53 resultData5: any; 57 resultData5: any;
  58 + resultNum5:number = 0;
54 resultDataOnHold5: any; 59 resultDataOnHold5: any;
55 60
56 resultData6: any; 61 resultData6: any;
  62 + resultNum6:number = 0;
57 resultDataOnHold6: any; 63 resultDataOnHold6: any;
58 64
59 65
@@ -75,6 +81,7 @@ export class DashboardComponent implements OnInit { @@ -75,6 +81,7 @@ export class DashboardComponent implements OnInit {
75 for (const i in this.resultData) { 81 for (const i in this.resultData) {
76 this.resultData[i].link = this._common.decodeURI(this.resultData[i].link); 82 this.resultData[i].link = this._common.decodeURI(this.resultData[i].link);
77 this.resultData[i].birth_date = this._common.convertDate(this.resultData[i].birth_date); 83 this.resultData[i].birth_date = this._common.convertDate(this.resultData[i].birth_date);
  84 + this.resultNum = this.resultData.length;
78 } 85 }
79 } else { 86 } else {
80 this.resultData = []; 87 this.resultData = [];
@@ -133,6 +140,7 @@ export class DashboardComponent implements OnInit { @@ -133,6 +140,7 @@ export class DashboardComponent implements OnInit {
133 for (const i in this.resultData2) { 140 for (const i in this.resultData2) {
134 this.resultData2[i].link = this._common.decodeURI(this.resultData2[i].link); 141 this.resultData2[i].link = this._common.decodeURI(this.resultData2[i].link);
135 this.resultData2[i].birth_date = this._common.convertDate(this.resultData2[i].birth_date); 142 this.resultData2[i].birth_date = this._common.convertDate(this.resultData2[i].birth_date);
  143 + this.resultNum2 = this.resultData2.length;
136 } 144 }
137 } else { 145 } else {
138 this.resultData2 = []; 146 this.resultData2 = [];
@@ -192,6 +200,7 @@ export class DashboardComponent implements OnInit { @@ -192,6 +200,7 @@ export class DashboardComponent implements OnInit {
192 for (const i in this.resultData3) { 200 for (const i in this.resultData3) {
193 this.resultData3[i].link = this._common.decodeURI(this.resultData3[i].link); 201 this.resultData3[i].link = this._common.decodeURI(this.resultData3[i].link);
194 this.resultData3[i].birth_date = this._common.convertDate(this.resultData3[i].birth_date); 202 this.resultData3[i].birth_date = this._common.convertDate(this.resultData3[i].birth_date);
  203 + this.resultNum3 = this.resultData3.length;
195 } 204 }
196 } else { 205 } else {
197 this.resultData3 = []; 206 this.resultData3 = [];
@@ -249,6 +258,7 @@ export class DashboardComponent implements OnInit { @@ -249,6 +258,7 @@ export class DashboardComponent implements OnInit {
249 for (const i in this.resultData4) { 258 for (const i in this.resultData4) {
250 this.resultData4[i].link = this._common.decodeURI(this.resultData4[i].link); 259 this.resultData4[i].link = this._common.decodeURI(this.resultData4[i].link);
251 this.resultData4[i].birth_date = this._common.convertDate(this.resultData4[i].birth_date); 260 this.resultData4[i].birth_date = this._common.convertDate(this.resultData4[i].birth_date);
  261 + this.resultNum4 = this.resultData4.length;
252 } 262 }
253 } else { 263 } else {
254 this.resultData4 = []; 264 this.resultData4 = [];
@@ -306,6 +316,7 @@ export class DashboardComponent implements OnInit { @@ -306,6 +316,7 @@ export class DashboardComponent implements OnInit {
306 for (const i in this.resultData5) { 316 for (const i in this.resultData5) {
307 this.resultData5[i].link = this._common.decodeURI(this.resultData5[i].link); 317 this.resultData5[i].link = this._common.decodeURI(this.resultData5[i].link);
308 this.resultData5[i].birth_date = this._common.convertDate(this.resultData5[i].birth_date); 318 this.resultData5[i].birth_date = this._common.convertDate(this.resultData5[i].birth_date);
  319 + this.resultNum5 = this.resultData5.length;
309 } 320 }
310 } else { 321 } else {
311 this.resultData5 = []; 322 this.resultData5 = [];
@@ -362,6 +373,7 @@ export class DashboardComponent implements OnInit { @@ -362,6 +373,7 @@ export class DashboardComponent implements OnInit {
362 for (const i in this.resultData6) { 373 for (const i in this.resultData6) {
363 this.resultData6[i].link = this._common.decodeURI(this.resultData6[i].link); 374 this.resultData6[i].link = this._common.decodeURI(this.resultData6[i].link);
364 this.resultData6[i].birth_date = this._common.convertDate(this.resultData6[i].birth_date); 375 this.resultData6[i].birth_date = this._common.convertDate(this.resultData6[i].birth_date);
  376 + this.resultNum6 = this.resultData6.length;
365 } 377 }
366 } else { 378 } else {
367 this.resultData6 = []; 379 this.resultData6 = [];