overflow_backup_2018_0455/overflow-webapp
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sensor

Browse Source
This commit is contained in:
insanity 2018-03-19 15:11:49 +09:00
parent a4f38ee99c
commit 75a9958efd
3 changed files with 27 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/packages/sensor/component/list/list.component.html
View File

@ -6,19 +6,19 @@
</div>
<!-- Table -->
<!-- <div fxFlex="80%" class="example-container mat-elevation-z8">
<div fxFlex="80%" class="example-container mat-elevation-z8">
<div [style.margin]="'10px'">
<div>Target : </div>
<div>Sensor : </div>
<div>Activated Sensor : </div>
<div>Inactivated Sensor : </div>
<div fxLayoutAlign="end">
<button mat-raised-button color="primary">Add Sensor</button>
<button mat-raised-button color="primary" (click)="addSensor()">Add Sensor</button>
</div>
</div>
</div> -->
<!-- target 별 sensor list -->
<!-- <div fxFlex="80%" class="example-container mat-elevation-z8">
<div fxFlex="80%" class="example-container mat-elevation-z8">
<div fxLayout="row" >
<div fxFlex="20">aaaaaaaaaaaaaaaaaaa</div>
@ -52,24 +52,6 @@
</div>
</div> -->
<tree-root id="tree2" [focused]="true" [nodes]="nodes2">
<ng-template #treeNodeFullTemplate let-node let-index="index" let-templates="templates">
<div class="tree-node">
<input type="checkbox" [checked]="node.isActive" (change)="clickCheck(node)" />
<tree-node-expander [node]="node"></tree-node-expander>
<div
class="node-content-wrapper"
[class.node-content-wrapper-active]="node.isActive"
[class.node-content-wrapper-focused]="node.isFocused"
(click)="clickCheck(node)">
<span [class]="node.data.className + 'Index'">{{ index }}</span>
<span [class]="node.data.className" [class.title]="true">{{ node.data.title }}</span>
</div>
<tree-node-children [node]="node" [templates]="templates"></tree-node-children>
</div>
</ng-template>
</tree-root>
</div>

84
src/packages/sensor/component/list/list.component.ts
View File

@ -1,5 +1,5 @@
import { Component, OnInit, AfterViewInit, ViewChild } from '@angular/core';
import { MatTableDataSource, MatSort } from '@angular/material';
import { MatTableDataSource, MatSort, MatDialog } from '@angular/material';
import { AfterContentInit } from '@angular/core/src/metadata/lifecycle_hooks';
import { Router } from '@angular/router';
import { Sensor } from '../../model';
@ -11,13 +11,8 @@ import * as SensorStore from '../../store';
import { RPCError } from 'packages/core/rpc/error';
import * as ReadAllByDomainStore from '../../store/readallbydomain';
import { ReadAllByMemberSelector } from '../../store';
import * as TargetStore from 'packages/target/store/target';
import { ReadAllByDomainSelector as TargetReadAllByDomainSelector } from 'packages/target/store';
import { Domain } from '../../../domain/model';
import { Target } from '../../../target/model';
import { ITreeOptions } from 'angular-tree-component';
import { SettingComponent } from '../setting/setting.component';
@Component({
selector: 'of-sensor-list',
@ -27,58 +22,15 @@ import { ITreeOptions } from 'angular-tree-component';
export class ListComponent implements OnInit, AfterContentInit {
sensorList$ = this.store.pipe(select(ReadAllByMemberSelector.select('sensorList')));
targetList$ = this.store.pipe(select(ReadAllByMemberSelector.select('sensorList')));
displayedColumns = ['crawler', 'type', 'name', 'sensors'];
dataSource: MatTableDataSource<Sensor>;
@ViewChild(MatSort) sort: MatSort;
displayedColumnsTarget = ['createDate', 'displayName', 'description'];
dataSourceTarget: MatTableDataSource<Target>;
@ViewChild(MatSort) sortTarget: MatSort;
nodes2 = [
{
title: 'root1',
className: 'root1Class'
},
{
title: 'root2',
className: 'root2Class',
children: [
{ title: 'child1', className: 'child1Class' },
{ title: 'child2', className: 'child1Class' },
{ title: 'child3', className: 'child1Class' }
]
}
];
/**
* Set the sort after the view init since this component will
* be able to query its view for the initialized sort.
*/
clickCheck(node) {
// console.log(node);
console.log(node.isActive);
const active: boolean = !node.isActive;
if (node.visibleChildren.length > 0) {
node.visibleChildren.map(cn => {
(function (cc) {
cc.setIsActive(active);
}(cn));
});
}
node.toggleActivated(true);
}
ngAfterContentInit() {
// temporary data
// const data: Sensor[] = new Array();
@ -106,12 +58,6 @@ export class ListComponent implements OnInit, AfterContentInit {
}
);
// this.store.select(TargetReadAllByDomainSelector.select('target')).subscribe(
// (domain: Domain) => {
// this.store.dispatch(new TargetStore.ReadAllByDomain(domain));
// },
// );
// const domain: Domain = {
// id: 1
// };
@ -125,16 +71,7 @@ export class ListComponent implements OnInit, AfterContentInit {
this.dataSource.sort = this.sort;
},
(error: RPCError) => {
// console.log(error.response.message);
}
);
this.targetList$.subscribe(
(targets: Target[]) => {
},
(error: RPCError) => {
// console.log(error.message);
console.log(error.response.message);
}
);
@ -144,7 +81,9 @@ export class ListComponent implements OnInit, AfterContentInit {
}
constructor(private router: Router,
private store: Store<ReadAllByDomainStore.State>) { }
private store: Store<ReadAllByDomainStore.State>,
private dialog: MatDialog,
) { }
ngOnInit() {
}
@ -152,4 +91,15 @@ export class ListComponent implements OnInit, AfterContentInit {
handleRowClick(obj: Sensor) {
this.router.navigate(['target', obj.id]);
}
addSensor() {
const dialogRef = this.dialog.open(SettingComponent, {
width: '80%',
});
dialogRef.afterClosed().subscribe(result => {
console.log('The dialog was closed');
});
}
}

5
src/packages/sensor/sensor.module.ts
View File

@ -7,6 +7,7 @@ import { MaterialModule } from 'packages/commons/material/material.module';
import { COMPONENTS } from './component';
import { SERVICES } from './service';
import { SensorStoreModule } from './sensor-store.module';
import { SettingComponent } from './component/setting/setting.component';
import { TreeModule } from 'angular-tree-component';
@NgModule({
@ -26,5 +27,9 @@ import { TreeModule } from 'angular-tree-component';
providers: [
SERVICES,
],
entryComponents: [
SettingComponent
]
})
export class SensorModule { }