SourceCode / smartzone-home

Download as
Browse Code »

Commit 8474009ae730d42a943777b84029c1cfc72528c3

Authored by trainee
1 parent 6d2f2c85
Exists in master

api จุดๆ

Showing 4 changed files with 23 additions and 16 deletions   Show diff stats
src/app/dashboard/dashboard.component.html
  Diff comments   View file @8474009
1 1
2 <!-- งานใหม่ --> 2 <!-- งานใหม่ -->
3 <!-- Active --> 3 <!-- Active -->
4 -  
5 <div class="portlet-body"> 4 <div class="portlet-body">
6 <div class="tabbable-custom nav-justified"> 5 <div class="tabbable-custom nav-justified">
7 <ul class="nav nav-tabs"> 6 <ul class="nav nav-tabs">
@@ -69,7 +68,8 @@ @@ -69,7 +68,8 @@
69 <tr> 68 <tr>
70 <div class="details" style="width: calc(100% - 50px);"> 69 <div class="details" style="width: calc(100% - 50px);">
71 <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div> 70 <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div>
72 - <div class="desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div> 71 + <!-- <div class="a desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div> -->
  72 + <div class="a desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
73 </div> 73 </div>
74 </tr> 74 </tr>
75 </table> 75 </table>
@@ -124,7 +124,7 @@ @@ -124,7 +124,7 @@
124 <tr> 124 <tr>
125 <div class="details" style="width: calc(100% - 50px);"> 125 <div class="details" style="width: calc(100% - 50px);">
126 <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div> 126 <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div>
127 - <div class="desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div> 127 + <div class="a desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
128 </div> 128 </div>
129 </tr> 129 </tr>
130 </table> 130 </table>
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
177 <tr> 177 <tr>
178 <div class="details" style="width: calc(100% - 50px);"> 178 <div class="details" style="width: calc(100% - 50px);">
179 <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div> 179 <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div>
180 - <div class="desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div> 180 + <div class="a desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
181 </div> 181 </div>
182 </tr> 182 </tr>
183 </table> 183 </table>
@@ -232,7 +232,7 @@ @@ -232,7 +232,7 @@
232 <tr> 232 <tr>
233 <div class="details" style="width: calc(100% - 50px);"> 233 <div class="details" style="width: calc(100% - 50px);">
234 <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div> 234 <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div>
235 - <div class="desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div> 235 + <div class="a desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
236 </div> 236 </div>
237 </tr> 237 </tr>
238 </table> 238 </table>
@@ -285,7 +285,7 @@ @@ -285,7 +285,7 @@
285 <tr> 285 <tr>
286 <div class="details" style="width: calc(100% - 50px);"> 286 <div class="details" style="width: calc(100% - 50px);">
287 <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div> 287 <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div>
288 - <div class="desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div> 288 + <div class="a desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
289 </div> 289 </div>
290 </tr> 290 </tr>
291 </table> 291 </table>
@@ -340,7 +340,7 @@ @@ -340,7 +340,7 @@
340 <tr> 340 <tr>
341 <div class="details" style="width: calc(100% - 50px);"> 341 <div class="details" style="width: calc(100% - 50px);">
342 <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div> 342 <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div>
343 - <div class="desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div> 343 + <div class="a desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
344 </div> 344 </div>
345 </tr> 345 </tr>
346 </table> 346 </table>
@@ -393,7 +393,7 @@ @@ -393,7 +393,7 @@
393 <tr> 393 <tr>
394 <div class="details" style="width: calc(100% - 50px);"> 394 <div class="details" style="width: calc(100% - 50px);">
395 <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div> 395 <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div>
396 - <div class="desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div> 396 + <div class="a desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
397 </div> 397 </div>
398 </tr> 398 </tr>
399 </table> 399 </table>
@@ -448,7 +448,7 @@ @@ -448,7 +448,7 @@
448 <tr> 448 <tr>
449 <div class="details" style="width: calc(100% - 50px);"> 449 <div class="details" style="width: calc(100% - 50px);">
450 <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div> 450 <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div>
451 - <div class="desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div> 451 + <div class="a desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
452 </div> 452 </div>
453 </tr> 453 </tr>
454 </table> 454 </table>
@@ -501,7 +501,7 @@ @@ -501,7 +501,7 @@
501 <tr> 501 <tr>
502 <div class="details" style="width: calc(100% - 50px);"> 502 <div class="details" style="width: calc(100% - 50px);">
503 <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div> 503 <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div>
504 - <div class="desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div> 504 + <div class="a desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
505 </div> 505 </div>
506 </tr> 506 </tr>
507 </table> 507 </table>
@@ -556,7 +556,7 @@ @@ -556,7 +556,7 @@
556 <tr> 556 <tr>
557 <div class="details" style="width: calc(100% - 50px);"> 557 <div class="details" style="width: calc(100% - 50px);">
558 <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div> 558 <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div>
559 - <div class="desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div> 559 + <div class="a desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
560 </div> 560 </div>
561 </tr> 561 </tr>
562 </table> 562 </table>
@@ -609,7 +609,7 @@ @@ -609,7 +609,7 @@
609 <tr> 609 <tr>
610 <div class="details" style="width: calc(100% - 50px);"> 610 <div class="details" style="width: calc(100% - 50px);">
611 <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div> 611 <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div>
612 - <div class="desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div> 612 + <div class="a desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
613 </div> 613 </div>
614 </tr> 614 </tr>
615 </table> 615 </table>
@@ -664,7 +664,7 @@ @@ -664,7 +664,7 @@
664 <tr> 664 <tr>
665 <div class="details" style="width: calc(100% - 50px);"> 665 <div class="details" style="width: calc(100% - 50px);">
666 <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div> 666 <div class="desc" style="text-align: left; color: black; margin-top: 120px;">{{item.COMMENT | short}}</div>
667 - <div class="desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div> 667 + <div class="a desc" style="text-align: left; color: black;">{{item.COMMENT | font}}</div>
668 </div> 668 </div>
669 </tr> 669 </tr>
670 </table> 670 </table>
src/app/dashboard/dashboard.component.scss
  Diff comments   View file @8474009
@@ -14,6 +14,14 @@ @@ -14,6 +14,14 @@
14 14
15 } 15 }
16 16
  17 +.a {
  18 + white-space: nowrap;
  19 + width: 250px;
  20 + overflow: hidden;
  21 + text-overflow:ellipsis;
  22 +}
  23 +
  24 +
17 .dashboard-stat { 25 .dashboard-stat {
18 overflow: visible; 26 overflow: visible;
19 height: 270px; 27 height: 270px;
src/app/dashboard/dashboard.component.ts
  Diff comments   View file @8474009
@@ -18,7 +18,7 @@ export class DashboardComponent implements OnInit { @@ -18,7 +18,7 @@ export class DashboardComponent implements OnInit {
18 getColorDay(days){ 18 getColorDay(days){
19 console.log(days) 19 console.log(days)
20 20
21 - if(days > 0 && days <= 7){ 21 + if(days >= 0 && days <= 7){
22 return '#32c5d2'; 22 return '#32c5d2';
23 } 23 }
24 24
src/app/dashboard/font.ts
  Diff comments   View file @8474009
@@ -9,8 +9,7 @@ export class PontPipe implements PipeTransform { @@ -9,8 +9,7 @@ export class PontPipe implements PipeTransform {
9 value = ''; 9 value = '';
10 } 10 }
11 if (value.length > 19) { 11 if (value.length > 19) {
12 - var text = value.substr(19, 35);  
13 - 12 + return value.substr(19, 50);
14 } 13 }
15 return value; 14 return value;
16 } 15 }