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

pass argument to chart

Browse Source
This commit is contained in:
Bluepr1nt
2017-04-05 13:18:51 +02:00
parent 8b85bf51e2
commit 6d13768158
12 changed files with 174 additions and 164 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
+64 -42
View File
@@ -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__(676);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_rxjs_add_operator_map__ = __webpack_require__(675);
/* 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__(308);
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return DataService; });
@@ -56,16 +56,34 @@ var DataService = (function () {
var _a;
}());
function mapData(response) {
var nums = response.json().map(toData);
var TOE1S = response.json().map(toe1ToData);
var TOE2S = response.json().map(toe2ToData);
var HOV = response.json().map(hovToData);
var HT = response.json().map(htToData);
var times = response.json().map(timeToData);
var line = ({ data: nums, label: "Energieverbruik" });
var Toe1Line = ({ data: TOE1S, label: "Totaal Energieverbruik tarief 1" });
var Toe2Line = ({ data: TOE2S, label: "Totaal Energieverbruik tarief 2" });
var HovLine = ({ data: HOV, label: "Huidig Energieverbruik" });
var HtLine = ({ data: HT, label: "Huidig Tarief" });
var label = ({ data: times });
var graph = ({ lines: line, labels: label });
var graph = ({ TOE1: Toe1Line, TOE2: Toe2Line, HOV: HovLine, HT: HtLine, labels: label });
return graph;
}
function toData(r) {
var num = r.TOE1;
return num;
function toe1ToData(r) {
var TOE1 = r.TOE1;
return TOE1;
}
function toe2ToData(r) {
var TOE2 = r.TOE2;
return TOE2;
}
function hovToData(r) {
var HOV = r.HOV;
return HOV;
}
function htToData(r) {
var HT = r.HT;
return HT;
}
function timeToData(r) {
var times = r.time.substring(11, 19);
@@ -82,7 +100,7 @@ function toDevice(r) {
});
return device;
}
//# sourceMappingURL=C:/Users/avans/Documents/Angular/Smarthome-local/mean-app/src/data.service.js.map
//# sourceMappingURL=C:/Users/martijn/Documents/GitHub/smarthome/mean-app/src/data.service.js.map
/***/ }),
@@ -108,13 +126,13 @@ var DashboardComponent = (function () {
DashboardComponent = __decorate([
__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__angular_core__["Component"])({
selector: 'dashboard',
template: __webpack_require__(670)
template: __webpack_require__(669)
}),
__metadata('design:paramtypes', [])
], DashboardComponent);
return DashboardComponent;
}());
//# sourceMappingURL=C:/Users/avans/Documents/Angular/Smarthome-local/mean-app/src/dashboard.component.js.map
//# sourceMappingURL=C:/Users/martijn/Documents/GitHub/smarthome/mean-app/src/dashboard.component.js.map
/***/ }),
@@ -145,22 +163,22 @@ var DetailComponent = (function () {
}
DetailComponent.prototype.ngOnInit = function () {
var id = this.route.snapshot.params['id'];
this.dataService
.get(id)
.subscribe(function (res) {
});
// this.dataService
// .get(id)
// .subscribe(res => {
// });
};
DetailComponent = __decorate([
__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__angular_core__["Component"])({
selector: 'detail',
template: __webpack_require__(671)
template: __webpack_require__(670)
}),
__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, (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/avans/Documents/Angular/Smarthome-local/mean-app/src/detail.component.js.map
//# sourceMappingURL=C:/Users/martijn/Documents/GitHub/smarthome/mean-app/src/detail.component.js.map
/***/ }),
@@ -203,14 +221,14 @@ var DeviceComponent = (function () {
DeviceComponent = __decorate([
__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__angular_core__["Component"])({
selector: 'device',
template: __webpack_require__(672)
template: __webpack_require__(671)
}),
__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/avans/Documents/Angular/Smarthome-local/mean-app/src/device.component.js.map
//# sourceMappingURL=C:/Users/martijn/Documents/GitHub/smarthome/mean-app/src/device.component.js.map
/***/ }),
@@ -245,7 +263,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/avans/Documents/Angular/Smarthome-local/mean-app/src/main.js.map
//# sourceMappingURL=C:/Users/martijn/Documents/GitHub/smarthome/mean-app/src/main.js.map
/***/ }),
@@ -291,7 +309,7 @@ var AppRoutingModule = (function () {
], AppRoutingModule);
return AppRoutingModule;
}());
//# sourceMappingURL=C:/Users/avans/Documents/Angular/Smarthome-local/mean-app/src/app-routing.module.js.map
//# sourceMappingURL=C:/Users/martijn/Documents/GitHub/smarthome/mean-app/src/app-routing.module.js.map
/***/ }),
@@ -318,14 +336,14 @@ var AppComponent = (function () {
AppComponent = __decorate([
__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__angular_core__["Component"])({
selector: 'app-root',
template: __webpack_require__(668),
styles: [__webpack_require__(667)]
template: __webpack_require__(667),
styles: [__webpack_require__(666)]
}),
__metadata('design:paramtypes', [])
], AppComponent);
return AppComponent;
}());
//# sourceMappingURL=C:/Users/avans/Documents/Angular/Smarthome-local/mean-app/src/app.component.js.map
//# sourceMappingURL=C:/Users/martijn/Documents/GitHub/smarthome/mean-app/src/app.component.js.map
/***/ }),
@@ -394,7 +412,7 @@ var AppModule = (function () {
], AppModule);
return AppModule;
}());
//# sourceMappingURL=C:/Users/avans/Documents/Angular/Smarthome-local/mean-app/src/app.module.js.map
//# sourceMappingURL=C:/Users/martijn/Documents/GitHub/smarthome/mean-app/src/app.module.js.map
/***/ }),
@@ -451,7 +469,7 @@ var LineChartComponent = (function () {
LineChartComponent.prototype.ngOnInit = function () {
var _this = this;
this.dataService
.get("204B413655303031363639353836343132")
.get(this.id)
.subscribe(function (res) {
console.log("Received from service:");
console.log(res);
@@ -461,7 +479,7 @@ var LineChartComponent = (function () {
console.log("Updated labels array");
console.log(_this.lineChartLabels);
var newDataSet = [];
var newLine = { data: res.lines.data, label: res.lines.label };
var newLine = { data: res.TOE1.data, label: res.TOE1.label };
newDataSet.push(newLine);
_this.lineChartData = newDataSet;
console.log("Updated lines array");
@@ -470,6 +488,10 @@ var LineChartComponent = (function () {
});
console.log("Init");
};
__decorate([
__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__angular_core__["Input"])(),
__metadata('design:type', String)
], LineChartComponent.prototype, "id", void 0);
__decorate([
__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__angular_core__["ViewChild"])(__WEBPACK_IMPORTED_MODULE_2_ng2_charts_ng2_charts__["BaseChartDirective"]),
__metadata('design:type', (typeof (_a = typeof __WEBPACK_IMPORTED_MODULE_2_ng2_charts_ng2_charts__["BaseChartDirective"] !== 'undefined' && __WEBPACK_IMPORTED_MODULE_2_ng2_charts_ng2_charts__["BaseChartDirective"]) === 'function' && _a) || Object)
@@ -477,14 +499,14 @@ var LineChartComponent = (function () {
LineChartComponent = __decorate([
__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__angular_core__["Component"])({
selector: 'line-chart',
template: __webpack_require__(669)
template: __webpack_require__(668)
}),
__metadata('design:paramtypes', [(typeof (_b = typeof __WEBPACK_IMPORTED_MODULE_1__data_service__["a" /* DataService */] !== 'undefined' && __WEBPACK_IMPORTED_MODULE_1__data_service__["a" /* DataService */]) === 'function' && _b) || Object])
], LineChartComponent);
return LineChartComponent;
var _a, _b;
}());
//# sourceMappingURL=C:/Users/avans/Documents/Angular/Smarthome-local/mean-app/src/chart.component.js.map
//# sourceMappingURL=C:/Users/martijn/Documents/GitHub/smarthome/mean-app/src/chart.component.js.map
/***/ }),
@@ -500,53 +522,53 @@ var LineChartComponent = (function () {
var environment = {
production: false
};
//# sourceMappingURL=C:/Users/avans/Documents/Angular/Smarthome-local/mean-app/src/environment.js.map
//# sourceMappingURL=C:/Users/martijn/Documents/GitHub/smarthome/mean-app/src/environment.js.map
/***/ }),
/***/ 667:
/***/ 666:
/***/ (function(module, exports) {
module.exports = ""
/***/ }),
/***/ 668:
/***/ 667:
/***/ (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 </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>{{title}} <small>Avans</small></h1>\r\n </div>\r\n </div>\r\n\r\n <router-outlet></router-outlet>\r\n\r\n </div>\r\n</div>\r\n"
/***/ }),
/***/ 669:
/***/ 668:
/***/ (function(module, exports) {
module.exports = "<div class=\"row\">\r\n <div class=\"col-md-6\">\r\n <div style=\"display: block;\">\r\n <canvas baseChart width=\"400\" height=\"400\"\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 </div>\r\n</div>"
/***/ }),
/***/ 670:
/***/ 669:
/***/ (function(module, exports) {
module.exports = "<div>\r\n\t<line-chart></line-chart>\r\n</div>"
/***/ }),
/***/ 670:
/***/ (function(module, exports) {
module.exports = "<div>\r\n\t<line-chart [id]=\"id\"></line-chart>\r\n</div>\r\n"
/***/ }),
/***/ 671:
/***/ (function(module, exports) {
module.exports = "<div>\r\n\t<line-chart></line-chart>\r\n</div>"
/***/ }),
/***/ 672:
/***/ (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 <span class=\"badge\"> {{device.sn}} </span> {{device.name}}\r\n </li>\r\n</ul>\r\n\r\n</div>"
/***/ }),
/***/ 691:
/***/ 690:
/***/ (function(module, exports, __webpack_require__) {
module.exports = __webpack_require__(390);
@@ -554,5 +576,5 @@ module.exports = __webpack_require__(390);
/***/ })
},[691]);
},[690]);
//# sourceMappingURL=main.bundle.map
mean-app/dist/main.bundle.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
mean-app/dist/polyfills.bundle.js
Vendored
+9 -10
View File
@@ -2688,7 +2688,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__(526);
/* 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__(690);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_15_zone_js_dist_zone__ = __webpack_require__(689);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_15_zone_js_dist_zone___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_15_zone_js_dist_zone__);
@@ -2720,7 +2720,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
// NgClass on SVG elements
// Needed for: IE10, IE11
// import 'classlist.js';
//# sourceMappingURL=C:/Users/avans/Documents/Angular/Smarthome-local/mean-app/src/polyfills.js.map
//# sourceMappingURL=C:/Users/martijn/Documents/GitHub/smarthome/mean-app/src/polyfills.js.map
/***/ }),
/* 392 */,
@@ -5656,8 +5656,7 @@ metadata.exp({metadata: function metadata(metadataKey, metadataValue){
/* 662 */,
/* 663 */,
/* 664 */,
/* 665 */,
/* 666 */
/* 665 */
/***/ (function(module, exports) {
// shim for using process in browser
@@ -5843,6 +5842,7 @@ process.umask = function() { return 0; };
/***/ }),
/* 666 */,
/* 667 */,
/* 668 */,
/* 669 */,
@@ -5865,8 +5865,7 @@ process.umask = function() { return 0; };
/* 686 */,
/* 687 */,
/* 688 */,
/* 689 */,
/* 690 */
/* 689 */
/***/ (function(module, exports, __webpack_require__) {
/* WEBPACK VAR INJECTION */(function(global, process) {/**
@@ -7965,16 +7964,16 @@ if (_global['PromiseRejectionEvent']) {
})));
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(46), __webpack_require__(666)))
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(46), __webpack_require__(665)))
/***/ }),
/* 691 */,
/* 692 */
/* 690 */,
/* 691 */
/***/ (function(module, exports, __webpack_require__) {
module.exports = __webpack_require__(391);
/***/ })
],[692]);
],[691]);
//# sourceMappingURL=polyfills.bundle.map
mean-app/dist/polyfills.bundle.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
mean-app/dist/styles.bundle.js
Vendored
+4 -4
View File
@@ -9,7 +9,7 @@ webpackJsonp([2,4],{
var content = __webpack_require__(662);
if(typeof content === 'string') content = [[module.i, content, '']];
// add the styles to the DOM
var update = __webpack_require__(689)(content, {});
var update = __webpack_require__(688)(content, {});
if(content.locals) module.exports = content.locals;
// Hot Module Replacement
if(false) {
@@ -99,7 +99,7 @@ module.exports = function() {
/***/ }),
/***/ 689:
/***/ 688:
/***/ (function(module, exports) {
/*
@@ -352,7 +352,7 @@ function updateLink(linkElement, obj) {
/***/ }),
/***/ 693:
/***/ 692:
/***/ (function(module, exports, __webpack_require__) {
module.exports = __webpack_require__(392);
@@ -360,5 +360,5 @@ module.exports = __webpack_require__(392);
/***/ })
},[693]);
},[692]);
//# sourceMappingURL=styles.bundle.map
mean-app/dist/styles.bundle.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
mean-app/dist/vendor.bundle.js
Vendored
+81 -94
View File
@@ -5063,7 +5063,7 @@ function DomAdapter_tsickle_Closure_declarations() {
"use strict";
var root_1 = __webpack_require__(57);
var toSubscriber_1 = __webpack_require__(687);
var toSubscriber_1 = __webpack_require__(686);
var observable_1 = __webpack_require__(161);
/**
* A representation of any set of values over any amount of time. This the most basic building block
@@ -5146,7 +5146,10 @@ var Observable = (function () {
throw new Error('no Promise impl found');
}
return new PromiseCtor(function (resolve, reject) {
var subscription = _this.subscribe(function (value) {
// 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) {
if (subscription) {
// if there is a subscription, then we can surmise
// the next handling is asynchronous. Any errors thrown
@@ -5180,7 +5183,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
@@ -5725,7 +5728,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.
@@ -5827,14 +5830,16 @@ var SafeSubscriber = (function (_super) {
next = observerOrNext;
}
else if (observerOrNext) {
context = observerOrNext;
next = observerOrNext.next;
error = observerOrNext.error;
complete = observerOrNext.complete;
if (isFunction_1.isFunction(context.unsubscribe)) {
this.add(context.unsubscribe.bind(context));
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);
}
context.unsubscribe = this.unsubscribe.bind(this);
}
this._context = context;
this._next = next;
@@ -6926,7 +6931,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__(684);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_rxjs_operator_toPromise__ = __webpack_require__(683);
/* 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__(305);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__facade_lang__ = __webpack_require__(76);
@@ -7517,7 +7522,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__(380);
/* 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__(681);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_rxjs_operator_last__ = __webpack_require__(680);
/* 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__(110);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5_rxjs_operator_map___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_5_rxjs_operator_map__);
@@ -11176,7 +11181,7 @@ var Observable_1 = __webpack_require__(17);
var Subscriber_1 = __webpack_require__(30);
var Subscription_1 = __webpack_require__(237);
var ObjectUnsubscribedError_1 = __webpack_require__(382);
var SubjectSubscription_1 = __webpack_require__(675);
var SubjectSubscription_1 = __webpack_require__(674);
var rxSubscriber_1 = __webpack_require__(242);
/**
* @class SubjectSubscriber<T>
@@ -11203,7 +11208,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) {
@@ -21141,7 +21146,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__(111);
/* 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__(683);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10_rxjs_operator_reduce__ = __webpack_require__(682);
/* 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__(497);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__config__ = __webpack_require__(498);
@@ -32368,7 +32373,11 @@ function getSymbolObservable(context) {
return $$observable;
}
exports.getSymbolObservable = getSymbolObservable;
exports.$$observable = getSymbolObservable(root_1.root);
exports.observable = getSymbolObservable(root_1.root);
/**
* @deprecated use observable instead
*/
exports.$$observable = exports.observable;
//# sourceMappingURL=observable.js.map
/***/ }),
@@ -45137,9 +45146,9 @@ exports.OuterSubscriber = OuterSubscriber;
var isArray_1 = __webpack_require__(384);
var isObject_1 = __webpack_require__(387);
var isFunction_1 = __webpack_require__(386);
var tryCatch_1 = __webpack_require__(688);
var tryCatch_1 = __webpack_require__(687);
var errorObject_1 = __webpack_require__(383);
var UnsubscriptionError_1 = __webpack_require__(685);
var UnsubscriptionError_1 = __webpack_require__(684);
/**
* Represents a disposable resource, such as the execution of an Observable. A
* Subscription has one important method, `unsubscribe`, that takes no argument
@@ -45333,7 +45342,7 @@ function flattenUnsubscriptionErrors(errors) {
"use strict";
var FromObservable_1 = __webpack_require__(678);
var FromObservable_1 = __webpack_require__(677);
exports.from = FromObservable_1.FromObservable.create;
//# sourceMappingURL=from.js.map
@@ -45501,7 +45510,11 @@ function symbolIteratorPonyfill(root) {
}
}
exports.symbolIteratorPonyfill = symbolIteratorPonyfill;
exports.$$iterator = symbolIteratorPonyfill(root_1.root);
exports.iterator = symbolIteratorPonyfill(root_1.root);
/**
* @deprecated use iterator instead
*/
exports.$$iterator = exports.iterator;
//# sourceMappingURL=iterator.js.map
/***/ }),
@@ -45512,8 +45525,12 @@ exports.$$iterator = symbolIteratorPonyfill(root_1.root);
var root_1 = __webpack_require__(57);
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
/***/ }),
@@ -45562,7 +45579,7 @@ var isPromise_1 = __webpack_require__(388);
var isObject_1 = __webpack_require__(387);
var Observable_1 = __webpack_require__(17);
var iterator_1 = __webpack_require__(241);
var InnerSubscriber_1 = __webpack_require__(673);
var InnerSubscriber_1 = __webpack_require__(672);
var observable_1 = __webpack_require__(161);
function subscribeToResult(outerSubscriber, result, outerValue, outerIndex) {
var destination = new InnerSubscriber_1.InnerSubscriber(outerSubscriber, outerValue, outerIndex);
@@ -45600,8 +45617,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) {
@@ -45614,8 +45631,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'));
}
@@ -63268,7 +63285,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__(379);
/* 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__(680);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5_rxjs_operator_filter__ = __webpack_require__(679);
/* 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__(240);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6_rxjs_operator_mergeAll___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_6_rxjs_operator_mergeAll__);
@@ -63524,7 +63541,7 @@ function RouterPreloader_tsickle_Closure_declarations() {
function __export(m) {
for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
}
__export(__webpack_require__(665));
__export(__webpack_require__(664));
/***/ }),
@@ -63555,7 +63572,7 @@ var __extends = (this && this.__extends) || function (d, b) {
var Observable_1 = __webpack_require__(17);
var ScalarObservable_1 = __webpack_require__(376);
var EmptyObservable_1 = __webpack_require__(374);
var isScheduler_1 = __webpack_require__(686);
var isScheduler_1 = __webpack_require__(685);
/**
* We need this JSDoc comment for affecting ESDoc.
* @extends {Ignored}
@@ -81282,17 +81299,12 @@ 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')) {
if (changes['data']) {
this.updateChartData(changes['data'].currentValue);
}
else {
this.updateChartData(changes['datasets'].currentValue);
}
if (changes.hasOwnProperty('data') || changes.hasOwnProperty('datasets') || changes.hasOwnProperty('labels')) {
this.chart.data.datasets = this.getDatasets();
this.chart.data.labels = this.labels;
this.chart.update();
}
else {
// otherwise rebuild the chart
this.refresh();
}
}
@@ -81338,19 +81350,6 @@ 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;
@@ -81410,9 +81409,9 @@ var BaseChartDirective = (function () {
{ type: core_1.Directive, args: [{ selector: 'canvas[baseChart]', exportAs: 'base-chart' },] },
];
/** @nocollapse */
BaseChartDirective.ctorParameters = function () { return [
BaseChartDirective.ctorParameters = [
{ type: core_1.ElementRef, },
]; };
];
BaseChartDirective.propDecorators = {
'data': [{ type: core_1.Input },],
'datasets': [{ type: core_1.Input },],
@@ -81529,33 +81528,21 @@ var ChartsModule = (function () {
},] },
];
/** @nocollapse */
ChartsModule.ctorParameters = function () { return []; };
ChartsModule.ctorParameters = [];
return ChartsModule;
}());
exports.ChartsModule = ChartsModule;
/***/ }),
/* 665 */
/***/ (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__(664));
/***/ }),
/* 665 */,
/* 666 */,
/* 667 */,
/* 668 */,
/* 669 */,
/* 670 */,
/* 671 */,
/* 672 */,
/* 673 */
/* 672 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -81597,7 +81584,7 @@ exports.InnerSubscriber = InnerSubscriber;
//# sourceMappingURL=InnerSubscriber.js.map
/***/ }),
/* 674 */
/* 673 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -81730,7 +81717,7 @@ exports.Notification = Notification;
//# sourceMappingURL=Notification.js.map
/***/ }),
/* 675 */
/* 674 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -81776,7 +81763,7 @@ exports.SubjectSubscription = SubjectSubscription;
//# sourceMappingURL=SubjectSubscription.js.map
/***/ }),
/* 676 */
/* 675 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -81787,7 +81774,7 @@ Observable_1.Observable.prototype.map = map_1.map;
//# sourceMappingURL=map.js.map
/***/ }),
/* 677 */
/* 676 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -81863,7 +81850,7 @@ exports.ArrayLikeObservable = ArrayLikeObservable;
//# sourceMappingURL=ArrayLikeObservable.js.map
/***/ }),
/* 678 */
/* 677 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -81877,12 +81864,12 @@ var isArray_1 = __webpack_require__(384);
var isArrayLike_1 = __webpack_require__(385);
var isPromise_1 = __webpack_require__(388);
var PromiseObservable_1 = __webpack_require__(375);
var IteratorObservable_1 = __webpack_require__(679);
var IteratorObservable_1 = __webpack_require__(678);
var ArrayObservable_1 = __webpack_require__(373);
var ArrayLikeObservable_1 = __webpack_require__(677);
var ArrayLikeObservable_1 = __webpack_require__(676);
var iterator_1 = __webpack_require__(241);
var Observable_1 = __webpack_require__(17);
var observeOn_1 = __webpack_require__(682);
var observeOn_1 = __webpack_require__(681);
var observable_1 = __webpack_require__(161);
/**
* We need this JSDoc comment for affecting ESDoc.
@@ -81954,7 +81941,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;
}
@@ -81966,7 +81953,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)) {
@@ -81979,10 +81966,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;
@@ -81991,7 +81978,7 @@ exports.FromObservable = FromObservable;
//# sourceMappingURL=FromObservable.js.map
/***/ }),
/* 679 */
/* 678 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -82081,7 +82068,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,
@@ -82101,7 +82088,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,
@@ -82114,7 +82101,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);
}
@@ -82124,7 +82111,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) {
@@ -82160,7 +82147,7 @@ function sign(value) {
//# sourceMappingURL=IteratorObservable.js.map
/***/ }),
/* 680 */
/* 679 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -82259,7 +82246,7 @@ var FilterSubscriber = (function (_super) {
//# sourceMappingURL=filter.js.map
/***/ }),
/* 681 */
/* 680 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -82384,7 +82371,7 @@ var LastSubscriber = (function (_super) {
//# sourceMappingURL=last.js.map
/***/ }),
/* 682 */
/* 681 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -82395,7 +82382,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__(674);
var Notification_1 = __webpack_require__(673);
/**
* @see {@link Notification}
*
@@ -82466,7 +82453,7 @@ exports.ObserveOnMessage = ObserveOnMessage;
//# sourceMappingURL=observeOn.js.map
/***/ }),
/* 683 */
/* 682 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -82598,7 +82585,7 @@ exports.ReduceSubscriber = ReduceSubscriber;
//# sourceMappingURL=reduce.js.map
/***/ }),
/* 684 */
/* 683 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -82676,7 +82663,7 @@ exports.toPromise = toPromise;
//# sourceMappingURL=toPromise.js.map
/***/ }),
/* 685 */
/* 684 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -82707,7 +82694,7 @@ exports.UnsubscriptionError = UnsubscriptionError;
//# sourceMappingURL=UnsubscriptionError.js.map
/***/ }),
/* 686 */
/* 685 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -82719,7 +82706,7 @@ exports.isScheduler = isScheduler;
//# sourceMappingURL=isScheduler.js.map
/***/ }),
/* 687 */
/* 686 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -82732,8 +82719,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) {
@@ -82745,7 +82732,7 @@ exports.toSubscriber = toSubscriber;
//# sourceMappingURL=toSubscriber.js.map
/***/ }),
/* 688 */
/* 687 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
mean-app/dist/vendor.bundle.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
mean-app/src/app/chart.component.ts
+3 -2
View File
@@ -1,4 +1,4 @@
import { Component, OnInit, ViewChild, ElementRef } from '@angular/core';
import { Component, OnInit, ViewChild, ElementRef,Input } from '@angular/core';
import { DataService } from './data.service';
import { LineData } from './line-data';
@@ -10,6 +10,7 @@ import { BaseChartDirective } from 'ng2-charts/ng2-charts';
})
export class LineChartComponent implements OnInit {
@Input()id:string;
@ViewChild(BaseChartDirective) public chart: BaseChartDirective;
// lineChart
@@ -43,7 +44,7 @@ export class LineChartComponent implements OnInit {
ngOnInit(): void {
this.dataService
.get("204B413655303031363639353836343132")
.get(this.id)
.subscribe(res => {
console.log("Received from service:");
console.log(res);
mean-app/src/app/detail.component.html
+2 -2
View File
@@ -1,3 +1,3 @@
<div>
<line-chart></line-chart>
</div>
<line-chart [id]="id"></line-chart>
</div>
mean-app/src/app/detail.component.ts
+6 -5
View File
@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, Params } from '@angular/router';
import { DataService } from './data.service';
import {LineChartComponent} from "./chart.component";
@Component({
selector: 'detail',
@@ -17,12 +18,12 @@ export class DetailComponent implements OnInit {
let id = this.route.snapshot.params['id'];
this.dataService
.get(id)
.subscribe(res => {
// this.dataService
// .get(id)
// .subscribe(res => {
});
// });
}