Revert changes

This commit is contained in:
2017-04-11 13:32:45 +02:00
parent 4b64cc7390
commit a2d97c0778
9 changed files with 435 additions and 498 deletions
+1 -1
View File
File diff suppressed because one or more lines are too long
+20 -48
View File
@@ -7,7 +7,7 @@ webpackJsonp([1,4],{
/* 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__(679);
/* 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__(310);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__angular_http__ = __webpack_require__(309);
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return DataService; });
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -162,7 +162,7 @@ function toDevice(r) {
/***/ }),
/***/ 333:
/***/ 332:
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -194,17 +194,15 @@ var DashboardComponent = (function () {
/***/ }),
/***/ 334:
/***/ 333:
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__angular_router__ = __webpack_require__(214);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_ng2_charts_ng2_charts__ = __webpack_require__(236);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_ng2_charts_ng2_charts___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_2_ng2_charts_ng2_charts__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_rxjs_observable_IntervalObservable__ = __webpack_require__(682);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_rxjs_observable_IntervalObservable___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_3_rxjs_observable_IntervalObservable__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__data_service__ = __webpack_require__(151);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_rxjs_observable_IntervalObservable__ = __webpack_require__(682);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_rxjs_observable_IntervalObservable___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_2_rxjs_observable_IntervalObservable__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__data_service__ = __webpack_require__(151);
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return DetailComponent; });
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -219,7 +217,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
var DetailComponent = (function () {
function DetailComponent(dataService, route) {
this.dataService = dataService;
@@ -231,32 +228,12 @@ var DetailComponent = (function () {
this.ht = "loading";
this.money = 0;
this.loaded = false;
this.lineChartOptions = {
responsive: true,
title: {
display: true,
position: 'left',
text: 'Watt'
}
};
this.lineChartColors = [
{
backgroundColor: 'rgba(148,159,177,0.2)',
borderColor: 'rgba(148,159,177,1)',
pointBackgroundColor: 'rgba(148,159,177,1)',
pointBorderColor: '#fff',
pointHoverBackgroundColor: '#fff',
pointHoverBorderColor: 'rgba(148,159,177,0.8)'
}
];
this.lineChartLegend = true;
this.lineChartType = 'line';
}
DetailComponent.prototype.ngOnInit = function () {
var _this = this;
this.id = this.route.snapshot.params['id'];
this.refreshData(this.id);
this.subscription = __WEBPACK_IMPORTED_MODULE_3_rxjs_observable_IntervalObservable__["IntervalObservable"].create(7500).subscribe(function (n) { return _this.refreshData(_this.id); });
this.subscription = __WEBPACK_IMPORTED_MODULE_2_rxjs_observable_IntervalObservable__["IntervalObservable"].create(7500).subscribe(function (n) { return _this.refreshData(_this.id); });
};
DetailComponent.prototype.ngOnDestroy = function () {
this.subscription.unsubscribe();
@@ -273,7 +250,6 @@ var DetailComponent = (function () {
_this.data3 = res.TOE2;
_this.data4 = res.TTE2;
_this.loaded = true;
_this.chart.chart.update();
});
this.dataService
.usage(id)
@@ -289,25 +265,21 @@ var DetailComponent = (function () {
_this.name = res;
});
};
__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)
], DetailComponent.prototype, "chart", void 0);
DetailComponent = __decorate([
__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__angular_core__["Component"])({
selector: 'detail',
template: __webpack_require__(673)
}),
__metadata('design:paramtypes', [(typeof (_b = typeof __WEBPACK_IMPORTED_MODULE_4__data_service__["a" /* DataService */] !== 'undefined' && __WEBPACK_IMPORTED_MODULE_4__data_service__["a" /* DataService */]) === 'function' && _b) || Object, (typeof (_c = typeof __WEBPACK_IMPORTED_MODULE_1__angular_router__["b" /* ActivatedRoute */] !== 'undefined' && __WEBPACK_IMPORTED_MODULE_1__angular_router__["b" /* ActivatedRoute */]) === 'function' && _c) || Object])
__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, _c;
var _a, _b;
}());
//# sourceMappingURL=C:/Users/avans/Documents/Angular/Smarthome-local/mean-app/src/detail.component.js.map
/***/ }),
/***/ 335:
/***/ 334:
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -398,9 +370,9 @@ __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dyna
"use strict";
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__angular_router__ = __webpack_require__(214);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__dashboard_component__ = __webpack_require__(333);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__device_component__ = __webpack_require__(335);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__detail_component__ = __webpack_require__(334);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__dashboard_component__ = __webpack_require__(332);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__device_component__ = __webpack_require__(334);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__detail_component__ = __webpack_require__(333);
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AppRoutingModule; });
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -478,15 +450,15 @@ var AppComponent = (function () {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_platform_browser__ = __webpack_require__(148);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__angular_core__ = __webpack_require__(0);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__angular_forms__ = __webpack_require__(468);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__angular_http__ = __webpack_require__(310);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_ng2_charts_ng2_charts__ = __webpack_require__(236);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__angular_http__ = __webpack_require__(309);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_ng2_charts_ng2_charts__ = __webpack_require__(372);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_ng2_charts_ng2_charts___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_4_ng2_charts_ng2_charts__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__app_routing_module__ = __webpack_require__(507);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__app_component__ = __webpack_require__(508);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__chart_component__ = __webpack_require__(510);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__dashboard_component__ = __webpack_require__(333);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__device_component__ = __webpack_require__(335);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__detail_component__ = __webpack_require__(334);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__dashboard_component__ = __webpack_require__(332);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__device_component__ = __webpack_require__(334);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__detail_component__ = __webpack_require__(333);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__data_service__ = __webpack_require__(151);
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AppModule; });
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -547,7 +519,7 @@ var AppModule = (function () {
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__data_service__ = __webpack_require__(151);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__line_data__ = __webpack_require__(512);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_ng2_charts_ng2_charts__ = __webpack_require__(236);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_ng2_charts_ng2_charts__ = __webpack_require__(372);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_ng2_charts_ng2_charts___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_3_ng2_charts_ng2_charts__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__label_data__ = __webpack_require__(511);
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return LineChartComponent; });
@@ -707,7 +679,7 @@ module.exports = "<div>\r\n\t\r\n</div>"
/***/ 673:
/***/ (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<div style=\"display: block;\">\r\n\t\t\t<canvas baseChart width=\"400\" height=\"400\"\r\n\t\t [datasets]=\"data1\"\r\n\t\t [labels]=\"label\"\r\n\t\t [options]=\"lineChartOptions\"\r\n\t\t [colors]=\"lineChartColors\"\r\n\t\t [legend]=\"lineChartLegend\"\r\n\t\t [chartType]=\"lineChartType\"></canvas>\r\n\t\t</div>\r\n\t</div>\r\n\r\n\t<div class=\"col-md-6\">\r\n\t\t<line-chart [label]=\"label\" [data]=\"data2\"></line-chart>\r\n\t</div>\r\n\r\n\t<div class=\"col-md-6\">\r\n\t\t<line-chart [label]=\"label\" [data]=\"data3\"></line-chart>\r\n\t</div>\r\n\r\n\t<div class=\"col-md-6\">\r\n\t\t<line-chart [label]=\"label\" [data]=\"data4\"></line-chart>\r\n\t</div>\r\n\r\n</span>\r\n"
module.exports = "<span *ngIf=\"loaded\">\r\n\r\n\t<div class=\"col-md-12\">\r\n\t\t<h2>{{name}}</h2>\r\n\t</div>\r\n\r\n\t<div class=\"col-md-12\">\r\n\t\t<div class=\"well\">\r\n\t\t\t<b>Huidig opgenomen vermogen:</b> {{hov}} kW <br>\r\n\t\t\t<b>Huidig teruggeleverd vermogen:</b> {{htv}} kW <br>\r\n\t\t\t<b>Huidig tarief:</b> {{ht}} <br>\r\n\t\t\t<b>Totale kosten:</b> €{{money}}\r\n\t\t</div>\r\n\t</div>\r\n\r\n\r\n\t<div class=\"col-md-6\">\r\n\t\t<line-chart [label]=\"label\" [data]=\"data1\"></line-chart>\r\n\t</div>\r\n\r\n\t<div class=\"col-md-6\">\r\n\t\t<line-chart [label]=\"label\" [data]=\"data2\"></line-chart>\r\n\t</div>\r\n\r\n\t<div class=\"col-md-6\">\r\n\t\t<line-chart [label]=\"label\" [data]=\"data3\"></line-chart>\r\n\t</div>\r\n\r\n\t<div class=\"col-md-6\">\r\n\t\t<line-chart [label]=\"label\" [data]=\"data4\"></line-chart>\r\n\t</div>\r\n\r\n</span>\r\n"
/***/ }),
+1 -1
View File
File diff suppressed because one or more lines are too long
+105 -105
View File
@@ -123,7 +123,7 @@ if(typeof __g == 'number')__g = global; // eslint-disable-line no-undef
/***/ (function(module, exports, __webpack_require__) {
var anObject = __webpack_require__(4)
, IE8_DOM_DEFINE = __webpack_require__(345)
, IE8_DOM_DEFINE = __webpack_require__(344)
, toPrimitive = __webpack_require__(68)
, dP = Object.defineProperty;
@@ -367,7 +367,7 @@ module.exports = __webpack_require__(18) ? function(object, key, value){
/* 44 */
/***/ (function(module, exports, __webpack_require__) {
var Map = __webpack_require__(364)
var Map = __webpack_require__(363)
, $export = __webpack_require__(1)
, shared = __webpack_require__(157)('metadata')
, store = shared.store || (shared.store = new (__webpack_require__(654)));
@@ -540,7 +540,7 @@ var pIE = __webpack_require__(155)
, toIObject = __webpack_require__(28)
, toPrimitive = __webpack_require__(68)
, has = __webpack_require__(20)
, IE8_DOM_DEFINE = __webpack_require__(345)
, IE8_DOM_DEFINE = __webpack_require__(344)
, gOPD = Object.getOwnPropertyDescriptor;
exports.f = __webpack_require__(18) ? gOPD : function getOwnPropertyDescriptor(O, P){
@@ -649,7 +649,7 @@ module.exports = function(fn, that, length){
// 19.1.2.2 / 15.2.3.5 Object.create(O [, Properties])
var anObject = __webpack_require__(4)
, dPs = __webpack_require__(354)
, dPs = __webpack_require__(353)
, enumBugKeys = __webpack_require__(220)
, IE_PROTO = __webpack_require__(233)('IE_PROTO')
, Empty = function(){ /* empty */ }
@@ -658,13 +658,13 @@ var anObject = __webpack_require__(4)
// Create object with fake `null` prototype: use iframe Object with cleared prototype
var createDict = function(){
// Thrash, waste and sodomy: IE GC bug
var iframe = __webpack_require__(343)('iframe')
var iframe = __webpack_require__(342)('iframe')
, i = enumBugKeys.length
, lt = '<'
, gt = '>'
, iframeDocument;
iframe.style.display = 'none';
__webpack_require__(344).appendChild(iframe);
__webpack_require__(343).appendChild(iframe);
iframe.src = 'javascript:'; // eslint-disable-line no-script-url
// createDict = iframe.contentWindow.Object;
// html.removeChild(iframe);
@@ -695,7 +695,7 @@ module.exports = Object.create || function create(O, Properties){
/***/ (function(module, exports, __webpack_require__) {
// 19.1.2.14 / 15.2.3.14 Object.keys(O)
var $keys = __webpack_require__(356)
var $keys = __webpack_require__(355)
, enumBugKeys = __webpack_require__(220);
module.exports = Object.keys || function keys(O){
@@ -767,7 +767,7 @@ module.exports = {};
/***/ (function(module, exports, __webpack_require__) {
// 19.1.2.7 / 15.2.3.4 Object.getOwnPropertyNames(O)
var $keys = __webpack_require__(356)
var $keys = __webpack_require__(355)
, hiddenKeys = __webpack_require__(220).concat('length', 'prototype');
exports.f = Object.getOwnPropertyNames || function getOwnPropertyNames(O){
@@ -877,11 +877,11 @@ module.exports = function(KEY, length, exec){
/***/ (function(module, exports, __webpack_require__) {
var ctx = __webpack_require__(79)
, call = __webpack_require__(348)
, isArrayIter = __webpack_require__(346)
, call = __webpack_require__(347)
, isArrayIter = __webpack_require__(345)
, anObject = __webpack_require__(4)
, toLength = __webpack_require__(23)
, getIterFn = __webpack_require__(362)
, getIterFn = __webpack_require__(361)
, BREAK = {}
, RETURN = {};
var exports = module.exports = function(iterable, entries, fn, that, ITERATOR){
@@ -979,7 +979,7 @@ module.exports = exporter;
"use strict";
// 19.1.3.6 Object.prototype.toString()
var classof = __webpack_require__(340)
var classof = __webpack_require__(339)
, test = {};
test[__webpack_require__(10)('toStringTag')] = 'z';
if(test + '' != '[object z]'){
@@ -994,7 +994,7 @@ if(test + '' != '[object z]'){
"use strict";
var $at = __webpack_require__(359)(true);
var $at = __webpack_require__(358)(true);
// 21.1.3.27 String.prototype[@@iterator]()
__webpack_require__(226)(String, 'String', function(iterated){
@@ -1093,7 +1093,7 @@ var global = __webpack_require__(14)
, anInstance = __webpack_require__(218)
, isObject = __webpack_require__(7)
, fails = __webpack_require__(6)
, $iterDetect = __webpack_require__(350)
, $iterDetect = __webpack_require__(349)
, setToStringTag = __webpack_require__(156)
, inheritIfRequired = __webpack_require__(223);
@@ -1262,7 +1262,7 @@ var LIBRARY = __webpack_require__(227)
, hide = __webpack_require__(43)
, has = __webpack_require__(20)
, Iterators = __webpack_require__(106)
, $iterCreate = __webpack_require__(349)
, $iterCreate = __webpack_require__(348)
, setToStringTag = __webpack_require__(156)
, getPrototypeOf = __webpack_require__(45)
, ITERATOR = __webpack_require__(10)('iterator')
@@ -1545,8 +1545,7 @@ module.exports = '\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u180E\u2000\u2001\u2002\u20
/* 332 */,
/* 333 */,
/* 334 */,
/* 335 */,
/* 336 */
/* 335 */
/***/ (function(module, exports, __webpack_require__) {
var cof = __webpack_require__(66);
@@ -1556,7 +1555,7 @@ module.exports = function(it, msg){
};
/***/ }),
/* 337 */
/* 336 */
/***/ (function(module, exports, __webpack_require__) {
// false -> Array#indexOf
@@ -1582,7 +1581,7 @@ module.exports = function(IS_INCLUDES){
};
/***/ }),
/* 338 */
/* 337 */
/***/ (function(module, exports, __webpack_require__) {
var aFunction = __webpack_require__(65)
@@ -1615,7 +1614,7 @@ module.exports = function(that, callbackfn, aLen, memo, isRight){
};
/***/ }),
/* 339 */
/* 338 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -1645,7 +1644,7 @@ module.exports = Function.bind || function bind(that /*, args... */){
};
/***/ }),
/* 340 */
/* 339 */
/***/ (function(module, exports, __webpack_require__) {
// getting tag from 19.1.3.6 Object.prototype.toString()
@@ -1673,7 +1672,7 @@ module.exports = function(it){
};
/***/ }),
/* 341 */
/* 340 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -1686,7 +1685,7 @@ var dP = __webpack_require__(17).f
, defined = __webpack_require__(42)
, forOf = __webpack_require__(153)
, $iterDefine = __webpack_require__(226)
, step = __webpack_require__(351)
, step = __webpack_require__(350)
, setSpecies = __webpack_require__(232)
, DESCRIPTORS = __webpack_require__(18)
, fastKey = __webpack_require__(56).fastKey
@@ -1821,7 +1820,7 @@ module.exports = {
};
/***/ }),
/* 342 */
/* 341 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -1835,7 +1834,7 @@ module.exports = function(object, index, value){
};
/***/ }),
/* 343 */
/* 342 */
/***/ (function(module, exports, __webpack_require__) {
var isObject = __webpack_require__(7)
@@ -1847,21 +1846,21 @@ module.exports = function(it){
};
/***/ }),
/* 344 */
/* 343 */
/***/ (function(module, exports, __webpack_require__) {
module.exports = __webpack_require__(14).document && document.documentElement;
/***/ }),
/* 345 */
/* 344 */
/***/ (function(module, exports, __webpack_require__) {
module.exports = !__webpack_require__(18) && !__webpack_require__(6)(function(){
return Object.defineProperty(__webpack_require__(343)('div'), 'a', {get: function(){ return 7; }}).a != 7;
return Object.defineProperty(__webpack_require__(342)('div'), 'a', {get: function(){ return 7; }}).a != 7;
});
/***/ }),
/* 346 */
/* 345 */
/***/ (function(module, exports, __webpack_require__) {
// check on default Array iterator
@@ -1874,7 +1873,7 @@ module.exports = function(it){
};
/***/ }),
/* 347 */
/* 346 */
/***/ (function(module, exports, __webpack_require__) {
// 20.1.2.3 Number.isInteger(number)
@@ -1885,7 +1884,7 @@ module.exports = function isInteger(it){
};
/***/ }),
/* 348 */
/* 347 */
/***/ (function(module, exports, __webpack_require__) {
// call something on iterator step with safe closing on error
@@ -1902,7 +1901,7 @@ module.exports = function(iterator, fn, value, entries){
};
/***/ }),
/* 349 */
/* 348 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -1921,7 +1920,7 @@ module.exports = function(Constructor, NAME, next){
};
/***/ }),
/* 350 */
/* 349 */
/***/ (function(module, exports, __webpack_require__) {
var ITERATOR = __webpack_require__(10)('iterator')
@@ -1947,7 +1946,7 @@ module.exports = function(exec, skipClosing){
};
/***/ }),
/* 351 */
/* 350 */
/***/ (function(module, exports) {
module.exports = function(done, value){
@@ -1955,7 +1954,7 @@ module.exports = function(done, value){
};
/***/ }),
/* 352 */
/* 351 */
/***/ (function(module, exports) {
// 20.2.2.20 Math.log1p(x)
@@ -1964,7 +1963,7 @@ module.exports = Math.log1p || function log1p(x){
};
/***/ }),
/* 353 */
/* 352 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -2003,7 +2002,7 @@ module.exports = !$assign || __webpack_require__(6)(function(){
} : $assign;
/***/ }),
/* 354 */
/* 353 */
/***/ (function(module, exports, __webpack_require__) {
var dP = __webpack_require__(17)
@@ -2021,7 +2020,7 @@ module.exports = __webpack_require__(18) ? Object.defineProperties : function de
};
/***/ }),
/* 355 */
/* 354 */
/***/ (function(module, exports, __webpack_require__) {
// fallback for IE11 buggy Object.getOwnPropertyNames with iframe and window
@@ -2046,12 +2045,12 @@ module.exports.f = function getOwnPropertyNames(it){
/***/ }),
/* 356 */
/* 355 */
/***/ (function(module, exports, __webpack_require__) {
var has = __webpack_require__(20)
, toIObject = __webpack_require__(28)
, arrayIndexOf = __webpack_require__(337)(false)
, arrayIndexOf = __webpack_require__(336)(false)
, IE_PROTO = __webpack_require__(233)('IE_PROTO');
module.exports = function(object, names){
@@ -2068,7 +2067,7 @@ module.exports = function(object, names){
};
/***/ }),
/* 357 */
/* 356 */
/***/ (function(module, exports, __webpack_require__) {
var $parseFloat = __webpack_require__(14).parseFloat
@@ -2081,7 +2080,7 @@ module.exports = 1 / $parseFloat(__webpack_require__(235) + '-0') !== -Infinity
} : $parseFloat;
/***/ }),
/* 358 */
/* 357 */
/***/ (function(module, exports, __webpack_require__) {
var $parseInt = __webpack_require__(14).parseInt
@@ -2095,7 +2094,7 @@ module.exports = $parseInt(ws + '08') !== 8 || $parseInt(ws + '0x16') !== 22 ? f
} : $parseInt;
/***/ }),
/* 359 */
/* 358 */
/***/ (function(module, exports, __webpack_require__) {
var toInteger = __webpack_require__(82)
@@ -2117,7 +2116,7 @@ module.exports = function(TO_STRING){
};
/***/ }),
/* 360 */
/* 359 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -2135,16 +2134,16 @@ module.exports = function repeat(count){
};
/***/ }),
/* 361 */
/* 360 */
/***/ (function(module, exports, __webpack_require__) {
exports.f = __webpack_require__(10);
/***/ }),
/* 362 */
/* 361 */
/***/ (function(module, exports, __webpack_require__) {
var classof = __webpack_require__(340)
var classof = __webpack_require__(339)
, ITERATOR = __webpack_require__(10)('iterator')
, Iterators = __webpack_require__(106);
module.exports = __webpack_require__(13).getIteratorMethod = function(it){
@@ -2154,13 +2153,13 @@ module.exports = __webpack_require__(13).getIteratorMethod = function(it){
};
/***/ }),
/* 363 */
/* 362 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
var addToUnscopables = __webpack_require__(104)
, step = __webpack_require__(351)
, step = __webpack_require__(350)
, Iterators = __webpack_require__(106)
, toIObject = __webpack_require__(28);
@@ -2194,12 +2193,12 @@ addToUnscopables('values');
addToUnscopables('entries');
/***/ }),
/* 364 */
/* 363 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
var strong = __webpack_require__(341);
var strong = __webpack_require__(340);
// 23.1 Map Objects
module.exports = __webpack_require__(219)('Map', function(get){
@@ -2217,7 +2216,7 @@ module.exports = __webpack_require__(219)('Map', function(get){
}, strong, true);
/***/ }),
/* 365 */
/* 364 */
/***/ (function(module, exports, __webpack_require__) {
// 21.2.5.3 get RegExp.prototype.flags()
@@ -2227,7 +2226,7 @@ if(__webpack_require__(18) && /./g.flags != 'g')__webpack_require__(17).f(RegExp
});
/***/ }),
/* 366 */
/* 365 */
/***/ (function(module, exports, __webpack_require__) {
// @@match logic
@@ -2242,7 +2241,7 @@ __webpack_require__(152)('match', 1, function(defined, MATCH, $match){
});
/***/ }),
/* 367 */
/* 366 */
/***/ (function(module, exports, __webpack_require__) {
// @@replace logic
@@ -2259,7 +2258,7 @@ __webpack_require__(152)('replace', 2, function(defined, REPLACE, $replace){
});
/***/ }),
/* 368 */
/* 367 */
/***/ (function(module, exports, __webpack_require__) {
// @@search logic
@@ -2274,7 +2273,7 @@ __webpack_require__(152)('search', 1, function(defined, SEARCH, $search){
});
/***/ }),
/* 369 */
/* 368 */
/***/ (function(module, exports, __webpack_require__) {
// @@split logic
@@ -2349,12 +2348,12 @@ __webpack_require__(152)('split', 2, function(defined, SPLIT, $split){
});
/***/ }),
/* 370 */
/* 369 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
var strong = __webpack_require__(341);
var strong = __webpack_require__(340);
// 23.2 Set Objects
module.exports = __webpack_require__(219)('Set', function(get){
@@ -2367,7 +2366,7 @@ module.exports = __webpack_require__(219)('Set', function(get){
}, strong);
/***/ }),
/* 371 */
/* 370 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -2384,7 +2383,7 @@ var global = __webpack_require__(14)
, setToStringTag = __webpack_require__(156)
, uid = __webpack_require__(109)
, wks = __webpack_require__(10)
, wksExt = __webpack_require__(361)
, wksExt = __webpack_require__(360)
, wksDefine = __webpack_require__(541)
, keyOf = __webpack_require__(538)
, enumKeys = __webpack_require__(536)
@@ -2394,7 +2393,7 @@ var global = __webpack_require__(14)
, toPrimitive = __webpack_require__(68)
, createDesc = __webpack_require__(67)
, _create = __webpack_require__(80)
, gOPNExt = __webpack_require__(355)
, gOPNExt = __webpack_require__(354)
, $GOPD = __webpack_require__(57)
, $DP = __webpack_require__(17)
, $keys = __webpack_require__(81)
@@ -2608,10 +2607,10 @@ setToStringTag(Math, 'Math', true);
setToStringTag(global.JSON, 'JSON', true);
/***/ }),
/* 372 */
/* 371 */
/***/ (function(module, exports, __webpack_require__) {
var $iterators = __webpack_require__(363)
var $iterators = __webpack_require__(362)
, redefine = __webpack_require__(21)
, global = __webpack_require__(14)
, hide = __webpack_require__(43)
@@ -2635,6 +2634,7 @@ for(var collections = ['NodeList', 'DOMTokenList', 'MediaList', 'StyleSheetList'
}
/***/ }),
/* 372 */,
/* 373 */,
/* 374 */,
/* 375 */,
@@ -2869,7 +2869,7 @@ __webpack_require__(544);
__webpack_require__(547);
__webpack_require__(546);
__webpack_require__(561);
__webpack_require__(363);
__webpack_require__(362);
module.exports = __webpack_require__(13).Array;
/***/ }),
@@ -2898,8 +2898,8 @@ module.exports = __webpack_require__(13).Function;
__webpack_require__(159);
__webpack_require__(160);
__webpack_require__(372);
__webpack_require__(364);
__webpack_require__(371);
__webpack_require__(363);
module.exports = __webpack_require__(13).Map;
/***/ }),
@@ -2947,7 +2947,7 @@ module.exports = __webpack_require__(13).Number;
/* 520 */
/***/ (function(module, exports, __webpack_require__) {
__webpack_require__(371);
__webpack_require__(370);
__webpack_require__(600);
__webpack_require__(602);
__webpack_require__(601);
@@ -3008,11 +3008,11 @@ module.exports = __webpack_require__(13).Reflect;
__webpack_require__(631);
__webpack_require__(632);
__webpack_require__(364);
__webpack_require__(365);
__webpack_require__(366);
__webpack_require__(367);
__webpack_require__(368);
__webpack_require__(369);
module.exports = __webpack_require__(13).RegExp;
/***/ }),
@@ -3021,8 +3021,8 @@ module.exports = __webpack_require__(13).RegExp;
__webpack_require__(159);
__webpack_require__(160);
__webpack_require__(372);
__webpack_require__(370);
__webpack_require__(371);
__webpack_require__(369);
module.exports = __webpack_require__(13).Set;
/***/ }),
@@ -3051,17 +3051,17 @@ __webpack_require__(648);
__webpack_require__(650);
__webpack_require__(651);
__webpack_require__(652);
__webpack_require__(365);
__webpack_require__(366);
__webpack_require__(367);
__webpack_require__(368);
__webpack_require__(369);
module.exports = __webpack_require__(13).String;
/***/ }),
/* 527 */
/***/ (function(module, exports, __webpack_require__) {
__webpack_require__(371);
__webpack_require__(370);
__webpack_require__(159);
module.exports = __webpack_require__(13).Symbol;
@@ -3370,7 +3370,7 @@ module.exports = Object.is || function is(x, y){
var global = __webpack_require__(14)
, core = __webpack_require__(13)
, LIBRARY = __webpack_require__(227)
, wksExt = __webpack_require__(361)
, wksExt = __webpack_require__(360)
, defineProperty = __webpack_require__(17).f;
module.exports = function(name){
var $Symbol = core.Symbol || (core.Symbol = LIBRARY ? {} : global.Symbol || {});
@@ -3497,13 +3497,13 @@ $export($export.P + $export.F * !STRICT, 'Array', {
var ctx = __webpack_require__(79)
, $export = __webpack_require__(1)
, toObject = __webpack_require__(29)
, call = __webpack_require__(348)
, isArrayIter = __webpack_require__(346)
, call = __webpack_require__(347)
, isArrayIter = __webpack_require__(345)
, toLength = __webpack_require__(23)
, createProperty = __webpack_require__(342)
, getIterFn = __webpack_require__(362);
, createProperty = __webpack_require__(341)
, getIterFn = __webpack_require__(361);
$export($export.S + $export.F * !__webpack_require__(350)(function(iter){ Array.from(iter); }), 'Array', {
$export($export.S + $export.F * !__webpack_require__(349)(function(iter){ Array.from(iter); }), 'Array', {
// 22.1.2.1 Array.from(arrayLike, mapfn = undefined, thisArg = undefined)
from: function from(arrayLike/*, mapfn = undefined, thisArg = undefined*/){
var O = toObject(arrayLike)
@@ -3539,7 +3539,7 @@ $export($export.S + $export.F * !__webpack_require__(350)(function(iter){ Array.
"use strict";
var $export = __webpack_require__(1)
, $indexOf = __webpack_require__(337)(false)
, $indexOf = __webpack_require__(336)(false)
, $native = [].indexOf
, NEGATIVE_ZERO = !!$native && 1 / [1].indexOf(1, -0) < 0;
@@ -3631,7 +3631,7 @@ $export($export.P + $export.F * !__webpack_require__(27)([].map, true), 'Array',
"use strict";
var $export = __webpack_require__(1)
, createProperty = __webpack_require__(342);
, createProperty = __webpack_require__(341);
// WebKit Array.of isn't generic
$export($export.S + $export.F * __webpack_require__(6)(function(){
@@ -3656,7 +3656,7 @@ $export($export.S + $export.F * __webpack_require__(6)(function(){
"use strict";
var $export = __webpack_require__(1)
, $reduce = __webpack_require__(338);
, $reduce = __webpack_require__(337);
$export($export.P + $export.F * !__webpack_require__(27)([].reduceRight, true), 'Array', {
// 22.1.3.19 / 15.4.4.22 Array.prototype.reduceRight(callbackfn [, initialValue])
@@ -3672,7 +3672,7 @@ $export($export.P + $export.F * !__webpack_require__(27)([].reduceRight, true),
"use strict";
var $export = __webpack_require__(1)
, $reduce = __webpack_require__(338);
, $reduce = __webpack_require__(337);
$export($export.P + $export.F * !__webpack_require__(27)([].reduce, true), 'Array', {
// 22.1.3.18 / 15.4.4.21 Array.prototype.reduce(callbackfn [, initialValue])
@@ -3688,7 +3688,7 @@ $export($export.P + $export.F * !__webpack_require__(27)([].reduce, true), 'Arra
"use strict";
var $export = __webpack_require__(1)
, html = __webpack_require__(344)
, html = __webpack_require__(343)
, cof = __webpack_require__(66)
, toIndex = __webpack_require__(108)
, toLength = __webpack_require__(23)
@@ -3861,7 +3861,7 @@ if(new Date(NaN) + '' != INVALID_DATE){
// 19.2.3.2 / 15.3.4.5 Function.prototype.bind(thisArg, args...)
var $export = __webpack_require__(1);
$export($export.P, 'Function', {bind: __webpack_require__(339)});
$export($export.P, 'Function', {bind: __webpack_require__(338)});
/***/ }),
/* 568 */
@@ -3918,7 +3918,7 @@ NAME in FProto || __webpack_require__(18) && dP(FProto, NAME, {
// 20.2.2.3 Math.acosh(x)
var $export = __webpack_require__(1)
, log1p = __webpack_require__(352)
, log1p = __webpack_require__(351)
, sqrt = Math.sqrt
, $acosh = Math.acosh;
@@ -4119,7 +4119,7 @@ $export($export.S, 'Math', {
// 20.2.2.20 Math.log1p(x)
var $export = __webpack_require__(1);
$export($export.S, 'Math', {log1p: __webpack_require__(352)});
$export($export.S, 'Math', {log1p: __webpack_require__(351)});
/***/ }),
/* 582 */
@@ -4298,7 +4298,7 @@ $export($export.S, 'Number', {
// 20.1.2.3 Number.isInteger(number)
var $export = __webpack_require__(1);
$export($export.S, 'Number', {isInteger: __webpack_require__(347)});
$export($export.S, 'Number', {isInteger: __webpack_require__(346)});
/***/ }),
/* 591 */
@@ -4319,7 +4319,7 @@ $export($export.S, 'Number', {
// 20.1.2.5 Number.isSafeInteger(number)
var $export = __webpack_require__(1)
, isInteger = __webpack_require__(347)
, isInteger = __webpack_require__(346)
, abs = Math.abs;
$export($export.S, 'Number', {
@@ -4351,7 +4351,7 @@ $export($export.S, 'Number', {MIN_SAFE_INTEGER: -0x1fffffffffffff});
/***/ (function(module, exports, __webpack_require__) {
var $export = __webpack_require__(1)
, $parseFloat = __webpack_require__(357);
, $parseFloat = __webpack_require__(356);
// 20.1.2.12 Number.parseFloat(string)
$export($export.S + $export.F * (Number.parseFloat != $parseFloat), 'Number', {parseFloat: $parseFloat});
@@ -4360,7 +4360,7 @@ $export($export.S + $export.F * (Number.parseFloat != $parseFloat), 'Number', {p
/***/ (function(module, exports, __webpack_require__) {
var $export = __webpack_require__(1)
, $parseInt = __webpack_require__(358);
, $parseInt = __webpack_require__(357);
// 20.1.2.13 Number.parseInt(string, radix)
$export($export.S + $export.F * (Number.parseInt != $parseInt), 'Number', {parseInt: $parseInt});
@@ -4372,8 +4372,8 @@ $export($export.S + $export.F * (Number.parseInt != $parseInt), 'Number', {parse
var $export = __webpack_require__(1)
, toInteger = __webpack_require__(82)
, aNumberValue = __webpack_require__(336)
, repeat = __webpack_require__(360)
, aNumberValue = __webpack_require__(335)
, repeat = __webpack_require__(359)
, $toFixed = 1..toFixed
, floor = Math.floor
, data = [0, 0, 0, 0, 0, 0]
@@ -4491,7 +4491,7 @@ $export($export.P + $export.F * (!!$toFixed && (
var $export = __webpack_require__(1)
, $fails = __webpack_require__(6)
, aNumberValue = __webpack_require__(336)
, aNumberValue = __webpack_require__(335)
, $toPrecision = 1..toPrecision;
$export($export.P + $export.F * ($fails(function(){
@@ -4514,7 +4514,7 @@ $export($export.P + $export.F * ($fails(function(){
// 19.1.3.1 Object.assign(target, source)
var $export = __webpack_require__(1);
$export($export.S + $export.F, 'Object', {assign: __webpack_require__(353)});
$export($export.S + $export.F, 'Object', {assign: __webpack_require__(352)});
/***/ }),
/* 600 */
@@ -4530,7 +4530,7 @@ $export($export.S, 'Object', {create: __webpack_require__(80)});
var $export = __webpack_require__(1);
// 19.1.2.3 / 15.2.3.7 Object.defineProperties(O, Properties)
$export($export.S + $export.F * !__webpack_require__(18), 'Object', {defineProperties: __webpack_require__(354)});
$export($export.S + $export.F * !__webpack_require__(18), 'Object', {defineProperties: __webpack_require__(353)});
/***/ }),
/* 602 */
@@ -4574,7 +4574,7 @@ __webpack_require__(38)('getOwnPropertyDescriptor', function(){
// 19.1.2.7 Object.getOwnPropertyNames(O)
__webpack_require__(38)('getOwnPropertyNames', function(){
return __webpack_require__(355).f;
return __webpack_require__(354).f;
});
/***/ }),
@@ -4693,7 +4693,7 @@ $export($export.S, 'Object', {setPrototypeOf: __webpack_require__(231).set});
/***/ (function(module, exports, __webpack_require__) {
var $export = __webpack_require__(1)
, $parseFloat = __webpack_require__(357);
, $parseFloat = __webpack_require__(356);
// 18.2.4 parseFloat(string)
$export($export.G + $export.F * (parseFloat != $parseFloat), {parseFloat: $parseFloat});
@@ -4702,7 +4702,7 @@ $export($export.G + $export.F * (parseFloat != $parseFloat), {parseFloat: $parse
/***/ (function(module, exports, __webpack_require__) {
var $export = __webpack_require__(1)
, $parseInt = __webpack_require__(358);
, $parseInt = __webpack_require__(357);
// 18.2.5 parseInt(string, radix)
$export($export.G + $export.F * (parseInt != $parseInt), {parseInt: $parseInt});
@@ -4738,7 +4738,7 @@ var $export = __webpack_require__(1)
, anObject = __webpack_require__(4)
, isObject = __webpack_require__(7)
, fails = __webpack_require__(6)
, bind = __webpack_require__(339)
, bind = __webpack_require__(338)
, rConstruct = (__webpack_require__(14).Reflect || {}).construct;
// MS Edge supports only 2 arguments and argumentsList argument is optional
@@ -4838,7 +4838,7 @@ var Enumerate = function(iterated){
, key;
for(key in iterated)keys.push(key);
};
__webpack_require__(349)(Enumerate, 'Object', function(){
__webpack_require__(348)(Enumerate, 'Object', function(){
var that = this
, keys = that._k
, key;
@@ -5079,7 +5079,7 @@ __webpack_require__(232)('RegExp');
"use strict";
__webpack_require__(365);
__webpack_require__(364);
var anObject = __webpack_require__(4)
, $flags = __webpack_require__(222)
, DESCRIPTORS = __webpack_require__(18)
@@ -5163,7 +5163,7 @@ __webpack_require__(22)('bold', function(createHTML){
"use strict";
var $export = __webpack_require__(1)
, $at = __webpack_require__(359)(false);
, $at = __webpack_require__(358)(false);
$export($export.P, 'String', {
// 21.1.3.3 String.prototype.codePointAt(pos)
codePointAt: function codePointAt(pos){
@@ -5339,7 +5339,7 @@ var $export = __webpack_require__(1);
$export($export.P, 'String', {
// 21.1.3.13 String.prototype.repeat(count)
repeat: __webpack_require__(360)
repeat: __webpack_require__(359)
});
/***/ }),
@@ -5440,7 +5440,7 @@ __webpack_require__(158)('trim', function($trim){
var each = __webpack_require__(41)(0)
, redefine = __webpack_require__(21)
, meta = __webpack_require__(56)
, assign = __webpack_require__(353)
, assign = __webpack_require__(352)
, weak = __webpack_require__(534)
, isObject = __webpack_require__(7)
, getWeak = meta.getWeak
@@ -5530,7 +5530,7 @@ metadata.exp({deleteMetadata: function deleteMetadata(metadataKey, target /*, ta
/* 657 */
/***/ (function(module, exports, __webpack_require__) {
var Set = __webpack_require__(370)
var Set = __webpack_require__(369)
, from = __webpack_require__(531)
, metadata = __webpack_require__(44)
, anObject = __webpack_require__(4)
+1 -1
View File
File diff suppressed because one or more lines are too long
+304 -304
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -9
View File
@@ -15,15 +15,7 @@
<div class="col-md-6">
<div style="display: block;">
<canvas baseChart width="400" height="400"
[datasets]="data1.data"
[labels]="label.data"
[options]="lineChartOptions"
[colors]="lineChartColors"
[legend]="lineChartLegend"
[chartType]="lineChartType"></canvas>
</div>
<line-chart [label]="label" [data]="data1"></line-chart>
</div>
<div class="col-md-6">
+1 -28
View File
@@ -1,8 +1,6 @@
import { Component, OnInit, OnDestroy, ViewChild, ElementRef } from '@angular/core';
import { Component, OnInit, OnDestroy } from '@angular/core';
import { ActivatedRoute, Params } from '@angular/router';
import { BaseChartDirective } from 'ng2-charts/ng2-charts';
import { IntervalObservable } from 'rxjs/observable/IntervalObservable';
import { Subscription } from 'rxjs/Subscription';
@@ -18,8 +16,6 @@ import {LabelData} from "./label-data";
export class DetailComponent implements OnInit, OnDestroy {
@ViewChild(BaseChartDirective) public chart: BaseChartDirective;
public id:string = 'Loading';
public name:string = "Loading";
@@ -39,27 +35,6 @@ export class DetailComponent implements OnInit, OnDestroy {
public subscription:Subscription;
public lineChartOptions:any = {
responsive: true,
title: {
display: true,
position: 'left',
text: 'Watt'
}
};
public lineChartColors:Array<any> = [
{ // grey
backgroundColor: 'rgba(148,159,177,0.2)',
borderColor: 'rgba(148,159,177,1)',
pointBackgroundColor: 'rgba(148,159,177,1)',
pointBorderColor: '#fff',
pointHoverBackgroundColor: '#fff',
pointHoverBorderColor: 'rgba(148,159,177,0.8)'
}
];
public lineChartLegend:boolean = true;
public lineChartType:string = 'line';
constructor(private dataService: DataService,
private route: ActivatedRoute) {}
@@ -94,8 +69,6 @@ export class DetailComponent implements OnInit, OnDestroy {
this.loaded = true;
this.chart.chart.update();
});
this.dataService