Added double line chart
This commit is contained in:
Vendored
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+61
-43
@@ -5,7 +5,7 @@ webpackJsonp([1,4],{
|
||||
|
||||
"use strict";
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_rxjs_add_operator_map__ = __webpack_require__(685);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_rxjs_add_operator_map__ = __webpack_require__(686);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_rxjs_add_operator_map___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_1_rxjs_add_operator_map__);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__angular_http__ = __webpack_require__(312);
|
||||
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return DataService; });
|
||||
@@ -164,7 +164,7 @@ function toDevice(r) {
|
||||
});
|
||||
return device;
|
||||
}
|
||||
//# sourceMappingURL=C:/Users/martijn/Documents/GitHub/smarthome/mean-app/src/data.service.js.map
|
||||
//# sourceMappingURL=C:/Users/avans/Documents/Angular/Smarthome-local/mean-app/src/data.service.js.map
|
||||
|
||||
/***/ }),
|
||||
|
||||
@@ -178,7 +178,7 @@ var LabelData = (function () {
|
||||
}
|
||||
return LabelData;
|
||||
}());
|
||||
//# sourceMappingURL=C:/Users/martijn/Documents/GitHub/smarthome/mean-app/src/label-data.js.map
|
||||
//# sourceMappingURL=C:/Users/avans/Documents/Angular/Smarthome-local/mean-app/src/label-data.js.map
|
||||
|
||||
/***/ }),
|
||||
|
||||
@@ -192,7 +192,7 @@ var LineData = (function () {
|
||||
}
|
||||
return LineData;
|
||||
}());
|
||||
//# sourceMappingURL=C:/Users/martijn/Documents/GitHub/smarthome/mean-app/src/line-data.js.map
|
||||
//# sourceMappingURL=C:/Users/avans/Documents/Angular/Smarthome-local/mean-app/src/line-data.js.map
|
||||
|
||||
/***/ }),
|
||||
|
||||
@@ -222,6 +222,7 @@ var DashboardComponent = (function () {
|
||||
this.dataService = dataService;
|
||||
this.mloaded = false;
|
||||
this.kloaded = false;
|
||||
this.dbloaded = false;
|
||||
}
|
||||
DashboardComponent.prototype.ngOnInit = function () {
|
||||
var _this = this;
|
||||
@@ -250,19 +251,26 @@ var DashboardComponent = (function () {
|
||||
this.dataService
|
||||
.get("4530303235303030303636383733323136")
|
||||
.subscribe(function (res) {
|
||||
_this.data3 = res.HOV;
|
||||
});
|
||||
this.dataService
|
||||
.get("4530303035303031353538313833363134")
|
||||
.subscribe(function (res) {
|
||||
_this.data4 = res.HOV;
|
||||
_this.dbloaded = true;
|
||||
});
|
||||
};
|
||||
DashboardComponent = __decorate([
|
||||
__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__angular_core__["Component"])({
|
||||
selector: 'dashboard',
|
||||
template: __webpack_require__(675)
|
||||
template: __webpack_require__(676)
|
||||
}),
|
||||
__metadata('design:paramtypes', [(typeof (_a = typeof __WEBPACK_IMPORTED_MODULE_2__data_service__["a" /* DataService */] !== 'undefined' && __WEBPACK_IMPORTED_MODULE_2__data_service__["a" /* DataService */]) === 'function' && _a) || Object])
|
||||
], DashboardComponent);
|
||||
return DashboardComponent;
|
||||
var _a;
|
||||
}());
|
||||
//# sourceMappingURL=C:/Users/martijn/Documents/GitHub/smarthome/mean-app/src/dashboard.component.js.map
|
||||
//# sourceMappingURL=C:/Users/avans/Documents/Angular/Smarthome-local/mean-app/src/dashboard.component.js.map
|
||||
|
||||
/***/ }),
|
||||
|
||||
@@ -348,14 +356,14 @@ var DetailComponent = (function () {
|
||||
DetailComponent = __decorate([
|
||||
__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__angular_core__["Component"])({
|
||||
selector: 'detail',
|
||||
template: __webpack_require__(676)
|
||||
template: __webpack_require__(677)
|
||||
}),
|
||||
__metadata('design:paramtypes', [(typeof (_a = typeof __WEBPACK_IMPORTED_MODULE_3__data_service__["a" /* DataService */] !== 'undefined' && __WEBPACK_IMPORTED_MODULE_3__data_service__["a" /* DataService */]) === 'function' && _a) || Object, (typeof (_b = typeof __WEBPACK_IMPORTED_MODULE_1__angular_router__["b" /* ActivatedRoute */] !== 'undefined' && __WEBPACK_IMPORTED_MODULE_1__angular_router__["b" /* ActivatedRoute */]) === 'function' && _b) || Object])
|
||||
], DetailComponent);
|
||||
return DetailComponent;
|
||||
var _a, _b;
|
||||
}());
|
||||
//# sourceMappingURL=C:/Users/martijn/Documents/GitHub/smarthome/mean-app/src/detail.component.js.map
|
||||
//# sourceMappingURL=C:/Users/avans/Documents/Angular/Smarthome-local/mean-app/src/detail.component.js.map
|
||||
|
||||
/***/ }),
|
||||
|
||||
@@ -398,14 +406,14 @@ var DeviceComponent = (function () {
|
||||
DeviceComponent = __decorate([
|
||||
__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__angular_core__["Component"])({
|
||||
selector: 'device',
|
||||
template: __webpack_require__(677)
|
||||
template: __webpack_require__(678)
|
||||
}),
|
||||
__metadata('design:paramtypes', [(typeof (_a = typeof __WEBPACK_IMPORTED_MODULE_2__angular_router__["c" /* Router */] !== 'undefined' && __WEBPACK_IMPORTED_MODULE_2__angular_router__["c" /* Router */]) === 'function' && _a) || Object, (typeof (_b = typeof __WEBPACK_IMPORTED_MODULE_1__data_service__["a" /* DataService */] !== 'undefined' && __WEBPACK_IMPORTED_MODULE_1__data_service__["a" /* DataService */]) === 'function' && _b) || Object])
|
||||
], DeviceComponent);
|
||||
return DeviceComponent;
|
||||
var _a, _b;
|
||||
}());
|
||||
//# sourceMappingURL=C:/Users/martijn/Documents/GitHub/smarthome/mean-app/src/device.component.js.map
|
||||
//# sourceMappingURL=C:/Users/avans/Documents/Angular/Smarthome-local/mean-app/src/device.component.js.map
|
||||
|
||||
/***/ }),
|
||||
|
||||
@@ -450,14 +458,14 @@ var PickerComponent = (function () {
|
||||
PickerComponent = __decorate([
|
||||
__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__angular_core__["Component"])({
|
||||
selector: 'picker',
|
||||
template: __webpack_require__(679)
|
||||
template: __webpack_require__(680)
|
||||
}),
|
||||
__metadata('design:paramtypes', [(typeof (_a = typeof __WEBPACK_IMPORTED_MODULE_1__data_service__["a" /* DataService */] !== 'undefined' && __WEBPACK_IMPORTED_MODULE_1__data_service__["a" /* DataService */]) === 'function' && _a) || Object])
|
||||
], PickerComponent);
|
||||
return PickerComponent;
|
||||
var _a;
|
||||
}());
|
||||
//# sourceMappingURL=C:/Users/martijn/Documents/GitHub/smarthome/mean-app/src/picker.component.js.map
|
||||
//# sourceMappingURL=C:/Users/avans/Documents/Angular/Smarthome-local/mean-app/src/picker.component.js.map
|
||||
|
||||
/***/ }),
|
||||
|
||||
@@ -492,7 +500,7 @@ if (__WEBPACK_IMPORTED_MODULE_2__environments_environment__["a" /* environment *
|
||||
__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_1__angular_core__["enableProdMode"])();
|
||||
}
|
||||
__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__["a" /* platformBrowserDynamic */])().bootstrapModule(__WEBPACK_IMPORTED_MODULE_3__app_app_module__["a" /* AppModule */]);
|
||||
//# sourceMappingURL=C:/Users/martijn/Documents/GitHub/smarthome/mean-app/src/main.js.map
|
||||
//# sourceMappingURL=C:/Users/avans/Documents/Angular/Smarthome-local/mean-app/src/main.js.map
|
||||
|
||||
/***/ }),
|
||||
|
||||
@@ -541,7 +549,7 @@ var AppRoutingModule = (function () {
|
||||
], AppRoutingModule);
|
||||
return AppRoutingModule;
|
||||
}());
|
||||
//# sourceMappingURL=C:/Users/martijn/Documents/GitHub/smarthome/mean-app/src/app-routing.module.js.map
|
||||
//# sourceMappingURL=C:/Users/avans/Documents/Angular/Smarthome-local/mean-app/src/app-routing.module.js.map
|
||||
|
||||
/***/ }),
|
||||
|
||||
@@ -567,14 +575,14 @@ var AppComponent = (function () {
|
||||
AppComponent = __decorate([
|
||||
__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__angular_core__["Component"])({
|
||||
selector: 'app-root',
|
||||
template: __webpack_require__(673),
|
||||
styles: [__webpack_require__(672)]
|
||||
template: __webpack_require__(674),
|
||||
styles: [__webpack_require__(673)]
|
||||
}),
|
||||
__metadata('design:paramtypes', [])
|
||||
], AppComponent);
|
||||
return AppComponent;
|
||||
}());
|
||||
//# sourceMappingURL=C:/Users/martijn/Documents/GitHub/smarthome/mean-app/src/app.component.js.map
|
||||
//# sourceMappingURL=C:/Users/avans/Documents/Angular/Smarthome-local/mean-app/src/app.component.js.map
|
||||
|
||||
/***/ }),
|
||||
|
||||
@@ -652,7 +660,7 @@ var AppModule = (function () {
|
||||
], AppModule);
|
||||
return AppModule;
|
||||
}());
|
||||
//# sourceMappingURL=C:/Users/martijn/Documents/GitHub/smarthome/mean-app/src/app.module.js.map
|
||||
//# sourceMappingURL=C:/Users/avans/Documents/Angular/Smarthome-local/mean-app/src/app.module.js.map
|
||||
|
||||
/***/ }),
|
||||
|
||||
@@ -734,14 +742,14 @@ var LineChartComponent = (function () {
|
||||
LineChartComponent = __decorate([
|
||||
__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__angular_core__["Component"])({
|
||||
selector: 'line-chart',
|
||||
template: __webpack_require__(674)
|
||||
template: __webpack_require__(675)
|
||||
}),
|
||||
__metadata('design:paramtypes', [])
|
||||
], LineChartComponent);
|
||||
return LineChartComponent;
|
||||
var _a, _b, _c;
|
||||
}());
|
||||
//# sourceMappingURL=C:/Users/martijn/Documents/GitHub/smarthome/mean-app/src/chart.component.js.map
|
||||
//# sourceMappingURL=C:/Users/avans/Documents/Angular/Smarthome-local/mean-app/src/chart.component.js.map
|
||||
|
||||
/***/ }),
|
||||
|
||||
@@ -773,7 +781,7 @@ var DoubleLineChartComponent = (function () {
|
||||
// line2Chart
|
||||
this.doublelineChartData = [
|
||||
{ data: [0, 0, 0, 0, 0, 0, 0], label: 'Verbruik' },
|
||||
{ data2: [0, 0, 0, 0, 0, 0, 0], label: 'Verbruik2' }
|
||||
{ data: [0, 0, 0, 0, 0, 0, 0], label: 'Verbruik2' }
|
||||
];
|
||||
this.doublelineChartLabels = ['-1', '-2', '-3', '-4', '-5', '-6', '-7'];
|
||||
this.doublelineChartOptions = {
|
||||
@@ -792,6 +800,14 @@ var DoubleLineChartComponent = (function () {
|
||||
pointBorderColor: '#fff',
|
||||
pointHoverBackgroundColor: '#fff',
|
||||
pointHoverBorderColor: 'rgba(148,159,177,0.8)'
|
||||
},
|
||||
{
|
||||
backgroundColor: 'rgba(148,159,255,0.2)',
|
||||
borderColor: 'rgba(148,159,255,1)',
|
||||
pointBackgroundColor: 'rgba(148,159,255,1)',
|
||||
pointBorderColor: '#fff',
|
||||
pointHoverBackgroundColor: '#fff',
|
||||
pointHoverBorderColor: 'rgba(148,159,255,0.8)'
|
||||
}
|
||||
];
|
||||
this.doublelineChartLegend = true;
|
||||
@@ -800,8 +816,10 @@ var DoubleLineChartComponent = (function () {
|
||||
DoubleLineChartComponent.prototype.ngOnInit = function () {
|
||||
this.doublelineChartLabels = this.label.data.slice();
|
||||
var newDataSet = [];
|
||||
var newLine = { data: this.data.data, data2: this.data2.data, label: this.data.label };
|
||||
var newLine = { data: this.data.data, label: this.data.label };
|
||||
var newLine2 = { data: this.data2.data, label: this.data2.label };
|
||||
newDataSet.push(newLine);
|
||||
newDataSet.push(newLine2);
|
||||
this.doublelineChartData = newDataSet;
|
||||
};
|
||||
DoubleLineChartComponent.prototype.ngOnChanges = function () {
|
||||
@@ -828,14 +846,14 @@ var DoubleLineChartComponent = (function () {
|
||||
DoubleLineChartComponent = __decorate([
|
||||
__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__angular_core__["Component"])({
|
||||
selector: 'doubleline-chart',
|
||||
template: __webpack_require__(678)
|
||||
template: __webpack_require__(679)
|
||||
}),
|
||||
__metadata('design:paramtypes', [])
|
||||
], DoubleLineChartComponent);
|
||||
return DoubleLineChartComponent;
|
||||
var _a, _b, _c, _d;
|
||||
}());
|
||||
//# sourceMappingURL=C:/Users/martijn/Documents/GitHub/smarthome/mean-app/src/doublelinechart.component.js.map
|
||||
//# sourceMappingURL=C:/Users/avans/Documents/Angular/Smarthome-local/mean-app/src/doublelinechart.component.js.map
|
||||
|
||||
/***/ }),
|
||||
|
||||
@@ -893,14 +911,14 @@ var PieChartComponent = (function () {
|
||||
PieChartComponent = __decorate([
|
||||
__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__angular_core__["Component"])({
|
||||
selector: 'pie-chart',
|
||||
template: __webpack_require__(680)
|
||||
template: __webpack_require__(681)
|
||||
}),
|
||||
__metadata('design:paramtypes', [])
|
||||
], PieChartComponent);
|
||||
return PieChartComponent;
|
||||
var _a, _b, _c;
|
||||
}());
|
||||
//# sourceMappingURL=C:/Users/martijn/Documents/GitHub/smarthome/mean-app/src/piechart.component.js.map
|
||||
//# sourceMappingURL=C:/Users/avans/Documents/Angular/Smarthome-local/mean-app/src/piechart.component.js.map
|
||||
|
||||
/***/ }),
|
||||
|
||||
@@ -916,74 +934,74 @@ var PieChartComponent = (function () {
|
||||
var environment = {
|
||||
production: false
|
||||
};
|
||||
//# sourceMappingURL=C:/Users/martijn/Documents/GitHub/smarthome/mean-app/src/environment.js.map
|
||||
|
||||
/***/ }),
|
||||
|
||||
/***/ 672:
|
||||
/***/ (function(module, exports) {
|
||||
|
||||
module.exports = ""
|
||||
//# sourceMappingURL=C:/Users/avans/Documents/Angular/Smarthome-local/mean-app/src/environment.js.map
|
||||
|
||||
/***/ }),
|
||||
|
||||
/***/ 673:
|
||||
/***/ (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 <li routerLink=\"/picker\" routerLinkActive=\"active\"><a routerLink=\"/picker\" routerLinkActive=\"active\">Picker</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"
|
||||
module.exports = ""
|
||||
|
||||
/***/ }),
|
||||
|
||||
/***/ 674:
|
||||
/***/ (function(module, exports) {
|
||||
|
||||
module.exports = "<div style=\"display: block;\">\r\n<canvas baseChart width=\"400\" height=\"200\"\r\n [datasets]=\"lineChartData\"\r\n [labels]=\"lineChartLabels\"\r\n [options]=\"lineChartOptions\"\r\n [colors]=\"lineChartColors\"\r\n [legend]=\"lineChartLegend\"\r\n [chartType]=\"lineChartType\"></canvas>\r\n</div>"
|
||||
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 <li routerLink=\"/picker\" routerLinkActive=\"active\"><a routerLink=\"/picker\" routerLinkActive=\"active\">Picker</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"
|
||||
|
||||
/***/ }),
|
||||
|
||||
/***/ 675:
|
||||
/***/ (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"
|
||||
module.exports = "<div style=\"display: block;\">\r\n<canvas baseChart width=\"400\" height=\"200\"\r\n [datasets]=\"lineChartData\"\r\n [labels]=\"lineChartLabels\"\r\n [options]=\"lineChartOptions\"\r\n [colors]=\"lineChartColors\"\r\n [legend]=\"lineChartLegend\"\r\n [chartType]=\"lineChartType\"></canvas>\r\n</div>"
|
||||
|
||||
/***/ }),
|
||||
|
||||
/***/ 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</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 = "<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>"
|
||||
|
||||
/***/ }),
|
||||
|
||||
/***/ 677:
|
||||
/***/ (function(module, exports) {
|
||||
|
||||
module.exports = "<div>\r\n\r\n<ul>\r\n <li *ngFor=\"let device of devices\" (click)=\"goToDetails(device.sn)\">\r\n {{device.name}}\r\n </li>\r\n</ul>\r\n\r\n</div>"
|
||||
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"
|
||||
|
||||
/***/ }),
|
||||
|
||||
/***/ 678:
|
||||
/***/ (function(module, exports) {
|
||||
|
||||
module.exports = "<div style=\"display: block;\">\r\n <canvas baseChart width=\"400\" height=\"200\"\r\n [datasets]=\"lineChartData\"\r\n [labels]=\"lineChartLabels\"\r\n [options]=\"lineChartOptions\"\r\n [colors]=\"lineChartColors\"\r\n [legend]=\"lineChartLegend\"\r\n [chartType]=\"lineChartType\"></canvas>\r\n</div>\r\n"
|
||||
module.exports = "<div>\r\n\r\n<ul>\r\n <li *ngFor=\"let device of devices\" (click)=\"goToDetails(device.sn)\">\r\n {{device.name}}\r\n </li>\r\n</ul>\r\n\r\n</div>"
|
||||
|
||||
/***/ }),
|
||||
|
||||
/***/ 679:
|
||||
/***/ (function(module, exports) {
|
||||
|
||||
module.exports = "\r\n<div class=\"col-md-12\">\r\n\r\n <form #form=\"ngForm\" (ngSubmit)=\"onSubmit(form.value)\">\r\n\r\n <div class=\"form-group\"> \r\n <label>Meter</label> \r\n <select name=\"meter\" class=\"form-control\" required ngModel>\r\n \t<option value=\"4530303035303031353538313833363134\" selected>Martijn</option>\r\n \t<option value=\"4530303235303030303636383733323136\">Kenneth</option>\r\n </select>\r\n </div>\r\n\r\n <div class=\"form-group\"> \r\n <label>Data type</label> \r\n <select name=\"datatype\" class=\"form-control\" required ngModel>\r\n \t<optgroup label=\"Huidig\">\r\n \t<option value=\"HOV\" selected>Huidig opgenomen vermogen</option>\r\n \t<option value=\"HTV\">Huidig teruggeleverd vermogen</option>\r\n </optgroup>\r\n \t<optgroup label=\"Tarief 1\">\r\n \t<option value=\"TOE1\">Totaal opgenomen energie</option>\r\n \t<option value=\"TTE1\">Totaal teruggeleverde energie</option>\r\n </optgroup>\r\n <optgroup label=\"Tarief 2\">\r\n \t<option value=\"TOE2\">Totaal opgenomen energie</option>\r\n \t<option value=\"TTE2\">Totaal teruggeleverde energie</option>\r\n </optgroup>\r\n </select>\r\n </div>\r\n\r\n <div class=\"form-group\"> \r\n <label>Groupering</label> \r\n <select name=\"group\" class=\"form-control\" required ngModel>\r\n \t<option value=\"minute\">Minuut</option>\r\n \t<option value=\"hour\" selected>Uur</option>\r\n \t<option value=\"day\">Dag</option>\r\n \t<option value=\"month\">Maand</option>\r\n \t<option value=\"year\">Jaar</option>\r\n </select>\r\n </div>\r\n\r\n <div class=\"form-group\">\r\n \t<label>Startdatum</label>\r\n \t<input type=\"date\" name=\"date1\" class=\"form-control\" required ngModel>\r\n </div>\r\n\r\n <div class=\"form-group\">\r\n \t<label>Einddatum</label>\r\n \t<input type=\"date\" name=\"date2\" class=\"form-control\" required ngModel>\r\n </div>\r\n\r\n <input type=\"submit\" class=\"btn btn-primary\" value=\"Update\" />\r\n\r\n </form>\r\n</div>\r\n\r\n<span *ngIf=\"loaded\">\r\n\r\n\t<div class=\"col-md-12\">\r\n\t\t<line-chart [label]=\"label\" [data]=\"data\"></line-chart>\r\n\t</div>\r\n\r\n</span>\r\n"
|
||||
module.exports = "<div style=\"display: block;\">\r\n <canvas baseChart width=\"400\" height=\"200\"\r\n [datasets]=\"lineChartData\"\r\n [labels]=\"lineChartLabels\"\r\n [options]=\"lineChartOptions\"\r\n [colors]=\"lineChartColors\"\r\n [legend]=\"lineChartLegend\"\r\n [chartType]=\"lineChartType\"></canvas>\r\n</div>\r\n"
|
||||
|
||||
/***/ }),
|
||||
|
||||
/***/ 680:
|
||||
/***/ (function(module, exports) {
|
||||
|
||||
module.exports = "\r\n<div class=\"col-md-12\">\r\n\r\n <form #form=\"ngForm\" (ngSubmit)=\"onSubmit(form.value)\">\r\n\r\n <div class=\"form-group\"> \r\n <label>Meter</label> \r\n <select name=\"meter\" class=\"form-control\" required ngModel>\r\n \t<option value=\"4530303035303031353538313833363134\" selected>Martijn</option>\r\n \t<option value=\"4530303235303030303636383733323136\">Kenneth</option>\r\n </select>\r\n </div>\r\n\r\n <div class=\"form-group\"> \r\n <label>Data type</label> \r\n <select name=\"datatype\" class=\"form-control\" required ngModel>\r\n \t<optgroup label=\"Huidig\">\r\n \t<option value=\"HOV\" selected>Huidig opgenomen vermogen</option>\r\n \t<option value=\"HTV\">Huidig teruggeleverd vermogen</option>\r\n </optgroup>\r\n \t<optgroup label=\"Tarief 1\">\r\n \t<option value=\"TOE1\">Totaal opgenomen energie</option>\r\n \t<option value=\"TTE1\">Totaal teruggeleverde energie</option>\r\n </optgroup>\r\n <optgroup label=\"Tarief 2\">\r\n \t<option value=\"TOE2\">Totaal opgenomen energie</option>\r\n \t<option value=\"TTE2\">Totaal teruggeleverde energie</option>\r\n </optgroup>\r\n </select>\r\n </div>\r\n\r\n <div class=\"form-group\"> \r\n <label>Groupering</label> \r\n <select name=\"group\" class=\"form-control\" required ngModel>\r\n \t<option value=\"minute\">Minuut</option>\r\n \t<option value=\"hour\" selected>Uur</option>\r\n \t<option value=\"day\">Dag</option>\r\n \t<option value=\"month\">Maand</option>\r\n \t<option value=\"year\">Jaar</option>\r\n </select>\r\n </div>\r\n\r\n <div class=\"form-group\">\r\n \t<label>Startdatum</label>\r\n \t<input type=\"date\" name=\"date1\" class=\"form-control\" required ngModel>\r\n </div>\r\n\r\n <div class=\"form-group\">\r\n \t<label>Einddatum</label>\r\n \t<input type=\"date\" name=\"date2\" class=\"form-control\" required ngModel>\r\n </div>\r\n\r\n <input type=\"submit\" class=\"btn btn-primary\" value=\"Update\" />\r\n\r\n </form>\r\n</div>\r\n\r\n<span *ngIf=\"loaded\">\r\n\r\n\t<div class=\"col-md-12\">\r\n\t\t<line-chart [label]=\"label\" [data]=\"data\"></line-chart>\r\n\t</div>\r\n\r\n</span>\r\n"
|
||||
|
||||
/***/ }),
|
||||
|
||||
/***/ 681:
|
||||
/***/ (function(module, exports) {
|
||||
|
||||
module.exports = "<div style=\"display: block;\">\r\n <canvas baseChart\r\n [data]=\"pieChartData\"\r\n [labels]=\"pieChartLabels\"\r\n [chartType]=\"pieChartType\"></canvas>\r\n</div>\r\n"
|
||||
|
||||
/***/ }),
|
||||
|
||||
/***/ 705:
|
||||
/***/ 706:
|
||||
/***/ (function(module, exports, __webpack_require__) {
|
||||
|
||||
module.exports = __webpack_require__(394);
|
||||
@@ -991,5 +1009,5 @@ module.exports = __webpack_require__(394);
|
||||
|
||||
/***/ })
|
||||
|
||||
},[705]);
|
||||
},[706]);
|
||||
//# sourceMappingURL=main.bundle.map
|
||||
Vendored
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+10
-9
@@ -2692,7 +2692,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_13_core_js_es6_reflect___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_13_core_js_es6_reflect__);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_14_core_js_es7_reflect__ = __webpack_require__(532);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_14_core_js_es7_reflect___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_14_core_js_es7_reflect__);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_15_zone_js_dist_zone__ = __webpack_require__(704);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_15_zone_js_dist_zone__ = __webpack_require__(705);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_15_zone_js_dist_zone___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_15_zone_js_dist_zone__);
|
||||
|
||||
|
||||
@@ -2724,7 +2724,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
|
||||
// NgClass on SVG elements
|
||||
// Needed for: IE10, IE11
|
||||
// import 'classlist.js';
|
||||
//# sourceMappingURL=C:/Users/martijn/Documents/GitHub/smarthome/mean-app/src/polyfills.js.map
|
||||
//# sourceMappingURL=C:/Users/avans/Documents/Angular/Smarthome-local/mean-app/src/polyfills.js.map
|
||||
|
||||
/***/ }),
|
||||
/* 396 */,
|
||||
@@ -5662,7 +5662,8 @@ metadata.exp({metadata: function metadata(metadataKey, metadataValue){
|
||||
/* 668 */,
|
||||
/* 669 */,
|
||||
/* 670 */,
|
||||
/* 671 */
|
||||
/* 671 */,
|
||||
/* 672 */
|
||||
/***/ (function(module, exports) {
|
||||
|
||||
// shim for using process in browser
|
||||
@@ -5848,7 +5849,6 @@ process.umask = function() { return 0; };
|
||||
|
||||
|
||||
/***/ }),
|
||||
/* 672 */,
|
||||
/* 673 */,
|
||||
/* 674 */,
|
||||
/* 675 */,
|
||||
@@ -5880,7 +5880,8 @@ process.umask = function() { return 0; };
|
||||
/* 701 */,
|
||||
/* 702 */,
|
||||
/* 703 */,
|
||||
/* 704 */
|
||||
/* 704 */,
|
||||
/* 705 */
|
||||
/***/ (function(module, exports, __webpack_require__) {
|
||||
|
||||
/* WEBPACK VAR INJECTION */(function(global, process) {/**
|
||||
@@ -7979,16 +7980,16 @@ if (_global['PromiseRejectionEvent']) {
|
||||
|
||||
})));
|
||||
|
||||
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(47), __webpack_require__(671)))
|
||||
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(47), __webpack_require__(672)))
|
||||
|
||||
/***/ }),
|
||||
/* 705 */,
|
||||
/* 706 */
|
||||
/* 706 */,
|
||||
/* 707 */
|
||||
/***/ (function(module, exports, __webpack_require__) {
|
||||
|
||||
module.exports = __webpack_require__(395);
|
||||
|
||||
|
||||
/***/ })
|
||||
],[706]);
|
||||
],[707]);
|
||||
//# sourceMappingURL=polyfills.bundle.map
|
||||
Vendored
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+4
-4
@@ -9,7 +9,7 @@ webpackJsonp([2,4],{
|
||||
var content = __webpack_require__(668);
|
||||
if(typeof content === 'string') content = [[module.i, content, '']];
|
||||
// add the styles to the DOM
|
||||
var update = __webpack_require__(703)(content, {});
|
||||
var update = __webpack_require__(704)(content, {});
|
||||
if(content.locals) module.exports = content.locals;
|
||||
// Hot Module Replacement
|
||||
if(false) {
|
||||
@@ -99,7 +99,7 @@ module.exports = function() {
|
||||
|
||||
/***/ }),
|
||||
|
||||
/***/ 703:
|
||||
/***/ 704:
|
||||
/***/ (function(module, exports) {
|
||||
|
||||
/*
|
||||
@@ -352,7 +352,7 @@ function updateLink(linkElement, obj) {
|
||||
|
||||
/***/ }),
|
||||
|
||||
/***/ 707:
|
||||
/***/ 708:
|
||||
/***/ (function(module, exports, __webpack_require__) {
|
||||
|
||||
module.exports = __webpack_require__(396);
|
||||
@@ -360,5 +360,5 @@ module.exports = __webpack_require__(396);
|
||||
|
||||
/***/ })
|
||||
|
||||
},[707]);
|
||||
},[708]);
|
||||
//# sourceMappingURL=styles.bundle.map
|
||||
Vendored
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+106
-93
@@ -4238,7 +4238,7 @@ function CompilerInjectable() {
|
||||
"use strict";
|
||||
|
||||
var root_1 = __webpack_require__(46);
|
||||
var toSubscriber_1 = __webpack_require__(701);
|
||||
var toSubscriber_1 = __webpack_require__(702);
|
||||
var observable_1 = __webpack_require__(163);
|
||||
/**
|
||||
* A representation of any set of values over any amount of time. This the most basic building block
|
||||
@@ -4321,10 +4321,7 @@ var Observable = (function () {
|
||||
throw new Error('no Promise impl found');
|
||||
}
|
||||
return new PromiseCtor(function (resolve, reject) {
|
||||
// Must be declared in a separate statement to avoid a RefernceError when
|
||||
// accessing subscription below in the closure due to Temporal Dead Zone.
|
||||
var subscription;
|
||||
subscription = _this.subscribe(function (value) {
|
||||
var subscription = _this.subscribe(function (value) {
|
||||
if (subscription) {
|
||||
// if there is a subscription, then we can surmise
|
||||
// the next handling is asynchronous. Any errors thrown
|
||||
@@ -4358,7 +4355,7 @@ var Observable = (function () {
|
||||
* @method Symbol.observable
|
||||
* @return {Observable} this instance of the observable
|
||||
*/
|
||||
Observable.prototype[observable_1.observable] = function () {
|
||||
Observable.prototype[observable_1.$$observable] = function () {
|
||||
return this;
|
||||
};
|
||||
// HACK: Since TypeScript inherits static properties too, we have to
|
||||
@@ -5728,7 +5725,7 @@ var Subscriber = (function (_super) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
Subscriber.prototype[rxSubscriber_1.rxSubscriber] = function () { return this; };
|
||||
Subscriber.prototype[rxSubscriber_1.$$rxSubscriber] = function () { return this; };
|
||||
/**
|
||||
* A static factory for a Subscriber, given a (potentially partial) definition
|
||||
* of an Observer.
|
||||
@@ -5830,16 +5827,14 @@ var SafeSubscriber = (function (_super) {
|
||||
next = observerOrNext;
|
||||
}
|
||||
else if (observerOrNext) {
|
||||
context = observerOrNext;
|
||||
next = observerOrNext.next;
|
||||
error = observerOrNext.error;
|
||||
complete = observerOrNext.complete;
|
||||
if (observerOrNext !== Observer_1.empty) {
|
||||
context = Object.create(observerOrNext);
|
||||
if (isFunction_1.isFunction(context.unsubscribe)) {
|
||||
this.add(context.unsubscribe.bind(context));
|
||||
}
|
||||
context.unsubscribe = this.unsubscribe.bind(this);
|
||||
if (isFunction_1.isFunction(context.unsubscribe)) {
|
||||
this.add(context.unsubscribe.bind(context));
|
||||
}
|
||||
context.unsubscribe = this.unsubscribe.bind(this);
|
||||
}
|
||||
this._context = context;
|
||||
this._next = next;
|
||||
@@ -6931,7 +6926,7 @@ function templateVisitAll(visitor, asts, context) {
|
||||
|
||||
"use strict";
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_rxjs_operator_toPromise__ = __webpack_require__(693);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_rxjs_operator_toPromise__ = __webpack_require__(694);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_rxjs_operator_toPromise___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_1_rxjs_operator_toPromise__);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__facade_collection__ = __webpack_require__(309);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__facade_lang__ = __webpack_require__(76);
|
||||
@@ -7522,7 +7517,7 @@ function ControlContainer_tsickle_Closure_declarations() {
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_rxjs_operator_concatAll___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_2_rxjs_operator_concatAll__);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_rxjs_operator_every__ = __webpack_require__(385);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_rxjs_operator_every___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_3_rxjs_operator_every__);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_rxjs_operator_last__ = __webpack_require__(690);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_rxjs_operator_last__ = __webpack_require__(691);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_rxjs_operator_last___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_4_rxjs_operator_last__);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5_rxjs_operator_map__ = __webpack_require__(111);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5_rxjs_operator_map___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_5_rxjs_operator_map__);
|
||||
@@ -11181,7 +11176,7 @@ var Observable_1 = __webpack_require__(15);
|
||||
var Subscriber_1 = __webpack_require__(30);
|
||||
var Subscription_1 = __webpack_require__(162);
|
||||
var ObjectUnsubscribedError_1 = __webpack_require__(387);
|
||||
var SubjectSubscription_1 = __webpack_require__(684);
|
||||
var SubjectSubscription_1 = __webpack_require__(685);
|
||||
var rxSubscriber_1 = __webpack_require__(245);
|
||||
/**
|
||||
* @class SubjectSubscriber<T>
|
||||
@@ -11208,7 +11203,7 @@ var Subject = (function (_super) {
|
||||
this.hasError = false;
|
||||
this.thrownError = null;
|
||||
}
|
||||
Subject.prototype[rxSubscriber_1.rxSubscriber] = function () {
|
||||
Subject.prototype[rxSubscriber_1.$$rxSubscriber] = function () {
|
||||
return new SubjectSubscriber(this);
|
||||
};
|
||||
Subject.prototype.lift = function (operator) {
|
||||
@@ -21146,7 +21141,7 @@ var XSRFStrategy = (function () {
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8_rxjs_operator_map___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_8_rxjs_operator_map__);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9_rxjs_operator_mergeMap__ = __webpack_require__(112);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9_rxjs_operator_mergeMap___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_9_rxjs_operator_mergeMap__);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10_rxjs_operator_reduce__ = __webpack_require__(692);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10_rxjs_operator_reduce__ = __webpack_require__(693);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10_rxjs_operator_reduce___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_10_rxjs_operator_reduce__);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__apply_redirects__ = __webpack_require__(501);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__config__ = __webpack_require__(502);
|
||||
@@ -32357,7 +32352,7 @@ function RouterOutletMap_tsickle_Closure_declarations() {
|
||||
function __export(m) {
|
||||
for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
|
||||
}
|
||||
__export(__webpack_require__(670));
|
||||
__export(__webpack_require__(671));
|
||||
|
||||
|
||||
/***/ }),
|
||||
@@ -32369,9 +32364,9 @@ __export(__webpack_require__(670));
|
||||
var isArray_1 = __webpack_require__(247);
|
||||
var isObject_1 = __webpack_require__(391);
|
||||
var isFunction_1 = __webpack_require__(390);
|
||||
var tryCatch_1 = __webpack_require__(702);
|
||||
var tryCatch_1 = __webpack_require__(703);
|
||||
var errorObject_1 = __webpack_require__(388);
|
||||
var UnsubscriptionError_1 = __webpack_require__(698);
|
||||
var UnsubscriptionError_1 = __webpack_require__(699);
|
||||
/**
|
||||
* Represents a disposable resource, such as the execution of an Observable. A
|
||||
* Subscription has one important method, `unsubscribe`, that takes no argument
|
||||
@@ -32584,11 +32579,7 @@ function getSymbolObservable(context) {
|
||||
return $$observable;
|
||||
}
|
||||
exports.getSymbolObservable = getSymbolObservable;
|
||||
exports.observable = getSymbolObservable(root_1.root);
|
||||
/**
|
||||
* @deprecated use observable instead
|
||||
*/
|
||||
exports.$$observable = exports.observable;
|
||||
exports.$$observable = getSymbolObservable(root_1.root);
|
||||
//# sourceMappingURL=observable.js.map
|
||||
|
||||
/***/ }),
|
||||
@@ -45356,7 +45347,7 @@ exports.OuterSubscriber = OuterSubscriber;
|
||||
|
||||
"use strict";
|
||||
|
||||
var FromObservable_1 = __webpack_require__(687);
|
||||
var FromObservable_1 = __webpack_require__(688);
|
||||
exports.from = FromObservable_1.FromObservable.create;
|
||||
//# sourceMappingURL=from.js.map
|
||||
|
||||
@@ -45524,11 +45515,7 @@ function symbolIteratorPonyfill(root) {
|
||||
}
|
||||
}
|
||||
exports.symbolIteratorPonyfill = symbolIteratorPonyfill;
|
||||
exports.iterator = symbolIteratorPonyfill(root_1.root);
|
||||
/**
|
||||
* @deprecated use iterator instead
|
||||
*/
|
||||
exports.$$iterator = exports.iterator;
|
||||
exports.$$iterator = symbolIteratorPonyfill(root_1.root);
|
||||
//# sourceMappingURL=iterator.js.map
|
||||
|
||||
/***/ }),
|
||||
@@ -45539,12 +45526,8 @@ exports.$$iterator = exports.iterator;
|
||||
|
||||
var root_1 = __webpack_require__(46);
|
||||
var Symbol = root_1.root.Symbol;
|
||||
exports.rxSubscriber = (typeof Symbol === 'function' && typeof Symbol.for === 'function') ?
|
||||
exports.$$rxSubscriber = (typeof Symbol === 'function' && typeof Symbol.for === 'function') ?
|
||||
Symbol.for('rxSubscriber') : '@@rxSubscriber';
|
||||
/**
|
||||
* @deprecated use rxSubscriber instead
|
||||
*/
|
||||
exports.$$rxSubscriber = exports.rxSubscriber;
|
||||
//# sourceMappingURL=rxSubscriber.js.map
|
||||
|
||||
/***/ }),
|
||||
@@ -45602,7 +45585,7 @@ var isPromise_1 = __webpack_require__(392);
|
||||
var isObject_1 = __webpack_require__(391);
|
||||
var Observable_1 = __webpack_require__(15);
|
||||
var iterator_1 = __webpack_require__(244);
|
||||
var InnerSubscriber_1 = __webpack_require__(681);
|
||||
var InnerSubscriber_1 = __webpack_require__(682);
|
||||
var observable_1 = __webpack_require__(163);
|
||||
function subscribeToResult(outerSubscriber, result, outerValue, outerIndex) {
|
||||
var destination = new InnerSubscriber_1.InnerSubscriber(outerSubscriber, outerValue, outerIndex);
|
||||
@@ -45640,8 +45623,8 @@ function subscribeToResult(outerSubscriber, result, outerValue, outerIndex) {
|
||||
});
|
||||
return destination;
|
||||
}
|
||||
else if (result && typeof result[iterator_1.iterator] === 'function') {
|
||||
var iterator = result[iterator_1.iterator]();
|
||||
else if (result && typeof result[iterator_1.$$iterator] === 'function') {
|
||||
var iterator = result[iterator_1.$$iterator]();
|
||||
do {
|
||||
var item = iterator.next();
|
||||
if (item.done) {
|
||||
@@ -45654,8 +45637,8 @@ function subscribeToResult(outerSubscriber, result, outerValue, outerIndex) {
|
||||
}
|
||||
} while (true);
|
||||
}
|
||||
else if (result && typeof result[observable_1.observable] === 'function') {
|
||||
var obs = result[observable_1.observable]();
|
||||
else if (result && typeof result[observable_1.$$observable] === 'function') {
|
||||
var obs = result[observable_1.$$observable]();
|
||||
if (typeof obs.subscribe !== 'function') {
|
||||
destination.error(new TypeError('Provided object does not correctly implement Symbol.observable'));
|
||||
}
|
||||
@@ -63308,7 +63291,7 @@ function provideRouterInitializer() {
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_rxjs_operator_catch___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_3_rxjs_operator_catch__);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_rxjs_operator_concatMap__ = __webpack_require__(384);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_rxjs_operator_concatMap___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_4_rxjs_operator_concatMap__);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5_rxjs_operator_filter__ = __webpack_require__(689);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5_rxjs_operator_filter__ = __webpack_require__(690);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5_rxjs_operator_filter___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_5_rxjs_operator_filter__);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6_rxjs_operator_mergeAll__ = __webpack_require__(243);
|
||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6_rxjs_operator_mergeAll___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_6_rxjs_operator_mergeAll__);
|
||||
@@ -63584,7 +63567,7 @@ var __extends = (this && this.__extends) || function (d, b) {
|
||||
var Observable_1 = __webpack_require__(15);
|
||||
var ScalarObservable_1 = __webpack_require__(381);
|
||||
var EmptyObservable_1 = __webpack_require__(378);
|
||||
var isScheduler_1 = __webpack_require__(700);
|
||||
var isScheduler_1 = __webpack_require__(701);
|
||||
/**
|
||||
* We need this JSDoc comment for affecting ESDoc.
|
||||
* @extends {Ignored}
|
||||
@@ -63796,9 +63779,9 @@ var __extends = (this && this.__extends) || function (d, b) {
|
||||
function __() { this.constructor = d; }
|
||||
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
||||
};
|
||||
var isNumeric_1 = __webpack_require__(699);
|
||||
var isNumeric_1 = __webpack_require__(700);
|
||||
var Observable_1 = __webpack_require__(15);
|
||||
var async_1 = __webpack_require__(697);
|
||||
var async_1 = __webpack_require__(698);
|
||||
/**
|
||||
* We need this JSDoc comment for affecting ESDoc.
|
||||
* @extends {Ignored}
|
||||
@@ -81398,12 +81381,17 @@ var BaseChartDirective = (function () {
|
||||
BaseChartDirective.prototype.ngOnChanges = function (changes) {
|
||||
if (this.initFlag) {
|
||||
// Check if the changes are in the data or datasets
|
||||
if (changes.hasOwnProperty('data') || changes.hasOwnProperty('datasets') || changes.hasOwnProperty('labels')) {
|
||||
this.chart.data.datasets = this.getDatasets();
|
||||
this.chart.data.labels = this.labels;
|
||||
if (changes.hasOwnProperty('data') || changes.hasOwnProperty('datasets')) {
|
||||
if (changes['data']) {
|
||||
this.updateChartData(changes['data'].currentValue);
|
||||
}
|
||||
else {
|
||||
this.updateChartData(changes['datasets'].currentValue);
|
||||
}
|
||||
this.chart.update();
|
||||
}
|
||||
else {
|
||||
// otherwise rebuild the chart
|
||||
this.refresh();
|
||||
}
|
||||
}
|
||||
@@ -81449,6 +81437,19 @@ var BaseChartDirective = (function () {
|
||||
}
|
||||
return new Chart(ctx, opts);
|
||||
};
|
||||
BaseChartDirective.prototype.updateChartData = function (newDataValues) {
|
||||
if (Array.isArray(newDataValues[0].data)) {
|
||||
this.chart.data.datasets.forEach(function (dataset, i) {
|
||||
dataset.data = newDataValues[i].data;
|
||||
if (newDataValues[i].label) {
|
||||
dataset.label = newDataValues[i].label;
|
||||
}
|
||||
});
|
||||
}
|
||||
else {
|
||||
this.chart.data.datasets[0].data = newDataValues;
|
||||
}
|
||||
};
|
||||
BaseChartDirective.prototype.getDatasets = function () {
|
||||
var _this = this;
|
||||
var datasets = void 0;
|
||||
@@ -81508,9 +81509,9 @@ var BaseChartDirective = (function () {
|
||||
{ type: core_1.Directive, args: [{ selector: 'canvas[baseChart]', exportAs: 'base-chart' },] },
|
||||
];
|
||||
/** @nocollapse */
|
||||
BaseChartDirective.ctorParameters = [
|
||||
BaseChartDirective.ctorParameters = function () { return [
|
||||
{ type: core_1.ElementRef, },
|
||||
];
|
||||
]; };
|
||||
BaseChartDirective.propDecorators = {
|
||||
'data': [{ type: core_1.Input },],
|
||||
'datasets': [{ type: core_1.Input },],
|
||||
@@ -81627,14 +81628,25 @@ var ChartsModule = (function () {
|
||||
},] },
|
||||
];
|
||||
/** @nocollapse */
|
||||
ChartsModule.ctorParameters = [];
|
||||
ChartsModule.ctorParameters = function () { return []; };
|
||||
return ChartsModule;
|
||||
}());
|
||||
exports.ChartsModule = ChartsModule;
|
||||
|
||||
|
||||
/***/ }),
|
||||
/* 671 */,
|
||||
/* 671 */
|
||||
/***/ (function(module, exports, __webpack_require__) {
|
||||
|
||||
"use strict";
|
||||
|
||||
function __export(m) {
|
||||
for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
|
||||
}
|
||||
__export(__webpack_require__(670));
|
||||
|
||||
|
||||
/***/ }),
|
||||
/* 672 */,
|
||||
/* 673 */,
|
||||
/* 674 */,
|
||||
@@ -81644,7 +81656,8 @@ exports.ChartsModule = ChartsModule;
|
||||
/* 678 */,
|
||||
/* 679 */,
|
||||
/* 680 */,
|
||||
/* 681 */
|
||||
/* 681 */,
|
||||
/* 682 */
|
||||
/***/ (function(module, exports, __webpack_require__) {
|
||||
|
||||
"use strict";
|
||||
@@ -81686,7 +81699,7 @@ exports.InnerSubscriber = InnerSubscriber;
|
||||
//# sourceMappingURL=InnerSubscriber.js.map
|
||||
|
||||
/***/ }),
|
||||
/* 682 */
|
||||
/* 683 */
|
||||
/***/ (function(module, exports, __webpack_require__) {
|
||||
|
||||
"use strict";
|
||||
@@ -81819,7 +81832,7 @@ exports.Notification = Notification;
|
||||
//# sourceMappingURL=Notification.js.map
|
||||
|
||||
/***/ }),
|
||||
/* 683 */
|
||||
/* 684 */
|
||||
/***/ (function(module, exports, __webpack_require__) {
|
||||
|
||||
"use strict";
|
||||
@@ -81874,7 +81887,7 @@ exports.Scheduler = Scheduler;
|
||||
//# sourceMappingURL=Scheduler.js.map
|
||||
|
||||
/***/ }),
|
||||
/* 684 */
|
||||
/* 685 */
|
||||
/***/ (function(module, exports, __webpack_require__) {
|
||||
|
||||
"use strict";
|
||||
@@ -81920,7 +81933,7 @@ exports.SubjectSubscription = SubjectSubscription;
|
||||
//# sourceMappingURL=SubjectSubscription.js.map
|
||||
|
||||
/***/ }),
|
||||
/* 685 */
|
||||
/* 686 */
|
||||
/***/ (function(module, exports, __webpack_require__) {
|
||||
|
||||
"use strict";
|
||||
@@ -81931,7 +81944,7 @@ Observable_1.Observable.prototype.map = map_1.map;
|
||||
//# sourceMappingURL=map.js.map
|
||||
|
||||
/***/ }),
|
||||
/* 686 */
|
||||
/* 687 */
|
||||
/***/ (function(module, exports, __webpack_require__) {
|
||||
|
||||
"use strict";
|
||||
@@ -82007,7 +82020,7 @@ exports.ArrayLikeObservable = ArrayLikeObservable;
|
||||
//# sourceMappingURL=ArrayLikeObservable.js.map
|
||||
|
||||
/***/ }),
|
||||
/* 687 */
|
||||
/* 688 */
|
||||
/***/ (function(module, exports, __webpack_require__) {
|
||||
|
||||
"use strict";
|
||||
@@ -82021,12 +82034,12 @@ var isArray_1 = __webpack_require__(247);
|
||||
var isArrayLike_1 = __webpack_require__(389);
|
||||
var isPromise_1 = __webpack_require__(392);
|
||||
var PromiseObservable_1 = __webpack_require__(380);
|
||||
var IteratorObservable_1 = __webpack_require__(688);
|
||||
var IteratorObservable_1 = __webpack_require__(689);
|
||||
var ArrayObservable_1 = __webpack_require__(377);
|
||||
var ArrayLikeObservable_1 = __webpack_require__(686);
|
||||
var ArrayLikeObservable_1 = __webpack_require__(687);
|
||||
var iterator_1 = __webpack_require__(244);
|
||||
var Observable_1 = __webpack_require__(15);
|
||||
var observeOn_1 = __webpack_require__(691);
|
||||
var observeOn_1 = __webpack_require__(692);
|
||||
var observable_1 = __webpack_require__(163);
|
||||
/**
|
||||
* We need this JSDoc comment for affecting ESDoc.
|
||||
@@ -82098,7 +82111,7 @@ var FromObservable = (function (_super) {
|
||||
*/
|
||||
FromObservable.create = function (ish, scheduler) {
|
||||
if (ish != null) {
|
||||
if (typeof ish[observable_1.observable] === 'function') {
|
||||
if (typeof ish[observable_1.$$observable] === 'function') {
|
||||
if (ish instanceof Observable_1.Observable && !scheduler) {
|
||||
return ish;
|
||||
}
|
||||
@@ -82110,7 +82123,7 @@ var FromObservable = (function (_super) {
|
||||
else if (isPromise_1.isPromise(ish)) {
|
||||
return new PromiseObservable_1.PromiseObservable(ish, scheduler);
|
||||
}
|
||||
else if (typeof ish[iterator_1.iterator] === 'function' || typeof ish === 'string') {
|
||||
else if (typeof ish[iterator_1.$$iterator] === 'function' || typeof ish === 'string') {
|
||||
return new IteratorObservable_1.IteratorObservable(ish, scheduler);
|
||||
}
|
||||
else if (isArrayLike_1.isArrayLike(ish)) {
|
||||
@@ -82123,10 +82136,10 @@ var FromObservable = (function (_super) {
|
||||
var ish = this.ish;
|
||||
var scheduler = this.scheduler;
|
||||
if (scheduler == null) {
|
||||
return ish[observable_1.observable]().subscribe(subscriber);
|
||||
return ish[observable_1.$$observable]().subscribe(subscriber);
|
||||
}
|
||||
else {
|
||||
return ish[observable_1.observable]().subscribe(new observeOn_1.ObserveOnSubscriber(subscriber, scheduler, 0));
|
||||
return ish[observable_1.$$observable]().subscribe(new observeOn_1.ObserveOnSubscriber(subscriber, scheduler, 0));
|
||||
}
|
||||
};
|
||||
return FromObservable;
|
||||
@@ -82135,7 +82148,7 @@ exports.FromObservable = FromObservable;
|
||||
//# sourceMappingURL=FromObservable.js.map
|
||||
|
||||
/***/ }),
|
||||
/* 688 */
|
||||
/* 689 */
|
||||
/***/ (function(module, exports, __webpack_require__) {
|
||||
|
||||
"use strict";
|
||||
@@ -82225,7 +82238,7 @@ var StringIterator = (function () {
|
||||
this.idx = idx;
|
||||
this.len = len;
|
||||
}
|
||||
StringIterator.prototype[iterator_1.iterator] = function () { return (this); };
|
||||
StringIterator.prototype[iterator_1.$$iterator] = function () { return (this); };
|
||||
StringIterator.prototype.next = function () {
|
||||
return this.idx < this.len ? {
|
||||
done: false,
|
||||
@@ -82245,7 +82258,7 @@ var ArrayIterator = (function () {
|
||||
this.idx = idx;
|
||||
this.len = len;
|
||||
}
|
||||
ArrayIterator.prototype[iterator_1.iterator] = function () { return this; };
|
||||
ArrayIterator.prototype[iterator_1.$$iterator] = function () { return this; };
|
||||
ArrayIterator.prototype.next = function () {
|
||||
return this.idx < this.len ? {
|
||||
done: false,
|
||||
@@ -82258,7 +82271,7 @@ var ArrayIterator = (function () {
|
||||
return ArrayIterator;
|
||||
}());
|
||||
function getIterator(obj) {
|
||||
var i = obj[iterator_1.iterator];
|
||||
var i = obj[iterator_1.$$iterator];
|
||||
if (!i && typeof obj === 'string') {
|
||||
return new StringIterator(obj);
|
||||
}
|
||||
@@ -82268,7 +82281,7 @@ function getIterator(obj) {
|
||||
if (!i) {
|
||||
throw new TypeError('object is not iterable');
|
||||
}
|
||||
return obj[iterator_1.iterator]();
|
||||
return obj[iterator_1.$$iterator]();
|
||||
}
|
||||
var maxSafeInteger = Math.pow(2, 53) - 1;
|
||||
function toLength(o) {
|
||||
@@ -82304,7 +82317,7 @@ function sign(value) {
|
||||
//# sourceMappingURL=IteratorObservable.js.map
|
||||
|
||||
/***/ }),
|
||||
/* 689 */
|
||||
/* 690 */
|
||||
/***/ (function(module, exports, __webpack_require__) {
|
||||
|
||||
"use strict";
|
||||
@@ -82403,7 +82416,7 @@ var FilterSubscriber = (function (_super) {
|
||||
//# sourceMappingURL=filter.js.map
|
||||
|
||||
/***/ }),
|
||||
/* 690 */
|
||||
/* 691 */
|
||||
/***/ (function(module, exports, __webpack_require__) {
|
||||
|
||||
"use strict";
|
||||
@@ -82528,7 +82541,7 @@ var LastSubscriber = (function (_super) {
|
||||
//# sourceMappingURL=last.js.map
|
||||
|
||||
/***/ }),
|
||||
/* 691 */
|
||||
/* 692 */
|
||||
/***/ (function(module, exports, __webpack_require__) {
|
||||
|
||||
"use strict";
|
||||
@@ -82539,7 +82552,7 @@ var __extends = (this && this.__extends) || function (d, b) {
|
||||
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
||||
};
|
||||
var Subscriber_1 = __webpack_require__(30);
|
||||
var Notification_1 = __webpack_require__(682);
|
||||
var Notification_1 = __webpack_require__(683);
|
||||
/**
|
||||
* @see {@link Notification}
|
||||
*
|
||||
@@ -82610,7 +82623,7 @@ exports.ObserveOnMessage = ObserveOnMessage;
|
||||
//# sourceMappingURL=observeOn.js.map
|
||||
|
||||
/***/ }),
|
||||
/* 692 */
|
||||
/* 693 */
|
||||
/***/ (function(module, exports, __webpack_require__) {
|
||||
|
||||
"use strict";
|
||||
@@ -82742,7 +82755,7 @@ exports.ReduceSubscriber = ReduceSubscriber;
|
||||
//# sourceMappingURL=reduce.js.map
|
||||
|
||||
/***/ }),
|
||||
/* 693 */
|
||||
/* 694 */
|
||||
/***/ (function(module, exports, __webpack_require__) {
|
||||
|
||||
"use strict";
|
||||
@@ -82820,7 +82833,7 @@ exports.toPromise = toPromise;
|
||||
//# sourceMappingURL=toPromise.js.map
|
||||
|
||||
/***/ }),
|
||||
/* 694 */
|
||||
/* 695 */
|
||||
/***/ (function(module, exports, __webpack_require__) {
|
||||
|
||||
"use strict";
|
||||
@@ -82870,7 +82883,7 @@ exports.Action = Action;
|
||||
//# sourceMappingURL=Action.js.map
|
||||
|
||||
/***/ }),
|
||||
/* 695 */
|
||||
/* 696 */
|
||||
/***/ (function(module, exports, __webpack_require__) {
|
||||
|
||||
"use strict";
|
||||
@@ -82881,7 +82894,7 @@ var __extends = (this && this.__extends) || function (d, b) {
|
||||
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
||||
};
|
||||
var root_1 = __webpack_require__(46);
|
||||
var Action_1 = __webpack_require__(694);
|
||||
var Action_1 = __webpack_require__(695);
|
||||
/**
|
||||
* We need this JSDoc comment for affecting ESDoc.
|
||||
* @ignore
|
||||
@@ -83018,7 +83031,7 @@ exports.AsyncAction = AsyncAction;
|
||||
//# sourceMappingURL=AsyncAction.js.map
|
||||
|
||||
/***/ }),
|
||||
/* 696 */
|
||||
/* 697 */
|
||||
/***/ (function(module, exports, __webpack_require__) {
|
||||
|
||||
"use strict";
|
||||
@@ -83028,7 +83041,7 @@ var __extends = (this && this.__extends) || function (d, b) {
|
||||
function __() { this.constructor = d; }
|
||||
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
||||
};
|
||||
var Scheduler_1 = __webpack_require__(683);
|
||||
var Scheduler_1 = __webpack_require__(684);
|
||||
var AsyncScheduler = (function (_super) {
|
||||
__extends(AsyncScheduler, _super);
|
||||
function AsyncScheduler() {
|
||||
@@ -83075,13 +83088,13 @@ exports.AsyncScheduler = AsyncScheduler;
|
||||
//# sourceMappingURL=AsyncScheduler.js.map
|
||||
|
||||
/***/ }),
|
||||
/* 697 */
|
||||
/* 698 */
|
||||
/***/ (function(module, exports, __webpack_require__) {
|
||||
|
||||
"use strict";
|
||||
|
||||
var AsyncAction_1 = __webpack_require__(695);
|
||||
var AsyncScheduler_1 = __webpack_require__(696);
|
||||
var AsyncAction_1 = __webpack_require__(696);
|
||||
var AsyncScheduler_1 = __webpack_require__(697);
|
||||
/**
|
||||
*
|
||||
* Async Scheduler
|
||||
@@ -83128,7 +83141,7 @@ exports.async = new AsyncScheduler_1.AsyncScheduler(AsyncAction_1.AsyncAction);
|
||||
//# sourceMappingURL=async.js.map
|
||||
|
||||
/***/ }),
|
||||
/* 698 */
|
||||
/* 699 */
|
||||
/***/ (function(module, exports, __webpack_require__) {
|
||||
|
||||
"use strict";
|
||||
@@ -83159,7 +83172,7 @@ exports.UnsubscriptionError = UnsubscriptionError;
|
||||
//# sourceMappingURL=UnsubscriptionError.js.map
|
||||
|
||||
/***/ }),
|
||||
/* 699 */
|
||||
/* 700 */
|
||||
/***/ (function(module, exports, __webpack_require__) {
|
||||
|
||||
"use strict";
|
||||
@@ -83177,7 +83190,7 @@ exports.isNumeric = isNumeric;
|
||||
//# sourceMappingURL=isNumeric.js.map
|
||||
|
||||
/***/ }),
|
||||
/* 700 */
|
||||
/* 701 */
|
||||
/***/ (function(module, exports, __webpack_require__) {
|
||||
|
||||
"use strict";
|
||||
@@ -83189,7 +83202,7 @@ exports.isScheduler = isScheduler;
|
||||
//# sourceMappingURL=isScheduler.js.map
|
||||
|
||||
/***/ }),
|
||||
/* 701 */
|
||||
/* 702 */
|
||||
/***/ (function(module, exports, __webpack_require__) {
|
||||
|
||||
"use strict";
|
||||
@@ -83202,8 +83215,8 @@ function toSubscriber(nextOrObserver, error, complete) {
|
||||
if (nextOrObserver instanceof Subscriber_1.Subscriber) {
|
||||
return nextOrObserver;
|
||||
}
|
||||
if (nextOrObserver[rxSubscriber_1.rxSubscriber]) {
|
||||
return nextOrObserver[rxSubscriber_1.rxSubscriber]();
|
||||
if (nextOrObserver[rxSubscriber_1.$$rxSubscriber]) {
|
||||
return nextOrObserver[rxSubscriber_1.$$rxSubscriber]();
|
||||
}
|
||||
}
|
||||
if (!nextOrObserver && !error && !complete) {
|
||||
@@ -83215,7 +83228,7 @@ exports.toSubscriber = toSubscriber;
|
||||
//# sourceMappingURL=toSubscriber.js.map
|
||||
|
||||
/***/ }),
|
||||
/* 702 */
|
||||
/* 703 */
|
||||
/***/ (function(module, exports, __webpack_require__) {
|
||||
|
||||
"use strict";
|
||||
|
||||
Vendored
+1
-1
File diff suppressed because one or more lines are too long
@@ -14,3 +14,11 @@
|
||||
</div>
|
||||
|
||||
</span>
|
||||
|
||||
<span *ngIf="dbloaded">
|
||||
<div class="col-md-12">
|
||||
<h3>Vergelijking</h3>
|
||||
<doubleline-chart [label]="label" [data]="data3" [data2]="data4"></doubleline-chart>
|
||||
</div>
|
||||
|
||||
</span>
|
||||
@@ -17,10 +17,14 @@ export class DashboardComponent implements OnInit, OnDestroy {
|
||||
public data1:LineData;
|
||||
public data2:LineData;
|
||||
|
||||
public data3:LineData;
|
||||
public data4:LineData;
|
||||
|
||||
public label:LabelData;
|
||||
|
||||
public mloaded:boolean = false;
|
||||
public kloaded:boolean = false;
|
||||
public dbloaded:boolean = false;
|
||||
|
||||
public subscription:Subscription;
|
||||
|
||||
@@ -65,6 +69,17 @@ export class DashboardComponent implements OnInit, OnDestroy {
|
||||
.get("4530303235303030303636383733323136")
|
||||
.subscribe(res => {
|
||||
|
||||
this.data3 = res.HOV;
|
||||
|
||||
});
|
||||
|
||||
this.dataService
|
||||
.get("4530303035303031353538313833363134")
|
||||
.subscribe(res => {
|
||||
|
||||
this.data4 = res.HOV;
|
||||
this.dbloaded = true;
|
||||
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@ export class DoubleLineChartComponent implements OnInit, OnChanges {
|
||||
// line2Chart
|
||||
public doublelineChartData:Array<any> = [
|
||||
{data: [0,0,0,0,0,0,0], label: 'Verbruik'},
|
||||
{data2:[0,0,0,0,0,0,0], label: 'Verbruik2'}
|
||||
{data: [0,0,0,0,0,0,0], label: 'Verbruik2'}
|
||||
];
|
||||
public doublelineChartLabels:Array<any> = ['-1', '-2', '-3', '-4', '-5', '-6', '-7'];
|
||||
public doublelineChartOptions:any = {
|
||||
@@ -38,6 +38,14 @@ export class DoubleLineChartComponent implements OnInit, OnChanges {
|
||||
pointBorderColor: '#fff',
|
||||
pointHoverBackgroundColor: '#fff',
|
||||
pointHoverBorderColor: 'rgba(148,159,177,0.8)'
|
||||
},
|
||||
{ // grey
|
||||
backgroundColor: 'rgba(148,159,255,0.2)',
|
||||
borderColor: 'rgba(148,159,255,1)',
|
||||
pointBackgroundColor: 'rgba(148,159,255,1)',
|
||||
pointBorderColor: '#fff',
|
||||
pointHoverBackgroundColor: '#fff',
|
||||
pointHoverBorderColor: 'rgba(148,159,255,0.8)'
|
||||
}
|
||||
];
|
||||
public doublelineChartLegend:boolean = true;
|
||||
@@ -50,8 +58,10 @@ export class DoubleLineChartComponent implements OnInit, OnChanges {
|
||||
this.doublelineChartLabels = this.label.data.slice();
|
||||
|
||||
const newDataSet = [];
|
||||
const newLine = {data: this.data.data,data2: this.data2.data, label: this.data.label};
|
||||
const newLine = {data: this.data.data, label: this.data.label};
|
||||
const newLine2 = {data: this.data2.data, label: this.data2.label};
|
||||
newDataSet.push(newLine);
|
||||
newDataSet.push(newLine2);
|
||||
this.doublelineChartData = newDataSet;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user