SourceCode / smartzone-home

Download as
Browse Code »

Commit c946cc1547f55b9c657ddfec7ed45bc08cfb0f34

Authored by trainee
1 parent 008c44b8
Exists in master

ปรับช่อง search เวลาย่อ และตำแหน่งตรงกัน

Showing 2 changed files with 34 additions and 23 deletions   Show diff stats
src/app/dashboard/dashboard.component.html
  Diff comments   View file @c946cc1
... ... @@ -5,38 +5,39 @@
5 5 <div class="portlet-body">
6 6 <div class="tabbable-custom nav-justified">
7 7 <ul class="nav nav-tabs">
8   - <li class="active sbold font">
9   - <a href="#tab1" data-toggle="tab" aria-expanded="true">Active</a>
  8 + <li class=" sbold font">
  9 + <a href="#tab1" data-toggle="tab" aria-expanded="false">Active</a>
10 10 </li>
11   - <li class="sbold">
12   - <a href="#tab2" data-toggle="tab" aria-expanded="false">page 2</a>
  11 + <li class="active sbold">
  12 + <a href="#tab2" data-toggle="tab" aria-expanded="true">page 2</a>
13 13 </li>
14 14 <li class="sbold">
15 15 <a href="#tab3" data-toggle="tab" aria-expanded="false">page 3</a>
16 16 </li>
17 17 </ul>
18 18 <div class="tab-content">
19   - <div class="panel tab-pane active" id="tab1">
  19 + <div class="panel tab-pane" id="tab1">
20 20 <div class="caption">
21 21 <h1 class="icon-bubble font-green-sharp">
22 22 <span class="caption-subject font-green-sharp sbold font"> Active</span>
23   - <div class="input-icon right" style="margin-left: 820px; margin-top: -20px;" >
24   - <i class="icon-magnifier">
25   - </i>
26   - <input
27   - type="text"
28   - placeholder="Search.."
29   - class="form-control sbold font"
30   - [(ngModel)]="FilterSearch">
31   - </div>
  23 + <!-- <input type="text" placeholder="Search.." class="form-control sbold font"> -->
32 24 </h1>
  25 +
  26 + <div class="input-group" style="float: right; margin-top: 11px;">
  27 + <div class="input-icon right">
  28 + <i class="icon-magnifier">
  29 + </i>
  30 + <input type="text" placeholder="Search.." class="form-control sbold font" [(ngModel)]="FilterSearch">
  31 + </div>
  32 + </div>
  33 +
33 34 <hr>
34 35 <br>
35 36 </div>
36 37 <div class="panel-body">
37 38 <div class="row">
38   - <div class="col-lg-4 col-md-3 col-sm-6 col-xs-12" *ngFor="let item of resultData">
39   - <!-- <div class="col-lg-4 col-md-3 col-sm-6 col-xs-12" *ngFor="let item of resultData | filter:FilterSearch: 'team'"> เรียกได้แค่อย่างเดียว -->
  39 + <!-- <div class="col-lg-4 col-md-3 col-sm-6 col-xs-12" *ngFor="let item of resultData"> -->
  40 + <div class="col-lg-4 col-md-3 col-sm-6 col-xs-12" *ngFor="let item of resultData | filter:FilterSearch: 'team'">
40 41 <a class="dashboard-stat dashboard-stat-v2 red "
41 42 href="{{item.link}}"
42 43 target="_blank"
... ... @@ -77,12 +78,16 @@
77 78 <div class="caption">
78 79 <h1 class="icon-bubble font-grey-gallery">
79 80 <span class="caption-subject font-grey-gallery sbold font"> On Hold</span>
80   - <div class="input-icon right" style="margin-left: 820px; margin-top: -20px;" >
81   - <i class="icon-magnifier">
82   - </i>
83   - <input type="text" placeholder="Search.." class="form-control sbold font">
84   - </div>
85 81 </h1>
  82 +
  83 + <div class="input-group" style="float: right; margin-top: 11px;">
  84 + <div class="input-icon right">
  85 + <i class="icon-magnifier">
  86 + </i>
  87 + <input type="text" placeholder="Search.." class="form-control sbold font" [(ngModel)]="FilterSearch">
  88 + </div>
  89 + </div>
  90 +
86 91 <hr>
87 92 <br>
88 93 </div>
... ... @@ -122,7 +127,10 @@
122 127 </div>
123 128  
124 129 </div>
125   - <div class="panel tab-pane" id="tab2">page 2</div>
  130 + <div class="panel tab-pane active" id="tab2">
  131 + <input #box type="text" placeholder="Search.." class="form-control sbold font" (keyup)="onKey($event)"><br><br>
  132 + <p>{{box.value}}</p>
  133 + </div>
126 134 <div class="panel tab-pane" id="tab3">page 3</div>
127 135 </div>
128 136 </div>
... ...
src/app/dashboard/dashboard.component.ts
  Diff comments   View file @c946cc1
... ... @@ -11,7 +11,10 @@ import { async } from &#39;rxjs/internal/scheduler/async&#39;;
11 11 })
12 12 export class DashboardComponent implements OnInit {
13 13  
14   - FilterSearch = '';
  14 + Search = '';
  15 +
  16 +
  17 +
15 18  
16 19  
17 20 getColorDay(days){
... ...