Commit 347ce73a23cb440209a7e0f880fccee7f906d2e3

Authored by trainee
1 parent 6257c9d5
Exists in master

test เรียก type

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="active sbold font">  
5 - <a href="#tab1" data-toggle="tab" aria-expanded="true">ติดตั้ง 4 + <li class="sbold font">
  5 + <a href="#tab1" data-toggle="tab" aria-expanded="false">ติดตั้ง
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="sbold">  
45 - <a href="#tab9" data-toggle="tab" aria-expanded="false">Follow 44 + <li class="active sbold">
  45 + <a href="#tab9" data-toggle="tab" aria-expanded="true">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 active" id="tab1"> 56 + <div class="panel tab-pane " 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>
@@ -920,7 +920,7 @@ @@ -920,7 +920,7 @@
920 </div> 920 </div>
921 </div> 921 </div>
922 </div> 922 </div>
923 - <div class="panel tab-pane" id="tab9"> 923 + <div class="panel tab-pane active" id="tab9">
924 <div class="caption"> 924 <div class="caption">
925 <h1 class="icon-bubble font-green-sharp"> 925 <h1 class="icon-bubble font-green-sharp">
926 <span class="caption-subject font-green-sharp sbold font"> Active</span> 926 <span class="caption-subject font-green-sharp sbold font"> Active</span>
@@ -935,9 +935,14 @@ @@ -935,9 +935,14 @@
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: 2px;"><div>{{NumType9}}</div> {{ 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: 2px;"><div *ngIf = "ButtonValue">{{NumType9}}</div> {{ name.name }}
940 </button> 940 </button>
  941 + <!-- <button type="button" class="btn btn-circle button " *ngFor="let name of ButtonValue" (click)="getButton9(name.valueN);getButton9Onhold(name.valueN);"
  942 + style="margin-left: 5px; margin-top: 2px;"><div>{{NumType9}}</div> {{ name.name }}
  943 + </button> -->
  944 + <hr>
  945 + <p *ngFor="let tt of Type9; let i = index">{{i}} {{tt}}</p>
941 <hr> 946 <hr>
942 <div *ngIf="showSecret1"> 947 <div *ngIf="showSecret1">
943 <p style="text-align: left; font-size: 30px;"> 0 Tricket</p> 948 <p style="text-align: left; font-size: 30px;"> 0 Tricket</p>
src/app/dashboard/dashboard.component.ts
@@ -786,28 +786,8 @@ setInterval(async () =&gt; { @@ -786,28 +786,8 @@ setInterval(async () =&gt; {
786 this.resultNum9 = this.resultData9.length; 786 this.resultNum9 = this.resultData9.length;
787 this.Show9.push(this.resultData9[i]); 787 this.Show9.push(this.resultData9[i]);
788 console.log('show',this.Show9); 788 console.log('show',this.Show9);
789 - // this.Type9.push(this.resultData9[i].type);  
790 - }  
791 -  
792 - // for (const item of this.Show9) {  
793 - // // console.log('item: ', item);  
794 -  
795 - // var st = '';  
796 - // if (item['type']) {  
797 - // st = item['type'].toLowerCase();  
798 - // this.Type9.push(st);  
799 - // console.log('st: ', this.Type9);  
800 - // // this.NumType9 = this.Type9.lent;  
801 - // }  
802 -  
803 - // // var string2 = valueN.toLowerCase();  
804 - // // if (st.startsWith(string2)) {  
805 - // // resultArray.push(item);  
806 -  
807 - // // }  
808 - // }  
809 - // console.log('type',this.Type9);  
810 - 789 + this.Type9.push(this.resultData9[i].type);
  790 + }
811 } else { 791 } else {
812 this.resultData9 = []; 792 this.resultData9 = [];
813 } 793 }
@@ -860,7 +840,7 @@ setInterval(async () =&gt; { @@ -860,7 +840,7 @@ setInterval(async () =&gt; {
860 840
861 const resultArray = []; 841 const resultArray = [];
862 for (const item of this.Show1) { 842 for (const item of this.Show1) {
863 - console.log('item: ', item); 843 + // console.log('item: ', item);
864 844
865 var st = ''; 845 var st = '';
866 // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ; 846 // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ;
@@ -890,7 +870,7 @@ setInterval(async () =&gt; { @@ -890,7 +870,7 @@ setInterval(async () =&gt; {
890 870
891 const resultArray = []; 871 const resultArray = [];
892 for (const item of this.Show1Onhold) { 872 for (const item of this.Show1Onhold) {
893 - console.log('item: ', item); 873 + // console.log('item: ', item);
894 874
895 var st = ''; 875 var st = '';
896 // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ; 876 // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ;
@@ -919,7 +899,7 @@ setInterval(async () =&gt; { @@ -919,7 +899,7 @@ setInterval(async () =&gt; {
919 899
920 const resultArray = []; 900 const resultArray = [];
921 for (const item of this.Show2) { 901 for (const item of this.Show2) {
922 - console.log('item: ', item); 902 + // console.log('item: ', item);
923 903
924 var st = ''; 904 var st = '';
925 // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ; 905 // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ;
@@ -948,7 +928,7 @@ setInterval(async () =&gt; { @@ -948,7 +928,7 @@ setInterval(async () =&gt; {
948 928
949 const resultArray = []; 929 const resultArray = [];
950 for (const item of this.Show2Onhold) { 930 for (const item of this.Show2Onhold) {
951 - console.log('item: ', item); 931 + // console.log('item: ', item);
952 932
953 var st = ''; 933 var st = '';
954 // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ; 934 // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ;
@@ -976,7 +956,7 @@ setInterval(async () =&gt; { @@ -976,7 +956,7 @@ setInterval(async () =&gt; {
976 956
977 const resultArray = []; 957 const resultArray = [];
978 for (const item of this.Show3) { 958 for (const item of this.Show3) {
979 - console.log('item: ', item); 959 + // console.log('item: ', item);
980 960
981 var st = ''; 961 var st = '';
982 // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ; 962 // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ;
@@ -1005,7 +985,7 @@ setInterval(async () =&gt; { @@ -1005,7 +985,7 @@ setInterval(async () =&gt; {
1005 985
1006 const resultArray = []; 986 const resultArray = [];
1007 for (const item of this.Show3Onhold) { 987 for (const item of this.Show3Onhold) {
1008 - console.log('item: ', item); 988 + // console.log('item: ', item);
1009 989
1010 var st = ''; 990 var st = '';
1011 // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ; 991 // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ;
@@ -1033,7 +1013,7 @@ setInterval(async () =&gt; { @@ -1033,7 +1013,7 @@ setInterval(async () =&gt; {
1033 1013
1034 const resultArray = []; 1014 const resultArray = [];
1035 for (const item of this.Show4) { 1015 for (const item of this.Show4) {
1036 - console.log('item: ', item); 1016 + // console.log('item: ', item);
1037 1017
1038 var st = ''; 1018 var st = '';
1039 // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ; 1019 // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ;
@@ -1062,7 +1042,7 @@ setInterval(async () =&gt; { @@ -1062,7 +1042,7 @@ setInterval(async () =&gt; {
1062 1042
1063 const resultArray = []; 1043 const resultArray = [];
1064 for (const item of this.Show4Onhold) { 1044 for (const item of this.Show4Onhold) {
1065 - console.log('item: ', item); 1045 + // console.log('item: ', item);
1066 1046
1067 var st = ''; 1047 var st = '';
1068 // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ; 1048 // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ;
@@ -1090,7 +1070,7 @@ setInterval(async () =&gt; { @@ -1090,7 +1070,7 @@ setInterval(async () =&gt; {
1090 1070
1091 const resultArray = []; 1071 const resultArray = [];
1092 for (const item of this.Show5) { 1072 for (const item of this.Show5) {
1093 - console.log('item: ', item); 1073 + // console.log('item: ', item);
1094 1074
1095 var st = ''; 1075 var st = '';
1096 // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ; 1076 // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ;
@@ -1119,7 +1099,7 @@ setInterval(async () =&gt; { @@ -1119,7 +1099,7 @@ setInterval(async () =&gt; {
1119 1099
1120 const resultArray = []; 1100 const resultArray = [];
1121 for (const item of this.Show5Onhold) { 1101 for (const item of this.Show5Onhold) {
1122 - console.log('item: ', item); 1102 + // console.log('item: ', item);
1123 1103
1124 var st = ''; 1104 var st = '';
1125 // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ; 1105 // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ;
@@ -1147,7 +1127,7 @@ setInterval(async () =&gt; { @@ -1147,7 +1127,7 @@ setInterval(async () =&gt; {
1147 1127
1148 const resultArray = []; 1128 const resultArray = [];
1149 for (const item of this.Show6) { 1129 for (const item of this.Show6) {
1150 - console.log('item: ', item); 1130 + // console.log('item: ', item);
1151 1131
1152 var st = ''; 1132 var st = '';
1153 // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ; 1133 // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ;
@@ -1182,7 +1162,7 @@ setInterval(async () =&gt; { @@ -1182,7 +1162,7 @@ setInterval(async () =&gt; {
1182 1162
1183 const resultArray = []; 1163 const resultArray = [];
1184 for (const item of this.Show6Onhold) { 1164 for (const item of this.Show6Onhold) {
1185 - console.log('item: ', item); 1165 + // console.log('item: ', item);
1186 1166
1187 var st = ''; 1167 var st = '';
1188 // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ; 1168 // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ;
@@ -1245,7 +1225,7 @@ setInterval(async () =&gt; { @@ -1245,7 +1225,7 @@ setInterval(async () =&gt; {
1245 1225
1246 const resultArray = []; 1226 const resultArray = [];
1247 for (const item of this.Show7Onhold) { 1227 for (const item of this.Show7Onhold) {
1248 - console.log('item: ', item); 1228 + // console.log('item: ', item);
1249 1229
1250 var st = ''; 1230 var st = '';
1251 // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ; 1231 // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ;
@@ -1315,7 +1295,7 @@ setInterval(async () =&gt; { @@ -1315,7 +1295,7 @@ setInterval(async () =&gt; {
1315 1295
1316 const resultArray = []; 1296 const resultArray = [];
1317 for (const item of this.Show8Onhold) { 1297 for (const item of this.Show8Onhold) {
1318 - console.log('item: ', item); 1298 + // console.log('item: ', item);
1319 1299
1320 var st = ''; 1300 var st = '';
1321 // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ; 1301 // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ;
@@ -1355,8 +1335,8 @@ setInterval(async () =&gt; { @@ -1355,8 +1335,8 @@ setInterval(async () =&gt; {
1355 var st = ''; 1335 var st = '';
1356 if (item['type']) { 1336 if (item['type']) {
1357 st = item['type'].toLowerCase(); 1337 st = item['type'].toLowerCase();
1358 - this.Type9.push(st);  
1359 - console.log('st: ', this.Type9); 1338 + // this.Type9.push(st);
  1339 + // console.log('st: ', this.Type9);
1360 // this.NumType9 = this.Type9.lent; 1340 // this.NumType9 = this.Type9.lent;
1361 } 1341 }
1362 1342
@@ -1376,6 +1356,7 @@ setInterval(async () =&gt; { @@ -1376,6 +1356,7 @@ setInterval(async () =&gt; {
1376 1356
1377 this.resultData9 = resultArray; 1357 this.resultData9 = resultArray;
1378 this.NumType9 = resultArray.length; 1358 this.NumType9 = resultArray.length;
  1359 + // this.Type9.push(this.NumType9);
1379 } 1360 }
1380 1361
1381 /* buttondataOnhold9 */ 1362 /* buttondataOnhold9 */
@@ -1388,7 +1369,7 @@ setInterval(async () =&gt; { @@ -1388,7 +1369,7 @@ setInterval(async () =&gt; {
1388 1369
1389 const resultArray = []; 1370 const resultArray = [];
1390 for (const item of this.Show9Onhold) { 1371 for (const item of this.Show9Onhold) {
1391 - console.log('item: ', item); 1372 + // console.log('item: ', item);
1392 1373
1393 var st = ''; 1374 var st = '';
1394 // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ; 1375 // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ;