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

Updated detail page

Browse Source
This commit is contained in:
kennyboy55
2017-04-11 17:31:20 +02:00
parent 5048521a29
commit 6b30378d5e
5 changed files with 36 additions and 33 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
+3 -1
View File
@@ -335,6 +335,8 @@ var DetailComponent = (function () {
_this.data2 = res.HTV;
_this.data3 = res.TOE2;
_this.data4 = res.TTE2;
_this.data3 = res.TOE1;
_this.data4 = res.TTE1;
_this.loaded = true;
});
this.dataService
@@ -972,7 +974,7 @@ module.exports = "<span *ngIf=\"mloaded\">\r\n\r\n\t<div class=\"col-md-6\">\r\n
/***/ 677:
/***/ (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<div class=\"well\">\r\n\t\t\t<b>Huidig opgenomen vermogen:</b> {{hov}} kW <br>\r\n\t\t\t<b>Huidig teruggeleverd vermogen:</b> {{htv}} kW <br>\r\n\t\t\t<b>Huidig tarief:</b> {{ht}} <br>\r\n\t\t\t<b>Totale kosten:</b> €{{money}}\r\n\t\t</div>\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</span>\r\n\r\n<span *ngIf=\"pieloaded\">\r\n\r\n\t<div class=\"col-md-4\">\r\n\t\t<pie-chart [label]=\"labelpie1\" [data]=\"datapie1\"></pie-chart>\r\n\t</div>\r\n\r\n\t<div class=\"col-md-4\">\r\n\t\t<pie-chart [label]=\"labelpie2\" [data]=\"datapie2\"></pie-chart>\r\n\t</div>\r\n\r\n\t<div class=\"col-md-4\">\r\n\t\t<pie-chart [label]=\"labelpie3\" [data]=\"datapie3\"></pie-chart>\r\n\t</div>\r\n\r\n</span>\r\n"
module.exports = "<div class=\"col-md-12\">\r\n\t<h2>{{name}}</h2>\r\n</div>\r\n\r\n<div class=\"col-md-12\">\r\n\t<div class=\"well\">\r\n\t\t<b>Huidig opgenomen vermogen:</b> {{hov}} kW <br>\r\n\t\t<b>Huidig teruggeleverd vermogen:</b> {{htv}} kW <br>\r\n\t\t<b>Huidig tarief:</b> {{ht}} <br>\r\n\t\t<b>Totale kosten:</b> €{{money}}\r\n\t</div>\r\n</div>\r\n\r\n<span *ngIf=\"pieloaded\">\r\n\r\n\t<div class=\"col-md-4\">\r\n\t\t<pie-chart [label]=\"labelpie1\" [data]=\"datapie1\"></pie-chart>\r\n\t</div>\r\n\r\n\t<div class=\"col-md-4\">\r\n\t\t<pie-chart [label]=\"labelpie2\" [data]=\"datapie2\"></pie-chart>\r\n\t</div>\r\n\r\n\t<div class=\"col-md-4\">\r\n\t\t<pie-chart [label]=\"labelpie3\" [data]=\"datapie3\"></pie-chart>\r\n\t</div>\r\n\r\n</span>\r\n\r\n<span *ngIf=\"loaded\">\r\n\r\n\t<div class=\"col-md-12\">\r\n\t\t<doubleline-chart [label]=\"label\" [data]=\"data1\" [data2]=\"data2\"></doubleline-chart>\r\n\t</div>\r\n\r\n\t<div class=\"col-md-12\">\r\n\t\t<doubleline-chart [label]=\"label\" [data]=\"data3\" [data2]=\"data4\"></doubleline-chart>\r\n\t</div>\r\n\r\n\t<div class=\"col-md-12\">\r\n\t\t<doubleline-chart [label]=\"label\" [data]=\"data5\" [data2]=\"data6\"></doubleline-chart>\r\n\t</div>\r\n</span>\r\n\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/src/app/detail.component.html
+26 -30
View File
@@ -1,35 +1,15 @@
<span *ngIf="loaded">
<div class="col-md-12">
<h2>{{name}}</h2>
</div>
<div class="col-md-12">
<h2>{{name}}</h2>
<div class="col-md-12">
<div class="well">
<b>Huidig opgenomen vermogen:</b> {{hov}} kW <br>
<b>Huidig teruggeleverd vermogen:</b> {{htv}} kW <br>
<b>Huidig tarief:</b> {{ht}} <br>
<b>Totale kosten:</b> €{{money}}
</div>
<div class="col-md-12">
<div class="well">
<b>Huidig opgenomen vermogen:</b> {{hov}} kW <br>
<b>Huidig teruggeleverd vermogen:</b> {{htv}} kW <br>
<b>Huidig tarief:</b> {{ht}} <br>
<b>Totale kosten:</b> €{{money}}
</div>
</div>
<div class="col-md-6">
<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>
</div>
<span *ngIf="pieloaded">
@@ -46,3 +26,19 @@
</div>
</span>
<span *ngIf="loaded">
<div class="col-md-12">
<doubleline-chart [label]="label" [data]="data1" [data2]="data2"></doubleline-chart>
</div>
<div class="col-md-12">
<doubleline-chart [label]="label" [data]="data3" [data2]="data4"></doubleline-chart>
</div>
<div class="col-md-12">
<doubleline-chart [label]="label" [data]="data5" [data2]="data6"></doubleline-chart>
</div>
</span>
mean-app/src/app/detail.component.ts
+5
View File
@@ -25,6 +25,8 @@ export class DetailComponent implements OnInit, OnDestroy {
public data2:LineData;
public data3:LineData;
public data4:LineData;
public data5:LineData;
public data6:LineData;
public datapie1:LineData;
public datapie2:LineData;
@@ -79,6 +81,9 @@ export class DetailComponent implements OnInit, OnDestroy {
this.data3 = res.TOE2;
this.data4 = res.TTE2;
this.data3 = res.TOE1;
this.data4 = res.TTE1;
this.loaded = true;
});