บึ้มๆ

trainee
1 parent 347ce73a
Showing 2 changed files with 52 additions and 37 deletions Show diff stats
src/app/dashboard/dashboard.component.html
src/app/dashboard/dashboard.component.ts
@@ -935,14 +935,13 @@
           </div>
           <br>
           <br>
-          <button type="button" class="btn btn-circle button "  *ngFor="let name of ButtonValue" (click)="getButton9(name.valueN);getButton9Onhold(name.valueN);"
-            style="margin-left: 5px; margin-top: 2px;"><div *ngIf = "ButtonValue">{{NumType9}}</div> {{ name.name }}
-          </button>
-          <!-- <button type="button" class="btn btn-circle button " *ngFor="let name of ButtonValue" (click)="getButton9(name.valueN);getButton9Onhold(name.valueN);"
-            style="margin-left: 5px; margin-top: 2px;"><div>{{NumType9}}</div> {{ name.name }}
+          <!-- <button type="button" class="btn btn-circle button "  *ngFor="let name of ButtonValue" (click)="getButton9(name.valueN);getButton9Onhold(name.valueN);"
+            style="margin-left: 5px; margin-top: 2px;">  {{ name.name }}
           </button> -->
+          <button type="button" class="btn btn-circle button " *ngFor="let name of ButtonValue" (click)="getButton9(name.valueN);getButton9Onhold(name.valueN);"
+            style="margin-left: 5px; margin-top: 2px;"> {{ name.name }}
+          </button>
           <hr>
-          <p *ngFor="let tt of Type9; let i = index">{{i}} {{tt}}</p>
           <hr>
           <div *ngIf="showSecret1">
             <p style="text-align: left; font-size: 30px;"> 0 Tricket</p>
@@ -3,6 +3,7 @@ import { ActivatedRoute, Router } from &#39;@angular/router&#39;;
 import { ApiService } from '../services/api.service';
 import { CommonService } from '../services/common/common.service';
 import { async } from 'rxjs/internal/scheduler/async';
+import { delay } from '../../../node_modules/rxjs/operators';
 @Component({
   selector: 'app-dashboard',
@@ -71,8 +72,6 @@ export class DashboardComponent implements OnInit {
   resultData9: any;
   resultNum9: number = 0;
   resultDataOnHold9: any;
-  Type9: any = [];
-  NumType9: number = 0;
   Show1: any = [];
   Show1Onhold: any = [];
@@ -103,7 +102,8 @@ export class DashboardComponent implements OnInit {
     {
       id: 1,
       name: 'ACC',
-      valueN: 'acc'
+      valueN: 'acc',
+      num : 0
     },
     {
       id: 2,
@@ -258,7 +258,7 @@ export class DashboardComponent implements OnInit {
     {
       id: 32,
       name: 'WEB',
-      valueN: 'web'
+      valueN: 'web'      
     }
   ];
@@ -266,6 +266,12 @@ export class DashboardComponent implements OnInit {
   showSecret1: boolean = false;
   showSecret2: boolean = false;
+  // summary:any = {};
+  // summary = {};
+  Type9: any = [];
+  NumType9: number = 0;
+  ShowType: any = [];
+
   // onToggleDetails() {
   //   // this.showSecret = !this.showSecret;
   //   if(this.ShowNull.length === 0){
@@ -300,7 +306,7 @@ export class DashboardComponent implements OnInit {
         this.showSecret = !this.showSecret;
       }
     } catch (error) {
-      console.log(error);
+      // console.log(error);
     }
     setInterval(async () => {
@@ -330,7 +336,7 @@ export class DashboardComponent implements OnInit {
         this.resultDataOnHold = [];
       }
     } catch (error) {
-      console.log(error);
+      // console.log(error);
     }
     setInterval(async () => {
@@ -363,7 +369,7 @@ export class DashboardComponent implements OnInit {
         this.resultData2 = [];
       }
     } catch (error) {
-      console.log(error);
+      // console.log(error);
     }
     setInterval(async () => {
@@ -393,7 +399,7 @@ export class DashboardComponent implements OnInit {
         this.resultDataOnHold2 = [];
       }
     } catch (error) {
-      console.log(error);
+      // console.log(error);
     }
     setInterval(async () => {
@@ -425,7 +431,7 @@ export class DashboardComponent implements OnInit {
         this.resultData3 = [];
       }
     } catch (error) {
-      console.log(error);
+      // console.log(error);
     }
     setInterval(async () => {
@@ -455,7 +461,7 @@ export class DashboardComponent implements OnInit {
         this.resultDataOnHold3 = [];
       }
     } catch (error) {
-      console.log(error);
+      // console.log(error);
     }
     setInterval(async () => {
@@ -485,7 +491,7 @@ export class DashboardComponent implements OnInit {
         this.resultData4 = [];
       }
     } catch (error) {
-      console.log(error);
+      // console.log(error);
     }
     setInterval(async () => {
@@ -515,7 +521,7 @@ export class DashboardComponent implements OnInit {
         this.resultDataOnHold4 = [];
       }
     } catch (error) {
-      console.log(error);
+      // console.log(error);
     }
     setInterval(async () => {
@@ -545,7 +551,7 @@ export class DashboardComponent implements OnInit {
         this.resultData5 = [];
       }
     } catch (error) {
-      console.log(error);
+      // console.log(error);
     }
     setInterval(async () => {
@@ -575,7 +581,7 @@ export class DashboardComponent implements OnInit {
         this.resultDataOnHold5 = [];
       }
     } catch (error) {
-      console.log(error);
+      // console.log(error);
     }
     setInterval(async () => {
@@ -604,7 +610,7 @@ export class DashboardComponent implements OnInit {
         this.resultData6 = [];
       }
     } catch (error) {
-      console.log(error);
+      // console.log(error);
     }
     setInterval(async () => {
@@ -634,7 +640,7 @@ export class DashboardComponent implements OnInit {
         this.resultDataOnHold6 = [];
       }
     } catch (error) {
-      console.log(error);
+      // console.log(error);
     }
     setInterval(async () => {
@@ -667,7 +673,7 @@ export class DashboardComponent implements OnInit {
         this.resultData7 = [];
       }
     } catch (error) {
-      console.log(error);
+      // console.log(error);
     }
     setInterval(async () => {
@@ -697,7 +703,7 @@ export class DashboardComponent implements OnInit {
         this.resultDataOnHold7 = [];
       }
     } catch (error) {
-      console.log(error);
+      // console.log(error);
     }
     setInterval(async () => {
@@ -731,7 +737,7 @@ try {
     this.resultData8 = [];
   }
 } catch (error) {
-  console.log(error);
+  // console.log(error);
 }
 setInterval(async () => {
@@ -760,7 +766,7 @@ try {
     this.resultDataOnHold8 = [];
   }
 } catch (error) {
-  console.log(error);
+  // console.log(error);
 }
 setInterval(async () => {
@@ -776,23 +782,33 @@ setInterval(async () =&gt; {
   };
   const response = await this._apiService.post('dynamic', data9);
   if (response !== null) {
+    var t9 =[];
     this.resultData9 = response;
     this.resultData9.link = decodeURIComponent(decodeURIComponent(this.resultData9.link));
     console.log('link: ', this.resultData9.link);
     // tslint:disable-next-line:forin
-    for (const i in this.resultData9) {
-      this.resultData9[i].link = this._common.decodeURI(this.resultData9[i].link);
-      this.resultData9[i].birth_date = this._common.convertDate(this.resultData9[i].birth_date);
+    this.resultData9 = this.resultData9.map(r => {
+      console.log(r)
+      // t9: r.type
+      r.link = this._common.decodeURI(r.link);
+      r.birth_date = this._common.convertDate(r.birth_date);
       this.resultNum9 = this.resultData9.length;
-      this.Show9.push(this.resultData9[i]);
-      console.log('show',this.Show9);
-      this.Type9.push(this.resultData9[i].type);
-    }
+      this.Show9.push(r);
+      this.Type9.push(r.type);
+      t9.push(r.type);
+      r.t9 = t9;
+      return r;
+    })
+
+
+    console.log("t99:", t9);
   } else {
     this.resultData9 = [];
   }
+  // if(summary){
+  // }
 } catch (error) {
-  console.log(error);
+  // console.log(error);
 }
 setInterval(async () => {
@@ -822,7 +838,7 @@ try {
     this.resultDataOnHold9 = [];
   }
 } catch (error) {
-  console.log(error);
+  // console.log(error);
 }
 setInterval(async () => {
@@ -1436,7 +1452,7 @@ setInterval(async () =&gt; {
       if (response !== null) {
         this.resultDataOnHold = response;
         this.resultDataOnHold.link = decodeURIComponent(decodeURIComponent(this.resultDataOnHold.link));
-        console.log('link: ', this.resultDataOnHold.link);
+        // console.log('link: ', this.resultDataOnHold.link);
         // tslint:disable-next-line:forin
         for (const i in this.resultDataOnHold) {
           this.resultDataOnHold[i].link = this._common.decodeURI(this.resultDataOnHold[i].link);
@@ -1446,7 +1462,7 @@ setInterval(async () =&gt; {
         this.resultDataOnHold = [];
       }
     } catch (error) {
-      console.log(error);
+      // console.log(error);
     }
   }