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

build

Browse Source
This commit is contained in:
Bluepr1nt
2017-04-11 17:02:52 +02:00
parent 15e54c3dd0
commit 8c02bc5de0
3 changed files with 14 additions and 12 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
+12 -10
View File
@@ -234,20 +234,17 @@ var DashboardComponent = (function () {
DashboardComponent.prototype.refreshData = function () {
var _this = this;
console.log("Refreshing data");
this.label = ({ data: ["Huidig opgenomen", "Huidig terug"] });
this.dataService
.usage("4530303035303031353538313833363134")
.subscribe(function (res) {
//this.data1 = <LineData> ({data: [res.HOV, res.HTV], label: "Verbruik Martijn"});
_this.data1 = ({ data: [21, 25], label: "Verbruik Martijn" });
console.log("data ");
console.log(_this.data1);
_this.data1 = ({ data: [res.HOV, res.HTV], label: "Verbruik Martijn" });
_this.mloaded = true;
});
this.dataService
.usage("4530303235303030303636383733323136")
.subscribe(function (res) {
//this.data1 = <LineData> ({data: [res.HOV, res.HTV], label: "Verbruik Kenneth"});
_this.data2 = ({ data: [18, 13], label: "Verbruik Kenneth" });
_this.data2 = ({ data: [res.HOV, res.HTV], label: "Verbruik Kenneth" });
_this.kloaded = true;
});
this.dataService
@@ -303,6 +300,7 @@ var DetailComponent = (function () {
this.ht = "loading";
this.money = 0;
this.loaded = false;
this.pieloaded = false;
}
DetailComponent.prototype.ngOnInit = function () {
var _this = this;
@@ -316,6 +314,9 @@ var DetailComponent = (function () {
DetailComponent.prototype.refreshData = function (id) {
var _this = this;
console.log("Refreshing data for ", this.id);
this.labelpie1 = ({ data: ["Huidig opgenomen", "Huidig terug"] });
this.labelpie2 = ({ data: ["Totaal opgenomen 2", "Totaal terug 2"] });
this.labelpie3 = ({ data: ["Totaal opgenomen 1", "Totaal terug 1"] });
this.dataService
.get(id)
.subscribe(function (res) {
@@ -333,6 +334,10 @@ var DetailComponent = (function () {
_this.htv = res.HTV;
_this.ht = res.HTN;
_this.money = ((res.TOE1 - res.TTE1) * res.tarief1) + ((res.TOE2 - res.TTE2) * res.tarief2);
_this.datapie1 = ({ data: [res.HOV, res.HTV], label: "Huidig verbruik" });
_this.datapie2 = ({ data: [res.TOE2, res.TTE2], label: "Totaal 2" });
_this.datapie3 = ({ data: [res.TOE1, res.TTE1], label: "Totaal 1" });
_this.pieloaded = true;
});
this.dataService
.name(id)
@@ -865,9 +870,6 @@ var PieChartComponent = (function () {
this.pieChartType = 'pie';
}
PieChartComponent.prototype.ngOnInit = function () {
console.log("Data in piechart");
console.log(this.data);
console.log(this.label);
this.pieChartLabels = this.label.data.slice();
this.pieChartData = this.data.data.slice();
};
@@ -949,7 +951,7 @@ module.exports = "<span *ngIf=\"mloaded\">\r\n\r\n\t<div class=\"col-md-6\">\r\n
/***/ 676:
/***/ (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\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<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"
/***/ }),
mean-app/dist/main.bundle.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long