From 8474009ae730d42a943777b84029c1cfc72528c3 Mon Sep 17 00:00:00 2001
From: DESKTOP-D5ILJ4S\flr_3 <flr_3214@hotmail.co.th>
Date: Thu, 12 Jul 2018 10:15:14 +0700
Subject: [PATCH] api จุดๆ

---
 src/app/dashboard/dashboard.component.html | 26 +++++++++++++-------------
 src/app/dashboard/dashboard.component.scss |  8 ++++++++
 src/app/dashboard/dashboard.component.ts   |  2 +-
 src/app/dashboard/font.ts                  |  3 +--
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/app/dashboard/dashboard.component.html b/src/app/dashboard/dashboard.component.html
index a987071..c50480a 100644
--- a/src/app/dashboard/dashboard.component.html
+++ b/src/app/dashboard/dashboard.component.html
@@ -1,7 +1,6 @@
 
     <!-- งานใหม่ -->
   <!-- Active -->
-  
 <div class="portlet-body">
   <div class="tabbable-custom nav-justified">
     <ul class="nav nav-tabs">
@@ -69,7 +68,8 @@
                   <tr>
                     <div class="details" style="width: calc(100% - 50px);">
                       <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div>
-                      <div class="desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
+                      <!-- <div class="a desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div> -->
+                      <div class="a desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
                     </div>
                   </tr>
                 </table>
@@ -124,7 +124,7 @@
                     <tr>
                       <div class="details" style="width: calc(100% - 50px);">
                         <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div>
-                        <div class="desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
+                        <div class="a desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
                       </div>
                     </tr>
                   </table>
@@ -177,7 +177,7 @@
                   <tr>
                     <div class="details" style="width: calc(100% - 50px);">
                       <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div>
-                      <div class="desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
+                      <div class="a desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
                     </div>
                   </tr>
                 </table>
@@ -232,7 +232,7 @@
                     <tr>
                       <div class="details" style="width: calc(100% - 50px);">
                         <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div>
-                        <div class="desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
+                        <div class="a desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
                       </div>
                     </tr>
                   </table>
@@ -285,7 +285,7 @@
                   <tr>
                     <div class="details" style="width: calc(100% - 50px);">
                       <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div>
-                      <div class="desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div> 
+                      <div class="a desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
                     </div>
                   </tr>
                 </table>
@@ -340,7 +340,7 @@
                     <tr>
                       <div class="details" style="width: calc(100% - 50px);">
                         <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div>
-                      <div class="desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
+                        <div class="a desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
                       </div>
                     </tr>
                   </table>
@@ -393,7 +393,7 @@
                       <tr>
                         <div class="details" style="width: calc(100% - 50px);">
                           <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div>
-                          <div class="desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
+                          <div class="a desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
                         </div>
                       </tr>
                     </table>
@@ -448,7 +448,7 @@
                         <tr>
                           <div class="details" style="width: calc(100% - 50px);">
                             <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div>
-                      <div class="desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
+                            <div class="a desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
                           </div>
                         </tr>
                       </table>
@@ -501,7 +501,7 @@
                       <tr>
                         <div class="details" style="width: calc(100% - 50px);">
                           <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div>
-                      <div class="desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
+                          <div class="a desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
                         </div>
                       </tr>
                     </table>
@@ -556,7 +556,7 @@
                         <tr>
                           <div class="details" style="width: calc(100% - 50px);">
                             <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div>
-                      <div class="desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
+                            <div class="a desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
                           </div>
                         </tr>
                       </table>
@@ -609,7 +609,7 @@
                       <tr>
                         <div class="details" style="width: calc(100% - 50px);">
                           <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div>
-                      <div class="desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
+                          <div class="a desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
                         </div>
                       </tr>
                     </table>
@@ -664,7 +664,7 @@
                         <tr>
                           <div class="details" style="width: calc(100% - 50px);">
                             <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div>
-                      <div class="desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
+                            <div class="a desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
                           </div>
                         </tr>
                       </table>
diff --git a/src/app/dashboard/dashboard.component.scss b/src/app/dashboard/dashboard.component.scss
index ef61781..6ef4749 100644
--- a/src/app/dashboard/dashboard.component.scss
+++ b/src/app/dashboard/dashboard.component.scss
@@ -14,6 +14,14 @@
   
 }
 
+.a {
+  white-space: nowrap; 
+  width: 250px; 
+  overflow: hidden;
+  text-overflow:ellipsis;
+}
+
+
 .dashboard-stat {
   overflow: visible;
   height: 270px;
diff --git a/src/app/dashboard/dashboard.component.ts b/src/app/dashboard/dashboard.component.ts
index 4a4e7fb..ec1c9d1 100644
--- a/src/app/dashboard/dashboard.component.ts
+++ b/src/app/dashboard/dashboard.component.ts
@@ -18,7 +18,7 @@ export class DashboardComponent implements OnInit {
   getColorDay(days){
     console.log(days)
 
-      if(days > 0 && days <= 7){
+      if(days >= 0 && days <= 7){
         return '#32c5d2';
       }
       
diff --git a/src/app/dashboard/font.ts b/src/app/dashboard/font.ts
index ca0ca16..3bf7242 100644
--- a/src/app/dashboard/font.ts
+++ b/src/app/dashboard/font.ts
@@ -9,8 +9,7 @@ export class PontPipe implements PipeTransform {
             value = '';
         }
         if (value.length > 19) {
-            var text = value.substr(19, 35);
-
+            return value.substr(19, 50);
         }
         return value;
     }
--
libgit2 0.21.2