This commit is contained in:
sunny 2018-04-17 21:16:32 +09:00
parent fafee4071e
commit f2dd38c7b2
2 changed files with 60 additions and 58 deletions

View File

@ -1,43 +1,45 @@
<h1>Sensors</h1> <h1>Sensors</h1>
<div> <div class="ui-bottom-space-10">
<p-dialog [modal]="true" [width]="800" [(visible)]="sensorSettingDisplay" [showHeader]="false" [closeOnEscape]="false"> <p-dialog [modal]="true" [width]="800" [(visible)]="sensorSettingDisplay" [showHeader]="false" [closeOnEscape]="false">
<of-sensor-setting [visible]="sensorSettingDisplay" [preTarget]="target" (close)="onSensorSettingClose()"></of-sensor-setting> <of-sensor-setting [visible]="sensorSettingDisplay" [preTarget]="target" (close)="onSensorSettingClose()"></of-sensor-setting>
</p-dialog> </p-dialog>
<button type="button" label="Add Sensor" icon="ui-icon-add" pButton (click)="onAddSensor()"></button> <button type="button" label="Add Sensor" icon="ui-icon-add" pButton class="ui-button-width-fit" (click)="onAddSensor()"></button>
<button type="button" label="Add Sensor with Target(temp)" icon="ui-icon-add" pButton (click)="onAddSensorWithTarget()"></button> <button type="button" label="Add Sensor with Target(temp)" icon="ui-icon-add" pButton class="ui-button-width-fit" (click)="onAddSensorWithTarget()"></button>
<button type="button" label="Add Sensor with Target2(temp)" icon="ui-icon-add" pButton (click)="onAddSensorWithTarget2()"></button> <button type="button" label="Add Sensor with Target2(temp)" icon="ui-icon-add" pButton class="ui-button-width-fit" (click)="onAddSensorWithTarget2()"></button>
</div> </div>
<div class="ui-g">
<div class="ui-g-12 ui-md-3"> <div class="ui-g-12 ui-md-3">
<p-panel [showHeader]="false">
<button pButton type="button" label="Search" class="ui-button-secondary" (click)="onSearch()"></button> <div class="ui-g">
<h3>Search</h3>
<div class="ui-inputgroup"> <div class="ui-g-12 ui-inputgroup ui-bottom-space-10">
<span class="md-inputfield"> <span class="md-inputfield">
<input type="text" pInputText> <input type="text" pInputText>
<label>IP or Application name</label> <label>IP or Application name</label>
</span> </span>
</div> </div>
<div> <div class="ui-g-12 ui-bottom-space-10">
<p-multiSelect [options]="targetOptions" [(ngModel)]="selectedTargets"></p-multiSelect> <p-multiSelect [options]="targetOptions" [(ngModel)]="selectedTargets"></p-multiSelect>
<!-- <p-multiSelect [options]="targetOptions" (onChange)="onTargetFilterSelect($event)"></p-multiSelect> --> <!-- <p-multiSelect [options]="targetOptions" (onChange)="onTargetFilterSelect($event)"></p-multiSelect> -->
</div> </div>
<div class="ui-g-12 ui-md-4"> <div class="ui-g-6">
<p-checkbox name="cg" value="Active" label="Active" [(ngModel)]="checkboxValues"></p-checkbox> <p-checkbox name="cg" value="Active" label="Active" [(ngModel)]="checkboxValues"></p-checkbox>
</div> </div>
<div class="ui-g-12 ui-md-4"> <div class="ui-g-6">
<p-checkbox name="cg" value="Inactive" label="Inactive" [(ngModel)]="checkboxValues"></p-checkbox> <p-checkbox name="cg" value="Inactive" label="Inactive" [(ngModel)]="checkboxValues"></p-checkbox>
</div> </div>
<button pButton type="button" label="Search" class="ui-button-secondary ui-top-space-10" (click)="onSearch()"></button>
</div>
</p-panel>
</div> </div>
<div class="ui-g-12 ui-md-9"> <div class="ui-g-12 ui-md-9">
<div class="card card-w-title">
<p-dataList [value]="targetSensor" [paginator]="true" styleClass="cars-datalist" [rows]="10"> <p-dataList [value]="targetSensor" [paginator]="true" styleClass="cars-datalist" [rows]="10">
<!-- <p-header> <!-- <p-header>
List of Cars List of Cars
@ -54,7 +56,6 @@
</div> </div>
</ng-template> </ng-template>
</p-dataList> </p-dataList>
</div>
<!-- <p-table [value]="sensors" selectionMode="single" (onRowSelect)="onRowSelect($event)" [resizableColumns]="true"> <!-- <p-table [value]="sensors" selectionMode="single" (onRowSelect)="onRowSelect($event)" [resizableColumns]="true">
<ng-template pTemplate="header"> <ng-template pTemplate="header">
@ -79,3 +80,4 @@
</ng-template> </ng-template>
</p-table> --> </p-table> -->
</div> </div>
</div>

View File

@ -3,13 +3,13 @@
<p-table [value]="infras" selectionMode="single" (onRowSelect)="onRowSelect($event)" [resizableColumns]="true"> <p-table [value]="infras" selectionMode="single" (onRowSelect)="onRowSelect($event)" [resizableColumns]="true">
<ng-template pTemplate="header"> <ng-template pTemplate="header">
<tr> <tr>
<th>No.</th> <th style="width: 4em">No.</th>
<th>Status</th> <th style="width: 8em">Status</th>
<th>Type</th> <th style="width: 8em">Type</th>
<th>Name</th> <th>Name</th>
<th>Sensors</th> <th style="width: 15em">Sensors</th>
<th>Created at</th> <th style="width: 8em">Created at</th>
<th></th> <th style="width: 10em"></th>
</tr> </tr>
</ng-template> </ng-template>
<ng-template pTemplate="body" let-infra let-rowIndex="rowIndex"> <ng-template pTemplate="body" let-infra let-rowIndex="rowIndex">
@ -21,7 +21,7 @@
<td>??</td> <td>??</td>
<td>{{infra.createDate | date: 'dd.MM.yyyy'}}</td> <td>{{infra.createDate | date: 'dd.MM.yyyy'}}</td>
<td> <td>
<button type="button" label="AddSensor" icon="ui-icon-add" pButton (click)="onAddSensor(infra.target)"></button> <button type="button" label="AddSensor" icon="ui-icon-add" pButton class="ui-s-button" (click)="onAddSensor(infra.target)"></button>
</td> </td>
</tr> </tr>
</ng-template> </ng-template>