From 88d3a7ba84b277d19f04d51990ab1ac6cdd6c45b Mon Sep 17 00:00:00 2001
From: DESKTOP-D5ILJ4S\flr_3 <flr_3214@hotmail.co.th>
Date: Tue, 24 Jul 2018 12:05:39 +0700
Subject: [PATCH] เหลือจัด layout

---
 src/app/dashboard/dashboard.component.html | 2 +-
 src/app/dashboard/dashboard.component.ts   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/dashboard/dashboard.component.html b/src/app/dashboard/dashboard.component.html
index 8abd9d6..7a2a2ac 100644
--- a/src/app/dashboard/dashboard.component.html
+++ b/src/app/dashboard/dashboard.component.html
@@ -936,7 +936,7 @@
           <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;"><span class="badge2" style="margin-top: 20px;"> {{ name.num }} </span> {{ name.name }}
+            style="margin-left: 5px; margin-top: 2px;"><span class="badge2" style="float: right; position: absolute; margin-top: -15px; margin-left: 23px;"> {{ name.num }} </span> {{ name.name }}
           </button>
           <!-- <span class="badge"> {{resultNum7}} </span> -->
           <hr>
diff --git a/src/app/dashboard/dashboard.component.ts b/src/app/dashboard/dashboard.component.ts
index 8afc955..6d92414 100644
--- a/src/app/dashboard/dashboard.component.ts
+++ b/src/app/dashboard/dashboard.component.ts
@@ -98,7 +98,7 @@ export class DashboardComponent implements OnInit {
       id: 33,
       name: 'All',
       valueN: '',
-      num : ''
+      num : 0
     },
     {
       id: 1,
@@ -870,8 +870,10 @@ setInterval(async () => {
       for(var o=0;o<this.sum.length;o++){
         if (this.ButtonValue[k].valueN === this.sum[o].name) {
           this.ButtonValue[k].num = this.sum[o].value;
+          this.ButtonValue[0].num = this.resultNum9;
         }
       }
+
     }
   
     console.log('summ',this.ButtonValue);
--
libgit2 0.21.2