SourceCode / smartzone-home

Download as
Browse Code »

Commit 53ff2af7ba8668121d97ccdd1c8a79615c35a52a

Authored by trainee
1 parent 1b630ad7
Exists in master

พยายามทำ 0 tricket อยู่

Showing 2 changed files with 19 additions and 18 deletions   Show diff stats
src/app/dashboard/dashboard.component.html
  Diff comments   View file @53ff2af
@@ -692,7 +692,7 @@ @@ -692,7 +692,7 @@
692 <br> 692 <br>
693 <button type="button" class="btn btn-circle button " *ngFor="let name of ButtonValue" (click)="getButton7(name.valueN);getButton7Onhold(name.valueN);" style="margin-left: 5px; margin-top: 2px;">{{ name.name }}</button> 693 <button type="button" class="btn btn-circle button " *ngFor="let name of ButtonValue" (click)="getButton7(name.valueN);getButton7Onhold(name.valueN);" style="margin-left: 5px; margin-top: 2px;">{{ name.name }}</button>
694 <hr> 694 <hr>
695 - 695 + <p *ngIf="showSecret" style="text-align: center;">0 Tricket</p>
696 <br> 696 <br>
697 </div> 697 </div>
698 <div class="panel-body"> 698 <div class="panel-body">
src/app/dashboard/dashboard.component.ts
  Diff comments   View file @53ff2af
@@ -655,10 +655,11 @@ export class DashboardComponent implements OnInit { @@ -655,10 +655,11 @@ export class DashboardComponent implements OnInit {
655 } 655 }
656 656
657 // this.Show = Object.assign(this.resultData7); 657 // this.Show = Object.assign(this.resultData7);
658 - console.log('hi', this.Show7) 658 +
659 659
660 } else { 660 } else {
661 this.resultData7 = []; 661 this.resultData7 = [];
  662 + console.log('hi', this.resultData7)
662 } 663 }
663 } catch (error) { 664 } catch (error) {
664 console.log(error); 665 console.log(error);
@@ -762,22 +763,19 @@ setInterval(async () =&gt; { @@ -762,22 +763,19 @@ setInterval(async () =&gt; {
762 }, 600000); 763 }, 600000);
763 764
764 } 765 }
  766 + // btnSelect(selVal) {
  767 + // // console.log(selVal);
  768 + // let arr = [];
  769 + // for (let i in selVal) {
  770 + // arr.push(selVal);
  771 + // }
765 772
  773 + // // console.log('select1 : ', arr);
766 774
  775 + // this.Namebtn = arr;
767 776
768 - btnSelect(selVal) {  
769 - // console.log(selVal);  
770 - let arr = [];  
771 - for (let i in selVal) {  
772 - arr.push(selVal);  
773 - }  
774 -  
775 - // console.log('select1 : ', arr);  
776 -  
777 - this.Namebtn = arr;  
778 -  
779 - console.log('select : ', this.Namebtn);  
780 - } 777 + // console.log('select : ', this.Namebtn);
  778 + // }
781 779
782 getButton1(valueN) { 780 getButton1(valueN) {
783 // console.log(valueN); 781 // console.log(valueN);
@@ -835,6 +833,7 @@ setInterval(async () =&gt; { @@ -835,6 +833,7 @@ setInterval(async () =&gt; {
835 } 833 }
836 834
837 this.resultDataOnHold = resultArray; 835 this.resultDataOnHold = resultArray;
  836 +
838 } 837 }
839 838
840 getButton2(valueN) { 839 getButton2(valueN) {
@@ -1131,7 +1130,7 @@ setInterval(async () =&gt; { @@ -1131,7 +1130,7 @@ setInterval(async () =&gt; {
1131 1130
1132 const resultArray = []; 1131 const resultArray = [];
1133 for (const item of this.Show7) { 1132 for (const item of this.Show7) {
1134 - console.log('item: ', item); 1133 + // console.log('item: ', item);
1135 1134
1136 var st = ''; 1135 var st = '';
1137 // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ; 1136 // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ;
@@ -1141,12 +1140,11 @@ setInterval(async () =&gt; { @@ -1141,12 +1140,11 @@ setInterval(async () =&gt; {
1141 1140
1142 var string2 = valueN.toLowerCase(); 1141 var string2 = valueN.toLowerCase();
1143 if (st.indexOf(string2) > -1) { 1142 if (st.indexOf(string2) > -1) {
1144 - console.log(st); 1143 + // console.log(st);
1145 resultArray.push(item); 1144 resultArray.push(item);
1146 } 1145 }
1147 1146
1148 } 1147 }
1149 -  
1150 this.resultData7 = resultArray; 1148 this.resultData7 = resultArray;
1151 } 1149 }
1152 1150
@@ -1177,6 +1175,9 @@ setInterval(async () =&gt; { @@ -1177,6 +1175,9 @@ setInterval(async () =&gt; {
1177 } 1175 }
1178 1176
1179 this.resultDataOnHold7 = resultArray; 1177 this.resultDataOnHold7 = resultArray;
  1178 + // if(this.resultDataOnHold7 === []){
  1179 + // this.showSecret = !this.showSecret;
  1180 + // }
1180 } 1181 }
1181 1182
1182 /////////////Get data come to use////////////////////// 1183 /////////////Get data come to use//////////////////////