Avans/smarthome
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added current usage data

Browse Source
This commit is contained in:
kennyboy55
2017-04-10 12:47:37 +02:00
parent a7448a228a
commit c12239d04c
10 changed files with 126 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mean-app/dist/inline.bundle.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
mean-app/dist/main.bundle.js
Vendored
+35 -11
View File
@@ -24,21 +24,24 @@ var __metadata = (this && this.__metadata) || function (k, v) {
var DataService = (function () {
function DataService(http) {
this.http = http;
this.baseUrl = '/webapi/data';
this.getUrl = '/webapi/data';
this.usageUrl = 'webapi/usage';
this.deviceUrl = '/webapi/device';
}
DataService.prototype.get = function (id) {
var lineChartData$ =
//<LineData>( {data: [65, 59, 80, 81, 56, 55, 40], label: 'Series A'} );
this.http
.get((this.baseUrl + "/" + id), { headers: this.getHeaders() })
var lineChartData$ = this.http
.get((this.getUrl + "/" + id), { headers: this.getHeaders() })
.map(mapData);
return lineChartData$;
};
DataService.prototype.usage = function (id) {
var usageData$ = this.http
.get((this.usageUrl + "/" + id), { headers: this.getHeaders() })
.map(mapUsage);
return usageData$;
};
DataService.prototype.devices = function () {
var devices$ =
//<LineData>( {data: [65, 59, 80, 81, 56, 55, 40], label: 'Series A'} );
this.http
var devices$ = this.http
.get(("" + this.deviceUrl), { headers: this.getHeaders() })
.map(mapDevice);
return devices$;
@@ -89,6 +92,18 @@ function timeToData(r) {
var times = r.time.substring(11, 19);
return times;
}
function mapUsage(response) {
var usage = response.json().map(toUsage);
return usage;
}
function toUsage(r) {
var usage = ({
hov: r.HOV,
htv: r.HTV,
ht: r.HT
});
return usage;
}
function mapDevice(response) {
var devices = response.json().map(toDevice);
return devices;
@@ -160,6 +175,9 @@ var DetailComponent = (function () {
function DetailComponent(dataService, route) {
this.dataService = dataService;
this.route = route;
this.hov = 0;
this.htv = 0;
this.ht = 0;
this.loaded = false;
}
DetailComponent.prototype.ngOnInit = function () {
@@ -175,6 +193,13 @@ var DetailComponent = (function () {
_this.loaded = true;
console.log("Data loaded from API");
});
this.dataService
.usage(id)
.subscribe(function (res) {
_this.hov = res.hov;
_this.htv = res.htv;
_this.ht = res.ht;
});
};
DetailComponent = __decorate([
__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__angular_core__["Component"])({
@@ -339,7 +364,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
var AppComponent = (function () {
function AppComponent() {
this.title = 'Energie';
}
AppComponent = __decorate([
__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__angular_core__["Component"])({
@@ -571,7 +595,7 @@ module.exports = ""
/***/ 670:
/***/ (function(module, exports) {
module.exports = "<div class=\"container\">\r\n\r\n <nav class=\"navbar navbar-default\">\r\n <div class=\"container-fluid\">\r\n <div class=\"navbar-header\">\r\n <button type=\"button\" class=\"navbar-toggle collapsed\" data-toggle=\"collapse\" data-target=\"#navbar\" aria-expanded=\"false\" aria-controls=\"navbar\">\r\n <span class=\"sr-only\">Toggle navigation</span>\r\n <span class=\"icon-bar\"></span>\r\n <span class=\"icon-bar\"></span>\r\n <span class=\"icon-bar\"></span>\r\n </button>\r\n <a class=\"navbar-brand\">Energiemeter</a>\r\n </div>\r\n <div id=\"navbar\" class=\"navbar-collapse collapse\">\r\n <ul class=\"nav navbar-nav\">\r\n <li routerLink=\"/dashboard\" routerLinkActive=\"active\"><a routerLink=\"/dashboard\" routerLinkActive=\"active\">Dashboard</a></li>\r\n <li routerLink=\"/device\" routerLinkActive=\"active\"><a routerLink=\"/device\" routerLinkActive=\"active\">Device</a></li>\r\n </ul>\r\n </div><!--/.nav-collapse -->\r\n </div><!--/.container-fluid -->\r\n </nav>\r\n\r\n <div class=\"row\">\r\n\r\n <div class=\"col-md-12\">\r\n <div class=\"page-header\">\r\n <h1>{{title}} <small>Avans</small></h1>\r\n </div>\r\n </div>\r\n\r\n <router-outlet></router-outlet>\r\n\r\n </div>\r\n</div>\r\n"
module.exports = "<div class=\"container\">\r\n\r\n <nav class=\"navbar navbar-default\">\r\n <div class=\"container-fluid\">\r\n <div class=\"navbar-header\">\r\n <button type=\"button\" class=\"navbar-toggle collapsed\" data-toggle=\"collapse\" data-target=\"#navbar\" aria-expanded=\"false\" aria-controls=\"navbar\">\r\n <span class=\"sr-only\">Toggle navigation</span>\r\n <span class=\"icon-bar\"></span>\r\n <span class=\"icon-bar\"></span>\r\n <span class=\"icon-bar\"></span>\r\n </button>\r\n <a class=\"navbar-brand\">Energiemeter</a>\r\n </div>\r\n <div id=\"navbar\" class=\"navbar-collapse collapse\">\r\n <ul class=\"nav navbar-nav\">\r\n <li routerLink=\"/dashboard\" routerLinkActive=\"active\"><a routerLink=\"/dashboard\" routerLinkActive=\"active\">Dashboard</a></li>\r\n <li routerLink=\"/device\" routerLinkActive=\"active\"><a routerLink=\"/device\" routerLinkActive=\"active\">Device</a></li>\r\n </ul>\r\n </div><!--/.nav-collapse -->\r\n </div><!--/.container-fluid -->\r\n </nav>\r\n\r\n <div class=\"row\">\r\n\r\n <div class=\"col-md-12\">\r\n <div class=\"page-header\">\r\n <h1>Energiemeter <small>Avans</small></h1>\r\n </div>\r\n </div>\r\n\r\n </div>\r\n\r\n <div class=\"row\">\r\n <router-outlet></router-outlet>\r\n </div>\r\n\r\n</div>\r\n"
/***/ }),
@@ -592,7 +616,7 @@ module.exports = "<div>\r\n\t\r\n</div>"
/***/ 673:
/***/ (function(module, exports) {
module.exports = "<div *ngIf=\"loaded\">\r\n\t<line-chart [label]=\"label\" [data]=\"data\"></line-chart>\r\n\r\n\t<line-chart [label]=\"label\" [data]=\"data2\"></line-chart>\r\n</div>\r\n"
module.exports = "<span *ngIf=\"loaded\">\r\n\r\n\t<div class=\"col-md-6\">\r\n\t\tHOV: {{hov}}, HTV: {{htv}}, HT: {{ht}}\r\n\t</div>\r\n\r\n\r\n\t<div class=\"col-md-6\">\r\n\t\t<line-chart [label]=\"label\" [data]=\"data\"></line-chart>\r\n\t</div>\r\n\r\n\t<div class=\"col-md-6\">\r\n\t\t<line-chart [label]=\"label\" [data]=\"data2\"></line-chart>\r\n\t</div>\r\n\r\n</span>\r\n"
/***/ }),
mean-app/dist/main.bundle.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
mean-app/server/routes/webapi.js
+19
View File
@@ -47,6 +47,25 @@ router.get('/data/:device', function(req, res) {
});
router.get('/usage/:device', function(req, res) {
let devid = req.params.device;
connection.query(
'SELECT TOP 1 HOV, HTV, HT FROM measurement WHERE device = ? ORDER BY time DESC', [devid],
function (error, results, fields) {
if (error) throw error;
if (results.length > 0) {
res.status(200);
res.send(JSON.stringify(results));
}
});
});
/* GET api listing. */
router.get('/', function(req, res) {
res.status(200);
mean-app/src/app/app.component.html
+6 -3
View File
@@ -24,11 +24,14 @@
<div class="col-md-12">
<div class="page-header">
<h1>{{title}} <small>Avans</small></h1>
<h1>Energiemeter <small>Avans</small></h1>
</div>
</div>
<router-outlet></router-outlet>
</div>
<div class="row">
<router-outlet></router-outlet>
</div>
</div>
mean-app/src/app/app.component.ts
+1 -1
View File
@@ -6,5 +6,5 @@ import { Component } from '@angular/core';
styleUrls: ['./app.component.css']
})
export class AppComponent {
title = 'Energie';
}
mean-app/src/app/data.service.ts
+29 -4
View File
@@ -8,29 +8,39 @@ import { GraphData } from './graph-data';
import { LabelData } from './label-data';
import { Device } from './device';
import { Usage } from './usage';
@Injectable()
export class DataService {
private baseUrl: string = '/webapi/data';
private getUrl: string = '/webapi/data';
private usageUrl: string = 'webapi/usage';
private deviceUrl: string = '/webapi/device';
constructor(private http : Http){}
get(id:string): Observable<GraphData> {
let lineChartData$ =
//<LineData>( {data: [65, 59, 80, 81, 56, 55, 40], label: 'Series A'} );
this.http
.get((`${this.baseUrl}/${id}`)
.get((`${this.getUrl}/${id}`)
, {headers: this.getHeaders()})
.map(mapData);
return lineChartData$;
}
usage(id:string): Observable<Usage> {
let usageData$ =
this.http
.get((`${this.usageUrl}/${id}`)
, {headers: this.getHeaders()})
.map(mapUsage);
return usageData$;
}
devices(): Observable<Device[]> {
let devices$ =
//<LineData>( {data: [65, 59, 80, 81, 56, 55, 40], label: 'Series A'} );
this.http
.get((`${this.deviceUrl}`)
, {headers: this.getHeaders()})
@@ -88,6 +98,21 @@ function timeToData(r:any){
}
function mapUsage(response:Response): Usage {
let usage = response.json().map(toUsage);
return usage;
}
function toUsage(r:any){
let usage = <Usage>({
hov: r.HOV,
htv: r.HTV,
ht: r.HT
});
return usage;
}
function mapDevice(response:Response): Device[] {
let devices = response.json().map(toDevice);
mean-app/src/app/detail.component.html
+15 -4
View File
@@ -1,5 +1,16 @@
<div *ngIf="loaded">
<line-chart [label]="label" [data]="data"></line-chart>
<span *ngIf="loaded">
<line-chart [label]="label" [data]="data2"></line-chart>
</div>
<div class="col-md-6">
HOV: {{hov}}, HTV: {{htv}}, HT: {{ht}}
</div>
<div class="col-md-6">
<line-chart [label]="label" [data]="data"></line-chart>
</div>
<div class="col-md-6">
<line-chart [label]="label" [data]="data2"></line-chart>
</div>
</span>
mean-app/src/app/detail.component.ts
+14
View File
@@ -18,6 +18,10 @@ export class DetailComponent implements OnInit {
public data2:LineData;
public hov:number = 0;
public htv:number = 0;
public ht:number = 0;
public loaded:boolean = false;
constructor(private dataService: DataService,
@@ -41,6 +45,16 @@ export class DetailComponent implements OnInit {
});
this.dataService
.usage(id)
.subscribe(res => {
this.hov = res.hov;
this.htv = res.htv;
this.ht = res.ht;
});
}
}
mean-app/src/app/usage.ts
+5
View File
@@ -0,0 +1,5 @@
export class Usage {
public hov: number;
public htv: number;
public ht: number;
}