From 7027f8f0b1e439fcd8252091f08568878be0f4a2 Mon Sep 17 00:00:00 2001
From: geek <geek@loafle.com>
Date: Fri, 22 Jun 2018 15:40:51 +0900
Subject: [PATCH] ing

---
 .../component/target-filter.component.html    | 20 ++++++-
 .../component/target-filter.component.scss    |  9 ---
 .../component/target-filter.component.ts      |  1 -
 .../component/target-list.component.html      | 60 +++++++++++--------
 4 files changed, 53 insertions(+), 37 deletions(-)
 delete mode 100644 @overflow/target/component/target-filter.component.scss

diff --git a/@overflow/target/component/target-filter.component.html b/@overflow/target/component/target-filter.component.html
index f7301c5..f843921 100644
--- a/@overflow/target/component/target-filter.component.html
+++ b/@overflow/target/component/target-filter.component.html
@@ -1 +1,19 @@
-<div>filter</div>
\ No newline at end of file
+<div class="ui-g ui-fluid">
+  <!--<input type="text" pInputText placeholder="Search..." [(ngModel)]="filterWord" (keyup)="onSearch($event)">-->
+  <div class="ui-g-12 ui-md-10">
+    <div class="ui-inputgroup">
+      <input type="text" pInputText placeholder="Keyword" >
+      <button pButton type="button" label="Search"></button>
+    </div>
+  </div>
+
+  <div class="ui-g">
+    <!--<div *ngFor="let targetStatus of targetStatusList">-->
+      <!--<p-toggleButton offLabel="{{targetStatus.key}}" onLabel="{{targetStatus.key}}" [style]="{'width':'100px'}" (onChange)="onTargetStatus($event, service)"-->
+                      <!--[(ngModel)]="filterServices[service.key]"></p-toggleButton>-->
+
+    </div>
+  </div>
+
+
+</div>
diff --git a/@overflow/target/component/target-filter.component.scss b/@overflow/target/component/target-filter.component.scss
deleted file mode 100644
index 97910d9..0000000
--- a/@overflow/target/component/target-filter.component.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-.radio-group {
-    display: inline-flex;
-    flex-direction: column;
-  }
-  
-  .radio-button {
-    margin: 5px;
-  }
-  
\ No newline at end of file
diff --git a/@overflow/target/component/target-filter.component.ts b/@overflow/target/component/target-filter.component.ts
index c4112bf..bf738eb 100644
--- a/@overflow/target/component/target-filter.component.ts
+++ b/@overflow/target/component/target-filter.component.ts
@@ -5,7 +5,6 @@ import { Router } from '@angular/router';
 @Component({
   selector: 'of-target-filter',
   templateUrl: './target-filter.component.html',
-  styleUrls: ['./target-filter.component.scss']
 })
 export class TargetFilterComponent implements OnInit {
 
diff --git a/@overflow/target/component/target-list.component.html b/@overflow/target/component/target-list.component.html
index f336b3e..977ab84 100644
--- a/@overflow/target/component/target-list.component.html
+++ b/@overflow/target/component/target-list.component.html
@@ -4,32 +4,40 @@
 </div>
 
 <ng-template #content>
-<p-table [value]="targetList" selectionMode="single" (onRowSelect)="onRowSelect($event)" [resizableColumns]="true" >
-  <ng-template pTemplate="header">
-    <tr>
-      <th style="width: 4em">No.</th>
-      <th style="width: 8em">Status</th>
-      <th style="width: 15em">Type</th>
-      <th>Name</th>
-      <th style="width: 15em">Sensors</th>
-      <th style="width: 8em">Created at</th>
-      <th style="width: 10em"></th>
-    </tr>
-  </ng-template>
-  <ng-template pTemplate="body" let-target let-rowIndex="rowIndex">
-    <tr [pSelectableRow]="target">
-      <td>{{(rowIndex + 1) }}</td>
-      <td></td>
-      <td>{{target.infra.metaInfraType.name}}</td>
-      <td>{{target.displayName}}</td>
-      <td>{{target.sensorCount}}</td>
-      <td>{{target.createDate | date: 'yyyy-MM-dd'}}</td>
-      <td>
-        <button type="button" label="Add Sensor" icon="ui-icon-add" pButton class="ui-s-button" (click)="onAddSensor(target)"></button>
-      </td>
-    </tr>
-  </ng-template>
-</p-table>
+  <div class="ui-g">
+    <div class="ui-g-12 ui-md-3">
+      <of-target-filter></of-target-filter>
+    </div>
+
+    <div class="ui-g-12 ui-md-9">
+      <p-table [value]="targetList" selectionMode="single" (onRowSelect)="onRowSelect($event)" [resizableColumns]="true" >
+        <ng-template pTemplate="header">
+          <tr>
+            <th style="width: 4em">No.</th>
+            <th style="width: 8em">Status</th>
+            <th style="width: 15em">Type</th>
+            <th>Name</th>
+            <th style="width: 15em">Sensors</th>
+            <th style="width: 8em">Created at</th>
+            <th style="width: 10em"></th>
+          </tr>
+        </ng-template>
+        <ng-template pTemplate="body" let-target let-rowIndex="rowIndex">
+          <tr [pSelectableRow]="target">
+            <td>{{(rowIndex + 1) }}</td>
+            <td></td>
+            <td>{{target.infra.metaInfraType.name}}</td>
+            <td>{{target.displayName}}</td>
+            <td>{{target.sensorCount}}</td>
+            <td>{{target.createDate | date: 'yyyy-MM-dd'}}</td>
+            <td>
+              <button type="button" label="Add Sensor" icon="ui-icon-add" pButton class="ui-s-button" (click)="onAddSensor(target)"></button>
+            </td>
+          </tr>
+        </ng-template>
+      </p-table>
+    </div>
+  </div>
 <!--<p-paginator #paginator [rows]="targetPage.size" [totalRecords]="targetPage.totalElements" [first]="(pageIdx-1) * targetPage.size"-->
              <!--(onPageChange)="onPaginate($event)"></p-paginator>-->