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

Added more charts

Browse Source
This commit is contained in:
kennyboy55
2017-04-11 10:17:06 +02:00
parent b5d76caba9
commit edb556ef50
7 changed files with 26 additions and 11 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
+5 -3
View File
@@ -233,8 +233,10 @@ var DetailComponent = (function () {
.get(id)
.subscribe(function (res) {
_this.label = res.labels;
_this.data = res.TTE1;
_this.data1 = res.HOV;
_this.data2 = res.HTV;
_this.data3 = res.TOE2;
_this.data4 = res.TTE2;
_this.loaded = true;
});
this.dataService
@@ -527,7 +529,7 @@ var LineChartComponent = (function () {
this.dataService = dataService;
// lineChart
this.lineChartData = [
{ data: [0, 0, 0, 0, 0, 0, 0], label: 'Totaal verbruik' }
{ data: [0, 0, 0, 0, 0, 0, 0], label: 'Verbruik' }
];
this.lineChartLabels = ['-1', '-2', '-3', '-4', '-5', '-6', '-7'];
this.lineChartOptions = {
@@ -664,7 +666,7 @@ module.exports = "<div>\r\n\t\r\n</div>"
/***/ 673:
/***/ (function(module, exports) {
module.exports = "<span *ngIf=\"loaded\">\r\n\r\n\t<div class=\"col-md-12\">\r\n\t\t<h2>{{name}}</h2>\r\n\t</div>\r\n\r\n\t<div class=\"col-md-12\">\r\n\t\t<b>HOV:</b> {{hov}}, <b>HTV:</b> {{htv}}, <b>HT:</b> {{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"
module.exports = "<span *ngIf=\"loaded\">\r\n\r\n\t<div class=\"col-md-12\">\r\n\t\t<h2>{{name}}</h2>\r\n\t</div>\r\n\r\n\t<div class=\"col-md-12\">\r\n\t\t<b>HOV:</b> {{hov}}, <b>HTV:</b> {{htv}}, <b>HT:</b> {{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]=\"data1\"></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\t<div class=\"col-md-6\">\r\n\t\t<line-chart [label]=\"label\" [data]=\"data3\"></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]=\"data4\"></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
+1 -1
View File
@@ -32,7 +32,7 @@ router.get('/data/:device', function(req, res) {
let devid = req.params.device;
connection.query(
'SELECT s.* FROM ( SELECT TOE1, TOE2, TTE1, TTE2, HOV, HTV, HT, time FROM measurement WHERE device = ? ORDER BY time DESC LIMIT 0,25 ) s ORDER BY s.time ASC', [devid],
'SELECT s.* FROM ( SELECT TOE1, TOE2, TTE1, TTE2, HOV, HTV, HT, time FROM measurement WHERE device = ? ORDER BY time DESC LIMIT 0,250 ) s ORDER BY s.time ASC', [devid],
function (error, results, fields) {
if (error) throw error;
mean-app/src/app/chart.component.ts
+1 -1
View File
@@ -18,7 +18,7 @@ export class LineChartComponent implements OnInit, OnChanges {
// lineChart
public lineChartData:Array<any> = [
{data: [0,0,0,0,0,0,0], label: 'Totaal verbruik'}
{data: [0,0,0,0,0,0,0], label: 'Verbruik'}
];
public lineChartLabels:Array<any> = ['-1', '-2', '-3', '-4', '-5', '-6', '-7'];
public lineChartOptions:any = {
mean-app/src/app/detail.component.html
+9 -1
View File
@@ -10,11 +10,19 @@
<div class="col-md-6">
<line-chart [label]="label" [data]="data"></line-chart>
<line-chart [label]="label" [data]="data1"></line-chart>
</div>
<div class="col-md-6">
<line-chart [label]="label" [data]="data2"></line-chart>
</div>
<div class="col-md-6">
<line-chart [label]="label" [data]="data3"></line-chart>
</div>
<div class="col-md-6">
<line-chart [label]="label" [data]="data4"></line-chart>
</div>
</span>
mean-app/src/app/detail.component.ts
+8 -3
View File
@@ -19,10 +19,12 @@ export class DetailComponent implements OnInit, OnDestroy {
public id:string = 'Loading';
public name:string = "Loading";
public data:LineData;
public label:LabelData;
public data1:LineData;
public data2:LineData;
public data3:LineData;
public data4:LineData;
public hov:number = 0;
public htv:number = 0;
@@ -58,9 +60,12 @@ export class DetailComponent implements OnInit, OnDestroy {
.subscribe(res => {
this.label = res.labels;
this.data = res.TTE1;
this.data1 = res.HOV;
this.data2 = res.HTV;
this.data3 = res.TOE2;
this.data4 = res.TTE2;
this.loaded = true;
});