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

Added labels

Browse Source
This commit is contained in:
kennyboy55
2017-04-11 17:25:17 +02:00
parent c3b2eb6fb3
commit 5048521a29
5 changed files with 7 additions and 4 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
+2 -1
View File
@@ -252,6 +252,7 @@ var DashboardComponent = (function () {
.get("4530303235303030303636383733323136")
.subscribe(function (res) {
_this.data3 = res.HOV;
_this.label2 = res.labels;
});
this.dataService
.get("4530303035303031353538313833363134")
@@ -964,7 +965,7 @@ module.exports = "<div style=\"display: block;\">\r\n<canvas baseChart width=\"4
/***/ 676:
/***/ (function(module, exports) {
module.exports = "<span *ngIf=\"mloaded\">\r\n\r\n\t<div class=\"col-md-6\">\r\n <h3>Martijn</h3>\r\n\t\t<pie-chart [label]=\"label\" [data]=\"data1\"></pie-chart>\r\n\t</div>\r\n\r\n</span>\r\n\r\n<span *ngIf=\"kloaded\">\r\n\t<div class=\"col-md-6\">\r\n <h3>Kenneth</h3>\r\n\t\t<pie-chart [label]=\"label\" [data]=\"data2\"></pie-chart>\r\n\t</div>\r\n\r\n</span>\r\n\r\n<span *ngIf=\"dbloaded\">\r\n\t<div class=\"col-md-12\">\r\n <h3>Vergelijking</h3>\r\n\t\t<doubleline-chart [label]=\"label\" [data]=\"data3\" [data2]=\"data4\"></doubleline-chart>\r\n\t</div>\r\n\r\n</span>"
module.exports = "<span *ngIf=\"mloaded\">\r\n\r\n\t<div class=\"col-md-6\">\r\n <h3>Martijn</h3>\r\n\t\t<pie-chart [label]=\"label\" [data]=\"data1\"></pie-chart>\r\n\t</div>\r\n\r\n</span>\r\n\r\n<span *ngIf=\"kloaded\">\r\n\t<div class=\"col-md-6\">\r\n <h3>Kenneth</h3>\r\n\t\t<pie-chart [label]=\"label\" [data]=\"data2\"></pie-chart>\r\n\t</div>\r\n\r\n</span>\r\n\r\n<span *ngIf=\"dbloaded\">\r\n\t<div class=\"col-md-12\">\r\n <h3>Vergelijking</h3>\r\n\t\t<doubleline-chart [label]=\"label2\" [data]=\"data3\" [data2]=\"data4\"></doubleline-chart>\r\n\t</div>\r\n\r\n</span>"
/***/ }),
mean-app/dist/main.bundle.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
mean-app/src/app/dashboard.component.html
+1 -1
View File
@@ -18,7 +18,7 @@
<span *ngIf="dbloaded">
<div class="col-md-12">
<h3>Vergelijking</h3>
<doubleline-chart [label]="label" [data]="data3" [data2]="data4"></doubleline-chart>
<doubleline-chart [label]="label2" [data]="data3" [data2]="data4"></doubleline-chart>
</div>
</span>
mean-app/src/app/dashboard.component.ts
+2
View File
@@ -21,6 +21,7 @@ export class DashboardComponent implements OnInit, OnDestroy {
public data4:LineData;
public label:LabelData;
public label2:LabelData;
public mloaded:boolean = false;
public kloaded:boolean = false;
@@ -70,6 +71,7 @@ export class DashboardComponent implements OnInit, OnDestroy {
.subscribe(res => {
this.data3 = res.HOV;
this.label2 = res.labels;
});