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 3 <!-- Active -->
4   -
5 4 <div class="portlet-body">
6 5 <div class="tabbable-custom nav-justified">
7 6 <ul class="nav nav-tabs">
... ... @@ -69,7 +68,8 @@
69 68 <tr>
70 69 <div class="details" style="width: calc(100% - 50px);">
71 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 73 </div>
74 74 </tr>
75 75 </table>
... ... @@ -124,7 +124,7 @@
124 124 <tr>
125 125 <div class="details" style="width: calc(100% - 50px);">
126 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 128 </div>
129 129 </tr>
130 130 </table>
... ... @@ -177,7 +177,7 @@
177 177 <tr>
178 178 <div class="details" style="width: calc(100% - 50px);">
179 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 181 </div>
182 182 </tr>
183 183 </table>
... ... @@ -232,7 +232,7 @@
232 232 <tr>
233 233 <div class="details" style="width: calc(100% - 50px);">
234 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 236 </div>
237 237 </tr>
238 238 </table>
... ... @@ -285,7 +285,7 @@
285 285 <tr>
286 286 <div class="details" style="width: calc(100% - 50px);">
287 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 289 </div>
290 290 </tr>
291 291 </table>
... ... @@ -340,7 +340,7 @@
340 340 <tr>
341 341 <div class="details" style="width: calc(100% - 50px);">
342 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 344 </div>
345 345 </tr>
346 346 </table>
... ... @@ -393,7 +393,7 @@
393 393 <tr>
394 394 <div class="details" style="width: calc(100% - 50px);">
395 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 397 </div>
398 398 </tr>
399 399 </table>
... ... @@ -448,7 +448,7 @@
448 448 <tr>
449 449 <div class="details" style="width: calc(100% - 50px);">
450 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 452 </div>
453 453 </tr>
454 454 </table>
... ... @@ -501,7 +501,7 @@
501 501 <tr>
502 502 <div class="details" style="width: calc(100% - 50px);">
503 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 505 </div>
506 506 </tr>
507 507 </table>
... ... @@ -556,7 +556,7 @@
556 556 <tr>
557 557 <div class="details" style="width: calc(100% - 50px);">
558 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 560 </div>
561 561 </tr>
562 562 </table>
... ... @@ -609,7 +609,7 @@
609 609 <tr>
610 610 <div class="details" style="width: calc(100% - 50px);">
611 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 613 </div>
614 614 </tr>
615 615 </table>
... ... @@ -664,7 +664,7 @@
664 664 <tr>
665 665 <div class="details" style="width: calc(100% - 50px);">
666 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 668 </div>
669 669 </tr>
670 670 </table>
... ...
src/app/dashboard/dashboard.component.scss
  Diff comments   View file @8474009
... ... @@ -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 25 .dashboard-stat {
18 26 overflow: visible;
19 27 height: 270px;
... ...
src/app/dashboard/dashboard.component.ts
  Diff comments   View file @8474009
... ... @@ -18,7 +18,7 @@ export class DashboardComponent implements OnInit {
18 18 getColorDay(days){
19 19 console.log(days)
20 20  
21   - if(days > 0 && days <= 7){
  21 + if(days >= 0 && days <= 7){
22 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 9 value = '';
10 10 }
11 11 if (value.length > 19) {
12   - var text = value.substr(19, 35);
13   -
  12 + return value.substr(19, 50);
14 13 }
15 14 return value;
16 15 }
... ...