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

Merge branch 'master' of https://git.loafle.net/overflow/member_webapp

Browse Source
This commit is contained in:
snoop 2018-04-16 15:04:21 +09:00
commit bb28c0bbf8
14 changed files with 76 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/pages/pages-routing.module.ts
View File

@ -15,7 +15,6 @@ const routes: Routes = [
{ path: 'sensor', loadChildren: './sensor/sensor-page.module#SensorPageModule' },
// { path: 'discovery', loadChildren: './discovery/discovery-page.module#DiscoveryPageModule' },
{ path: 'map', loadChildren: './infra/infra-page.module#InfraPageModule' },
// { path: 'sensor-setting', loadChildren: './sensor-setting/sensor-setting-page.module#SensorSettingPageModule' },
// { path: 'target', loadChildren: './target/target-page.module#TargetPageModule' },
{ path: 'overview', loadChildren: './overview/overview-page.module#OverviewPageModule' },
{ path: 'dashboard', loadChildren: './dashboard/dashboard-page.module#DashboardPageModule' },

2
src/app/pages/pages.module.ts
View File

@ -18,6 +18,7 @@ import { PagesComponent } from './pages.component';
import { PagesRoutingModule } from './pages-routing.module';
import { LocationStrategy, HashLocationStrategy } from '@angular/common';
import { PrimeNGModules } from 'packages/commons/prime-ng/prime-ng.module';
import { TabbarModule } from 'app/commons/component/layout/tabbar/app.tabbar.module';
@NgModule({
imports: [
@ -25,6 +26,7 @@ import { PrimeNGModules } from 'packages/commons/prime-ng/prime-ng.module';
PagesRoutingModule,
LocalizationModule,
PrimeNGModules,
TabbarModule
],
declarations: [
PagesComponent,

6
src/app/pages/probe/probe-page.component.ts
View File

@ -22,9 +22,9 @@ export class ProbePageComponent implements OnInit {
// ];
this.tabs = [
{ label: 'Info', routerLink: ['/probe/', id, 'info'], path: '/probe/' + id, icon: 'fa-check' },
{ label: 'Targets', routerLink: ['/probe/', id, 'targets'], icon: 'fa-check' },
{ label: 'History', routerLink: ['/probe/', id, 'history'], icon: 'fa-check', disabled: true },
{ label: 'INFO', routerLink: ['/probe/', id, 'info'], path: '/probe/' + id, icon: 'fa-check' },
{ label: 'TARGETS', routerLink: ['/probe/', id, 'targets'], icon: 'fa-check' },
{ label: 'HISTORY', routerLink: ['/probe/', id, 'history'], icon: 'fa-check', disabled: true },
];
}

2
src/app/pages/probe/probe-page.module.ts
View File

@ -6,7 +6,7 @@ import { ProbePageComponent } from './probe-page.component';
import { ProbePageRoutingModule } from './probe-page-routing.module';
import { PrimeNGModules } from 'packages/commons/prime-ng/prime-ng.module';
import { ProbeModule } from 'packages/probe/probe.module';
import { TabbarModule } from '../../commons/component/layout/tabbar/app.tabbar.module';
import { TabbarModule } from 'app/commons/component/layout/tabbar/app.tabbar.module';
@NgModule({
imports: [

6
src/app/pages/sensor/sensor-page-routing.module.ts
View File

@ -1,15 +1,15 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { SensorPageComponent } from './sensor-page.component';
// import { DetailComponent } from 'packages/sensor/component/detail/detail.component';
import { DetailComponent } from 'packages/sensor/component/detail/detail.component';
const routes: Routes = [
{
path: '',
component: SensorPageComponent,
children: [
// { path: ':id', component: DetailComponent },
// { path: ':id/history', component: null },
{ path: ':id/info', component: DetailComponent },
{ path: ':id/history', component: null },
]
}
];

10
src/app/pages/sensor/sensor-page.component.html
View File

@ -2,12 +2,10 @@
<div class="ui-g">
<div class="ui-g-12">
<div class="card no-margin">
<h1>Sensors</h1>
<of-sub-menubar [tabs]="tabs"></of-sub-menubar>
<div style="padding: 15px">
<router-outlet></router-outlet>
</div>
<of-tabbar [tabs]="tabs"></of-tabbar>
</div>
<div class="card no-margin">
<router-outlet></router-outlet>
</div>
</div>
</div>

4
src/app/pages/sensor/sensor-page.component.ts
View File

@ -16,8 +16,8 @@ export class SensorPageComponent implements OnInit {
const id = this.router.url.split('sensor/')[1].split('/')[0];
this.tabs = [
{ label: 'Info', path: '/sensor/' + id },
{ label: 'History', path: '/sensor/' + id + '/history' },
{ label: 'INFO', routerLink: ['/sensor/' + id, 'info'] },
{ label: 'HISTORY', path: ['/sensor/' + id, 'history'], disabled: true },
];
}

2
src/app/pages/sensor/sensor-page.module.ts
View File

@ -4,12 +4,14 @@ import { CommonModule } from '@angular/common';
import { SensorModule } from 'packages/sensor/sensor.module';
import { SensorPageRoutingModule } from './sensor-page-routing.module';
import { SensorPageComponent } from './sensor-page.component';
import { TabbarModule } from 'app/commons/component/layout/tabbar/app.tabbar.module';
@NgModule({
imports: [
CommonModule,
SensorPageRoutingModule,
SensorModule,
TabbarModule
],
declarations: [
SensorPageComponent,

1
src/app/pages/sensors/sensors-page.component.html
View File

@ -2,7 +2,6 @@
<div class="ui-g">
<div class="ui-g-12">
<div class="card no-margin">
<h1>Sensors</h1>
<of-sensor-list></of-sensor-list>
</div>
</div>

1
src/app/pages/sensors/sensors-page.component.ts
View File

@ -9,7 +9,6 @@ export class SensorsPageComponent implements OnInit {
tabs = [
{ label: 'Overview', path: '/sensors' },
{ label: 'History', path: '/sensors/history' },
{ label: 'Settings', path: '/sensors/setting' },
];
constructor() { }

33
src/packages/sensor/component/detail/detail.component.ts
View File

@ -1,22 +1,19 @@
// import { Component, OnInit, Inject } from '@angular/core';
// import { ActivatedRoute, Router } from '@angular/router';
// import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
// import { ConfirmDialogComponent } from 'packages/commons/component/confirm-dialog/confirm-dialog.component';
import { Component, OnInit, Inject } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
// @Component({
// selector: 'of-sensor-detail',
// templateUrl: './detail.component.html',
// styleUrls: ['./detail.component.scss']
// })
// export class DetailComponent implements OnInit {
@Component({
selector: 'of-sensor-detail',
templateUrl: './detail.component.html',
styleUrls: ['./detail.component.scss']
})
export class DetailComponent implements OnInit {
// constructor(
// private route: ActivatedRoute,
// private router: Router,
// public dialog: MatDialog,
// ) { }
constructor(
private route: ActivatedRoute,
private router: Router,
) { }
// ngOnInit() {
// }
// }
ngOnInit() {
}
}

6
src/packages/sensor/component/index.ts
View File

@ -6,10 +6,9 @@ import { CrawlerSelectorComponent } from './setting/crawler-selector/crawler-sel
import { CrawlerAuthComponent } from './setting/crawler-auth/crawler-auth.component';
import { SensorItemSelectorComponent } from './setting/sensor-item-selector/sensor-item-selector.component';
import { SettingETCComponent } from './setting/setting-etc/setting-etc.component';
import { DetailComponent } from './detail/detail.component';
// import { FilterComponent } from './list/filter/filter.component';
// import { DetailComponent } from './detail/detail.component';
// import { TargetSelectorComponent } from './setting/target-selector/target-selector.component';
// import { NameTagComponent } from './name-tag/name-tag.component';
export const COMPONENTS = [
SettingComponent,
@ -19,8 +18,7 @@ export const COMPONENTS = [
SensorItemSelectorComponent,
SettingETCComponent,
ListComponent,
DetailComponent,
// FilterComponent,
// DetailComponent,
// SettingETCComponent,
// NameTagComponent,
];

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

@ -1,11 +1,35 @@
<h1>Sensors</h1>
<div>
<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>
<button type="button" label="Add Sensor" icon="ui-icon-add" pButton (click)="onAddSensor()"></button>
<button type="button" label="Add Sensor with Target" icon="ui-icon-add" pButton (click)="onAddSensorWithTarget()"></button>
<button type="button" label="Add Sensor with Target2" icon="ui-icon-add" pButton (click)="onAddSensorWithTarget2()"></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 Target2(temp)" icon="ui-icon-add" pButton (click)="onAddSensorWithTarget2()"></button>
</div>
<div>sensor list</div>
<p-table [value]="sensors" selectionMode="single" (onRowSelect)="onRowSelect($event)" [resizableColumns]="true">
<ng-template pTemplate="header">
<tr>
<th>No.</th>
<th>Description</th>
<th>Status</th>
<th>Crawler</th>
<th>Items</th>
<th>Created at</th>
</tr>
</ng-template>
<ng-template pTemplate="body" let-sensor let-rowIndex="rowIndex">
<tr [pSelectableRow]="sensor">
<td>{{rowIndex + 1}}</td>
<td>{{sensor.Description}}</td>
<td>{{sensor.status.name}}</td>
<td>{{sensor.crawler.name}}</td>
<td>???</td>
<td>{{sensor.createDate | date: 'dd.MM.yyyy'}}</td>
</tr>
</ng-template>
</p-table>

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

@ -28,6 +28,7 @@ export class ListComponent implements OnInit, AfterContentInit {
totalLength = 0;
sensorSettingDisplay = false;
sensors: Sensor[];
target: Target = null;
constructor(private router: Router,
@ -35,20 +36,21 @@ export class ListComponent implements OnInit, AfterContentInit {
) { }
ngOnInit() {
// this.sensorList$.subscribe(
// (page: Page) => {
// if (page != null) {
// this.totalLength = page.totalElements;
// }
// },
// (error: RPCClientError) => {
// console.log(error.response.message);
// }
// );
this.sensorList$.subscribe(
(page: Page) => {
if (page != null) {
this.sensors = page.content;
this.totalLength = page.totalElements;
}
},
(error: RPCClientError) => {
console.log(error.response.message);
}
);
}
ngAfterContentInit() {
// this.getSensors(0);
this.getSensors(0);
}
getSensors(pageIndex: number) {
@ -69,8 +71,8 @@ export class ListComponent implements OnInit, AfterContentInit {
);
}
handleRowClick(obj: Sensor) {
this.router.navigate(['target', obj.id]);
onRowSelect(event) {
this.router.navigate(['sensor', event.data.id, 'info']);
}
onAddSensor() {