diff --git a/@overflow/target/component/list/list.component.html b/@overflow/target/component/list/list.component.html index 383ecca..c75eb41 100644 --- a/@overflow/target/component/list/list.component.html +++ b/@overflow/target/component/list/list.component.html @@ -1,35 +1,30 @@ - +

Targets

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -sdfsdfsdf + + + + No. + Status + Type + Name + Sensors + Created at + + + + + + {{rowIndex + 1}} + ?? + {{target.infra.id}} + {{target.displayName}} + {{target.sensorCount}} + {{target.createDate | date: 'dd.MM.yyyy'}} + + + + + + + diff --git a/@overflow/target/component/list/list.component.ts b/@overflow/target/component/list/list.component.ts index c451320..1a12485 100644 --- a/@overflow/target/component/list/list.component.ts +++ b/@overflow/target/component/list/list.component.ts @@ -4,117 +4,119 @@ import { Infra } from '@overflow/commons-typescript/model/infra'; import { Probe } from '@overflow/commons-typescript/model/probe'; import { Target } from '@overflow/commons-typescript/model/target'; +import { Observable, of, Subscription } from 'rxjs'; import { Store, select } from '@ngrx/store'; +import { catchError, map, tap, take } from 'rxjs/operators'; + import { TargetService } from '../../service/target.service'; import { InfraService } from '@overflow/infra/service/infra.service'; -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 { PageParams } from '@overflow/commons-typescript/model/commons/PageParams'; +import { Page } from '@overflow/commons-typescript/model/commons/Page'; @Component({ - selector: 'of-target-list', - templateUrl: './list.component.html', + selector: 'of-target-list', + templateUrl: './list.component.html', }) export class ListComponent implements OnInit, AfterContentInit, OnDestroy { - // infrasSubscription$: Subscription; - // infras$: Observable; - // infras: Infra[]; - // probe: Probe; - // target: Target = null; - // sensorSettingDisplay = false; + // infrasSubscription$: Subscription; + // infras$: Observable; + // infras: Infra[]; + // probe: Probe; + // target: Target = null; + // sensorSettingDisplay = false; - // pageSize = '10'; - // totalLength = 0; - // currPage = 0; + // pageSize = '10'; + // totalLength = 0; + // currPage = 0; + page: Page; + pending$: Observable; + error$: Observable; - constructor( - private store: Store, - private targetService: TargetService, - ) { - } + totalLength: number; + targets: Object; - ngOnInit() { - // this.infrasSubscription$ = this.infras$.subscribe( - // (page: Page) => { - // 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', - }; + constructor( + private store: Store, + private targetService: TargetService, + ) { + } - this.targetService.readAllByProbeID(1, pageParams) - .pipe( - tap(() => { + ngOnInit() { + const pageParams: PageParams = { + pageNo: 0, + countPerPage: 2, + sortCol: 'id', + sortDirection: 'descending', + }; - }), - map((r: Page) => { - console.log(r); - }), - catchError(err => { - console.log(err); - return err; - }), - take(1), - ).subscribe(); - } + this.targetService.readAllByProbeID(1, pageParams) + .pipe( + tap(() => { + this.pending$ = of(true); + }), + map((page: Page) => { + this.page = page; + }), + catchError(err => { + console.log(err); + return err; + }), + tap(() => { + this.pending$ = of(false); + }), + take(1), + ).subscribe(); + } - ngAfterContentInit() { - // this.route.params.subscribe((params: any) => { - // this.probe = { - // id: params['id'], - // }; - // this.getInfras(0); - // }); - } + ngAfterContentInit() { + // this.route.params.subscribe((params: any) => { + // this.probe = { + // id: params['id'], + // }; + // this.getInfras(0); + // }); + } - ngOnDestroy() { - // if (this.infrasSubscription$) { - // this.infrasSubscription$.unsubscribe(); - // } - } + ngOnDestroy() { + // if (this.infrasSubscription$) { + // this.infrasSubscription$.unsubscribe(); + // } + } - getInfras(pageNo) { - // const pageParams: PageParams = { - // pageNo: pageNo + '', - // countPerPage: this.pageSize, - // sortCol: 'id', - // sortDirection: 'descending' - // }; - // this.infraListStore.dispatch( - // new InfraListStore.ReadAllByProbe( - // { probe: this.probe, pageParams: pageParams } - // ) - // ); - } + getInfras(pageNo) { + // const pageParams: PageParams = { + // pageNo: pageNo + '', + // countPerPage: this.pageSize, + // sortCol: 'id', + // sortDirection: 'descending' + // }; + // this.infraListStore.dispatch( + // new InfraListStore.ReadAllByProbe( + // { probe: this.probe, pageParams: pageParams } + // ) + // ); + } - onRowSelect(event) { - // this.router.navigate(['target'], { queryParams: { target: event.data.id } }); - // this.router.navigate(['target', event.data.id, 'info']); - } + onRowSelect(event) { + // this.router.navigate(['target'], { queryParams: { target: event.data.id } }); + // this.router.navigate(['target', event.data.id, 'info']); + } - onAddSensor(target: Target) { - // this.target = target; - // this.sensorSettingDisplay = true; - } + onAddSensor(target: Target) { + // this.target = target; + // this.sensorSettingDisplay = true; + } - onSensorSettingClose() { - // this.sensorSettingDisplay = false; - } + onSensorSettingClose() { + // this.sensorSettingDisplay = false; + } - onPaging(e) { - // this.getInfras(e.page); - } + onPaging(e) { + // this.getInfras(e.page); + } + onPaginate(event) { + + } }