overflow_cloud/member_webapp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ing

Browse Source
This commit is contained in:
geek 2018-06-07 15:24:55 +09:00
parent b9b5195529
commit 1a4cb7e513
2 changed files with 123 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
@overflow/target/component/list/list.component.html
View File

@ -1,35 +1,30 @@
<!--<h1>Targets</h1>--> <h1>Targets</h1>
<!--<p-table [value]="infras" selectionMode="single" (onRowSelect)="onRowSelect($event)" [resizableColumns]="true" >--> <p-table [value]="page.content" selectionMode="single" (onRowSelect)="onRowSelect($event)" [resizableColumns]="true" >
<!--<ng-template pTemplate="header">--> <ng-template pTemplate="header">
<!--<tr>--> <tr>
<!--<th style="width: 4em">No.</th>--> <th style="width: 4em">No.</th>
<!--<th style="width: 8em">Status</th>--> <th style="width: 8em">Status</th>
<!--<th style="width: 8em">Type</th>--> <th style="width: 8em">Type</th>
<!--<th>Name</th>--> <th>Name</th>
<!--<th style="width: 15em">Sensors</th>--> <th style="width: 15em">Sensors</th>
<!--<th style="width: 8em">Created at</th>--> <th style="width: 8em">Created at</th>
<!--<th style="width: 10em"></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-target let-rowIndex="rowIndex">
<!--<tr [pSelectableRow]="infra">--> <tr [pSelectableRow]="target">
<!--<td>{{rowIndex + 1}}</td>--> <td>{{rowIndex + 1}}</td>
<!--<td>??</td>--> <td>??</td>
<!--<td>{{infra.infraType.name}}</td>--> <td>{{target.infra.id}}</td>
<!--<td>{{infra.target.displayName}}</td>--> <td>{{target.displayName}}</td>
<!--<td>{{infra.target.sensorCount}}</td>--> <td>{{target.sensorCount}}</td>
<!--<td>{{infra.createDate | date: 'dd.MM.yyyy'}}</td>--> <td>{{target.createDate | date: 'dd.MM.yyyy'}}</td>
<!--<td>--> <td>
<!--<button type="button" label="Add Sensor" icon="ui-icon-add" pButton class="ui-s-button" (click)="onAddSensor(infra.target)"></button>--> <button type="button" label="Add Sensor" icon="ui-icon-add" pButton class="ui-s-button" (click)="onAddSensor(target)"></button>
<!--</td>--> </td>
<!--</tr>--> </tr>
<!--</ng-template>--> </ng-template>
<!--</p-table>--> </p-table>
<!--<p-paginator [rows]="pageSize" [totalRecords]="totalLength" (onPageChange)="onPaging($event)"></p-paginator>--> <p-paginator #paginator [rows]="page.size" [totalRecords]="page.totalElements"
(onPageChange)="onPaginate($event)" ></p-paginator>
<!--<p-dialog [modal]="true" [width]="800" [(visible)]="sensorSettingDisplay" [showHeader]="false" [closeOnEscape]="false">-->
<!--<of-sensor-setting [visible]="sensorSettingDisplay" [preTarget]="target" (close)="onSensorSettingClose()"></of-sensor-setting>-->
<!--</p-dialog>-->
sdfsdfsdf

186
@overflow/target/component/list/list.component.ts
View File

@ -4,117 +4,119 @@ import { Infra } from '@overflow/commons-typescript/model/infra';
import { Probe } from '@overflow/commons-typescript/model/probe'; import { Probe } from '@overflow/commons-typescript/model/probe';
import { Target } from '@overflow/commons-typescript/model/target'; import { Target } from '@overflow/commons-typescript/model/target';
import { Observable, of, Subscription } from 'rxjs';
import { Store, select } from '@ngrx/store'; import { Store, select } from '@ngrx/store';
import { catchError, map, tap, take } from 'rxjs/operators';
import { TargetService } from '../../service/target.service'; import { TargetService } from '../../service/target.service';
import { InfraService } from '@overflow/infra/service/infra.service'; import { InfraService } from '@overflow/infra/service/infra.service';
import {PageParams} from '@overflow/commons-typescript/model/commons/PageParams'; import { PageParams } from '@overflow/commons-typescript/model/commons/PageParams';
import { catchError, map, tap, take } from 'rxjs/operators'; import { Page } from '@overflow/commons-typescript/model/commons/Page';
import {Page} from '@overflow/commons-typescript/model/commons/Page';
@Component({ @Component({
selector: 'of-target-list', selector: 'of-target-list',
templateUrl: './list.component.html', templateUrl: './list.component.html',
}) })
export class ListComponent implements OnInit, AfterContentInit, OnDestroy { export class ListComponent implements OnInit, AfterContentInit, OnDestroy {
// infrasSubscription$: Subscription; // infrasSubscription$: Subscription;
// infras$: Observable<Infra[]>; // infras$: Observable<Infra[]>;
// infras: Infra[]; // infras: Infra[];
// probe: Probe; // probe: Probe;
// target: Target = null; // target: Target = null;
// sensorSettingDisplay = false; // sensorSettingDisplay = false;
// pageSize = '10'; // pageSize = '10';
// totalLength = 0; // totalLength = 0;
// currPage = 0; // currPage = 0;
page: Page<Target>;
pending$: Observable<boolean>;
error$: Observable<any>;
constructor( totalLength: number;
private store: Store<any>, targets: Object;
private targetService: TargetService,
) {
}
ngOnInit() { constructor(
// this.infrasSubscription$ = this.infras$.subscribe( private store: Store<any>,
// (page: Page) => { private targetService: TargetService,
// if (!page) { ) {
// return; }
// }
// this.totalLength = page.totalElements;
// this.infras = page.content;
// },
// (error: RPCClientError) => {
// console.log(error);
// }
// );
const pageParams: PageParams = {
pageNo: 0,
countPerPage: 10,
sortCol: 'id',
sortDirection: 'descending',
};
this.targetService.readAllByProbeID(1, pageParams) ngOnInit() {
.pipe( const pageParams: PageParams = {
tap(() => { pageNo: 0,
countPerPage: 2,
sortCol: 'id',
sortDirection: 'descending',
};
}), this.targetService.readAllByProbeID(1, pageParams)
map((r: Page<Target>) => { .pipe(
console.log(r); tap(() => {
}), this.pending$ = of(true);
catchError(err => { }),
console.log(err); map((page: Page<Target>) => {
return err; this.page = page;
}), }),
take(1), catchError(err => {
).subscribe(); console.log(err);
} return err;
}),
tap(() => {
this.pending$ = of(false);
}),
take(1),
).subscribe();
}
ngAfterContentInit() { ngAfterContentInit() {
// this.route.params.subscribe((params: any) => { // this.route.params.subscribe((params: any) => {
// this.probe = { // this.probe = {
// id: params['id'], // id: params['id'],
// }; // };
// this.getInfras(0); // this.getInfras(0);
// }); // });
} }
ngOnDestroy() { ngOnDestroy() {
// if (this.infrasSubscription$) { // if (this.infrasSubscription$) {
// this.infrasSubscription$.unsubscribe(); // this.infrasSubscription$.unsubscribe();
// } // }
} }
getInfras(pageNo) { getInfras(pageNo) {
// const pageParams: PageParams = { // const pageParams: PageParams = {
// pageNo: pageNo + '', // pageNo: pageNo + '',
// countPerPage: this.pageSize, // countPerPage: this.pageSize,
// sortCol: 'id', // sortCol: 'id',
// sortDirection: 'descending' // sortDirection: 'descending'
// }; // };
// this.infraListStore.dispatch( // this.infraListStore.dispatch(
// new InfraListStore.ReadAllByProbe( // new InfraListStore.ReadAllByProbe(
// { probe: this.probe, pageParams: pageParams } // { probe: this.probe, pageParams: pageParams }
// ) // )
// ); // );
} }
onRowSelect(event) { onRowSelect(event) {
// this.router.navigate(['target'], { queryParams: { target: event.data.id } }); // this.router.navigate(['target'], { queryParams: { target: event.data.id } });
// this.router.navigate(['target', event.data.id, 'info']); // this.router.navigate(['target', event.data.id, 'info']);
} }
onAddSensor(target: Target) { onAddSensor(target: Target) {
// this.target = target; // this.target = target;
// this.sensorSettingDisplay = true; // this.sensorSettingDisplay = true;
} }
onSensorSettingClose() { onSensorSettingClose() {
// this.sensorSettingDisplay = false; // this.sensorSettingDisplay = false;
} }
onPaging(e) { onPaging(e) {
// this.getInfras(e.page); // this.getInfras(e.page);
} }
onPaginate(event) {
}
} }