Added device list

This commit is contained in:
2017-04-05 12:26:58 +02:00
parent 3276942f1b
commit f5381f0cc2
11 changed files with 542 additions and 448 deletions
+1 -1
View File
File diff suppressed because one or more lines are too long
+107 -75
View File
@@ -1,6 +1,92 @@
webpackJsonp([1,4],{
/***/ 329:
/***/ 215:
/***/ (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_rxjs_add_operator_map__ = __webpack_require__(674);
/* 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__(307);
/* 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;
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
return c > 3 && r && Object.defineProperty(target, key, r), r;
};
var __metadata = (this && this.__metadata) || function (k, v) {
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
};
var DataService = (function () {
function DataService(http) {
this.http = http;
this.baseUrl = '/webapi/data';
this.deviceUrl = '/webapi/device';
}
DataService.prototype.get = function () {
var lineChartData$ =
//<LineData>( {data: [65, 59, 80, 81, 56, 55, 40], label: 'Series A'} );
this.http
.get(("" + this.baseUrl), { headers: this.getHeaders() })
.map(mapData);
return lineChartData$;
};
DataService.prototype.devices = function () {
var devices$ =
//<LineData>( {data: [65, 59, 80, 81, 56, 55, 40], label: 'Series A'} );
this.http
.get(("" + this.deviceUrl), { headers: this.getHeaders() })
.map(mapDevice);
return devices$;
};
DataService.prototype.getHeaders = function () {
var headers = new __WEBPACK_IMPORTED_MODULE_2__angular_http__["b" /* Headers */]();
headers.append('Accept', 'application/json');
return headers;
};
DataService = __decorate([
__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__angular_core__["Injectable"])(),
__metadata('design:paramtypes', [(typeof (_a = typeof __WEBPACK_IMPORTED_MODULE_2__angular_http__["c" /* Http */] !== 'undefined' && __WEBPACK_IMPORTED_MODULE_2__angular_http__["c" /* Http */]) === 'function' && _a) || Object])
], DataService);
return DataService;
var _a;
}());
function mapData(response) {
var nums = response.json().map(toData);
var times = response.json().map(timeToData);
var line = ({ data: nums, label: "Energieverbruik" });
var label = ({ data: times });
var graph = ({ lines: line, labels: label });
return graph;
}
function toData(r) {
var num = r.TOE1;
return num;
}
function timeToData(r) {
var times = r.time.substring(11, 19);
return times;
}
function mapDevice(response) {
var devices = response.json().map(toDevice);
return devices;
}
function toDevice(r) {
var device = ({
sn: r.SN,
name: r.name
});
return device;
}
//# sourceMappingURL=C:/Users/avans/Documents/Angular/Smarthome-local/mean-app/src/data.service.js.map
/***/ }),
/***/ 330:
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -32,77 +118,12 @@ var DashboardComponent = (function () {
/***/ }),
/***/ 330:
/***/ (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_rxjs_add_operator_map__ = __webpack_require__(674);
/* 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__(306);
/* 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;
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
return c > 3 && r && Object.defineProperty(target, key, r), r;
};
var __metadata = (this && this.__metadata) || function (k, v) {
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
};
var DataService = (function () {
function DataService(http) {
this.http = http;
this.baseUrl = '/webapi/data';
}
DataService.prototype.get = function () {
var lineChartData$ =
//<LineData>( {data: [65, 59, 80, 81, 56, 55, 40], label: 'Series A'} );
this.http
.get(("" + this.baseUrl), { headers: this.getHeaders() })
.map(mapData);
return lineChartData$;
};
DataService.prototype.getHeaders = function () {
var headers = new __WEBPACK_IMPORTED_MODULE_2__angular_http__["b" /* Headers */]();
headers.append('Accept', 'application/json');
return headers;
};
DataService = __decorate([
__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__angular_core__["Injectable"])(),
__metadata('design:paramtypes', [(typeof (_a = typeof __WEBPACK_IMPORTED_MODULE_2__angular_http__["c" /* Http */] !== 'undefined' && __WEBPACK_IMPORTED_MODULE_2__angular_http__["c" /* Http */]) === 'function' && _a) || Object])
], DataService);
return DataService;
var _a;
}());
function mapData(response) {
var nums = response.json().map(toData);
var times = response.json().map(timeToData);
var line = ({ data: nums, label: "Energieverbruik" });
var label = ({ data: times });
var graph = ({ lines: line, labels: label });
return graph;
}
function toData(r) {
var num = r.TOE1;
return num;
}
function timeToData(r) {
var times = r.time.substring(11, 19);
return times;
}
//# sourceMappingURL=C:/Users/avans/Documents/Angular/Smarthome-local/mean-app/src/data.service.js.map
/***/ }),
/***/ 331:
/***/ (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__data_service__ = __webpack_require__(215);
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return DeviceComponent; });
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;
@@ -114,17 +135,28 @@ var __metadata = (this && this.__metadata) || function (k, v) {
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
};
var DeviceComponent = (function () {
function DeviceComponent() {
function DeviceComponent(dataService) {
this.dataService = dataService;
}
DeviceComponent.prototype.ngOnInit = function () {
var _this = this;
this.dataService
.devices()
.subscribe(function (res) {
_this.devices = res;
});
};
DeviceComponent = __decorate([
__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__angular_core__["Component"])({
selector: 'device',
template: __webpack_require__(670)
}),
__metadata('design:paramtypes', [])
__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])
], DeviceComponent);
return DeviceComponent;
var _a;
}());
//# sourceMappingURL=C:/Users/avans/Documents/Angular/Smarthome-local/mean-app/src/device.component.js.map
@@ -171,7 +203,7 @@ __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__(495);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__dashboard_component__ = __webpack_require__(329);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__dashboard_component__ = __webpack_require__(330);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__device_component__ = __webpack_require__(331);
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AppRoutingModule; });
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -249,15 +281,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__(466);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__angular_http__ = __webpack_require__(306);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__angular_http__ = __webpack_require__(307);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_ng2_charts_ng2_charts__ = __webpack_require__(369);
/* 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__(506);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__app_component__ = __webpack_require__(507);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__chart_component__ = __webpack_require__(509);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__dashboard_component__ = __webpack_require__(329);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__dashboard_component__ = __webpack_require__(330);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__device_component__ = __webpack_require__(331);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__data_service__ = __webpack_require__(330);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__data_service__ = __webpack_require__(215);
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AppModule; });
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;
@@ -313,7 +345,7 @@ var AppModule = (function () {
"use strict";
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__data_service__ = __webpack_require__(330);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__data_service__ = __webpack_require__(215);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_ng2_charts_ng2_charts__ = __webpack_require__(369);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_ng2_charts_ng2_charts___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_2_ng2_charts_ng2_charts__);
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return LineChartComponent; });
@@ -445,7 +477,7 @@ module.exports = "<div>\r\n\t<line-chart></line-chart>\r\n</div>"
/***/ 670:
/***/ (function(module, exports) {
module.exports = "<line-chart></line-chart>"
module.exports = "<div>\r\n\r\n<ul>\r\n <li *ngFor=\"let device of devices\">\r\n <span class=\"badge\"> {{device.sn}} </span> {{device.name}}\r\n </li>\r\n</ul>\r\n\r\n</div>"
/***/ }),
+1 -1
View File
File diff suppressed because one or more lines are too long
+73 -73
View File
@@ -426,7 +426,7 @@ module.exports = {
// 19.1.2.9 / 15.2.3.2 Object.getPrototypeOf(O)
var has = __webpack_require__(20)
, toObject = __webpack_require__(29)
, IE_PROTO = __webpack_require__(230)('IE_PROTO')
, IE_PROTO = __webpack_require__(231)('IE_PROTO')
, ObjectProto = Object.prototype;
module.exports = Object.getPrototypeOf || function(O){
@@ -650,8 +650,8 @@ 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__(350)
, enumBugKeys = __webpack_require__(217)
, IE_PROTO = __webpack_require__(230)('IE_PROTO')
, enumBugKeys = __webpack_require__(218)
, IE_PROTO = __webpack_require__(231)('IE_PROTO')
, Empty = function(){ /* empty */ }
, PROTOTYPE = 'prototype';
@@ -696,7 +696,7 @@ module.exports = Object.create || function create(O, Properties){
// 19.1.2.14 / 15.2.3.14 Object.keys(O)
var $keys = __webpack_require__(352)
, enumBugKeys = __webpack_require__(217);
, enumBugKeys = __webpack_require__(218);
module.exports = Object.keys || function keys(O){
return $keys(O, enumBugKeys);
@@ -768,7 +768,7 @@ module.exports = {};
// 19.1.2.7 / 15.2.3.4 Object.getOwnPropertyNames(O)
var $keys = __webpack_require__(352)
, hiddenKeys = __webpack_require__(217).concat('length', 'prototype');
, hiddenKeys = __webpack_require__(218).concat('length', 'prototype');
exports.f = Object.getOwnPropertyNames || function getOwnPropertyNames(O){
return $keys(O, hiddenKeys);
@@ -943,7 +943,7 @@ module.exports = function(key){
var $export = __webpack_require__(1)
, defined = __webpack_require__(42)
, fails = __webpack_require__(6)
, spaces = __webpack_require__(232)
, spaces = __webpack_require__(233)
, space = '[' + spaces + ']'
, non = '\u200b\u0085'
, ltrim = RegExp('^' + space + space + '*')
@@ -996,7 +996,7 @@ if(test + '' != '[object z]'){
var $at = __webpack_require__(355)(true);
// 21.1.3.27 String.prototype[@@iterator]()
__webpack_require__(223)(String, 'String', function(iterated){
__webpack_require__(224)(String, 'String', function(iterated){
this._t = String(iterated); // target
this._i = 0; // next index
// 21.1.5.2.1 %StringIteratorPrototype%.next()
@@ -1066,7 +1066,8 @@ __webpack_require__(223)(String, 'String', function(iterated){
/* 212 */,
/* 213 */,
/* 214 */,
/* 215 */
/* 215 */,
/* 216 */
/***/ (function(module, exports) {
module.exports = function(it, Constructor, name, forbiddenField){
@@ -1076,7 +1077,7 @@ module.exports = function(it, Constructor, name, forbiddenField){
};
/***/ }),
/* 216 */
/* 217 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -1084,15 +1085,15 @@ module.exports = function(it, Constructor, name, forbiddenField){
var global = __webpack_require__(14)
, $export = __webpack_require__(1)
, redefine = __webpack_require__(21)
, redefineAll = __webpack_require__(227)
, redefineAll = __webpack_require__(228)
, meta = __webpack_require__(55)
, forOf = __webpack_require__(152)
, anInstance = __webpack_require__(215)
, anInstance = __webpack_require__(216)
, isObject = __webpack_require__(7)
, fails = __webpack_require__(6)
, $iterDetect = __webpack_require__(346)
, setToStringTag = __webpack_require__(155)
, inheritIfRequired = __webpack_require__(220);
, inheritIfRequired = __webpack_require__(221);
module.exports = function(NAME, wrapper, methods, common, IS_MAP, IS_WEAK){
var Base = global[NAME]
@@ -1167,7 +1168,7 @@ module.exports = function(NAME, wrapper, methods, common, IS_MAP, IS_WEAK){
};
/***/ }),
/* 217 */
/* 218 */
/***/ (function(module, exports) {
// IE 8- don't enum bug keys
@@ -1176,7 +1177,7 @@ module.exports = (
).split(',');
/***/ }),
/* 218 */
/* 219 */
/***/ (function(module, exports, __webpack_require__) {
var MATCH = __webpack_require__(10)('match');
@@ -1193,7 +1194,7 @@ module.exports = function(KEY){
};
/***/ }),
/* 219 */
/* 220 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -1212,11 +1213,11 @@ module.exports = function(){
};
/***/ }),
/* 220 */
/* 221 */
/***/ (function(module, exports, __webpack_require__) {
var isObject = __webpack_require__(7)
, setPrototypeOf = __webpack_require__(228).set;
, setPrototypeOf = __webpack_require__(229).set;
module.exports = function(that, target, C){
var P, S = target.constructor;
if(S !== C && typeof S == 'function' && (P = S.prototype) !== C.prototype && isObject(P) && setPrototypeOf){
@@ -1225,7 +1226,7 @@ module.exports = function(that, target, C){
};
/***/ }),
/* 221 */
/* 222 */
/***/ (function(module, exports, __webpack_require__) {
// 7.2.2 IsArray(argument)
@@ -1235,7 +1236,7 @@ module.exports = Array.isArray || function isArray(arg){
};
/***/ }),
/* 222 */
/* 223 */
/***/ (function(module, exports, __webpack_require__) {
// 7.2.8 IsRegExp(argument)
@@ -1248,12 +1249,12 @@ module.exports = function(it){
};
/***/ }),
/* 223 */
/* 224 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
var LIBRARY = __webpack_require__(224)
var LIBRARY = __webpack_require__(225)
, $export = __webpack_require__(1)
, redefine = __webpack_require__(21)
, hide = __webpack_require__(43)
@@ -1324,13 +1325,13 @@ module.exports = function(Base, NAME, Constructor, next, DEFAULT, IS_SET, FORCED
};
/***/ }),
/* 224 */
/* 225 */
/***/ (function(module, exports) {
module.exports = false;
/***/ }),
/* 225 */
/* 226 */
/***/ (function(module, exports) {
// 20.2.2.14 Math.expm1(x)
@@ -1345,7 +1346,7 @@ module.exports = (!$expm1
} : $expm1;
/***/ }),
/* 226 */
/* 227 */
/***/ (function(module, exports) {
// 20.2.2.28 Math.sign(x)
@@ -1354,7 +1355,7 @@ module.exports = Math.sign || function sign(x){
};
/***/ }),
/* 227 */
/* 228 */
/***/ (function(module, exports, __webpack_require__) {
var redefine = __webpack_require__(21);
@@ -1364,7 +1365,7 @@ module.exports = function(target, src, safe){
};
/***/ }),
/* 228 */
/* 229 */
/***/ (function(module, exports, __webpack_require__) {
// Works with __proto__ only. Old v8 can't work with null proto objects.
@@ -1394,7 +1395,7 @@ module.exports = {
};
/***/ }),
/* 229 */
/* 230 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -1413,7 +1414,7 @@ module.exports = function(KEY){
};
/***/ }),
/* 230 */
/* 231 */
/***/ (function(module, exports, __webpack_require__) {
var shared = __webpack_require__(156)('keys')
@@ -1423,11 +1424,11 @@ module.exports = function(key){
};
/***/ }),
/* 231 */
/* 232 */
/***/ (function(module, exports, __webpack_require__) {
// helper for String#{startsWith, endsWith, includes}
var isRegExp = __webpack_require__(222)
var isRegExp = __webpack_require__(223)
, defined = __webpack_require__(42);
module.exports = function(that, searchString, NAME){
@@ -1436,14 +1437,13 @@ module.exports = function(that, searchString, NAME){
};
/***/ }),
/* 232 */
/* 233 */
/***/ (function(module, exports) {
module.exports = '\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u180E\u2000\u2001\u2002\u2003' +
'\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028\u2029\uFEFF';
/***/ }),
/* 233 */,
/* 234 */,
/* 235 */,
/* 236 */,
@@ -1676,14 +1676,14 @@ module.exports = function(it){
var dP = __webpack_require__(16).f
, create = __webpack_require__(80)
, redefineAll = __webpack_require__(227)
, redefineAll = __webpack_require__(228)
, ctx = __webpack_require__(79)
, anInstance = __webpack_require__(215)
, anInstance = __webpack_require__(216)
, defined = __webpack_require__(42)
, forOf = __webpack_require__(152)
, $iterDefine = __webpack_require__(223)
, $iterDefine = __webpack_require__(224)
, step = __webpack_require__(347)
, setSpecies = __webpack_require__(229)
, setSpecies = __webpack_require__(230)
, DESCRIPTORS = __webpack_require__(18)
, fastKey = __webpack_require__(55).fastKey
, SIZE = DESCRIPTORS ? '_s' : 'size';
@@ -2048,7 +2048,7 @@ module.exports.f = function getOwnPropertyNames(it){
var has = __webpack_require__(20)
, toIObject = __webpack_require__(28)
, arrayIndexOf = __webpack_require__(333)(false)
, IE_PROTO = __webpack_require__(230)('IE_PROTO');
, IE_PROTO = __webpack_require__(231)('IE_PROTO');
module.exports = function(object, names){
var O = toIObject(object)
@@ -2070,7 +2070,7 @@ module.exports = function(object, names){
var $parseFloat = __webpack_require__(14).parseFloat
, $trim = __webpack_require__(157).trim;
module.exports = 1 / $parseFloat(__webpack_require__(232) + '-0') !== -Infinity ? function parseFloat(str){
module.exports = 1 / $parseFloat(__webpack_require__(233) + '-0') !== -Infinity ? function parseFloat(str){
var string = $trim(String(str), 3)
, result = $parseFloat(string);
return result === 0 && string.charAt(0) == '-' ? -0 : result;
@@ -2082,7 +2082,7 @@ module.exports = 1 / $parseFloat(__webpack_require__(232) + '-0') !== -Infinity
var $parseInt = __webpack_require__(14).parseInt
, $trim = __webpack_require__(157).trim
, ws = __webpack_require__(232)
, ws = __webpack_require__(233)
, hex = /^[\-+]?0[xX]/;
module.exports = $parseInt(ws + '08') !== 8 || $parseInt(ws + '0x16') !== 22 ? function parseInt(str, radix){
@@ -2164,7 +2164,7 @@ var addToUnscopables = __webpack_require__(104)
// 22.1.3.13 Array.prototype.keys()
// 22.1.3.29 Array.prototype.values()
// 22.1.3.30 Array.prototype[@@iterator]()
module.exports = __webpack_require__(223)(Array, 'Array', function(iterated, kind){
module.exports = __webpack_require__(224)(Array, 'Array', function(iterated, kind){
this._t = toIObject(iterated); // target
this._i = 0; // next index
this._k = kind; // kind
@@ -2198,7 +2198,7 @@ addToUnscopables('entries');
var strong = __webpack_require__(337);
// 23.1 Map Objects
module.exports = __webpack_require__(216)('Map', function(get){
module.exports = __webpack_require__(217)('Map', function(get){
return function Map(){ return get(this, arguments.length > 0 ? arguments[0] : undefined); };
}, {
// 23.1.3.6 Map.prototype.get(key)
@@ -2219,7 +2219,7 @@ module.exports = __webpack_require__(216)('Map', function(get){
// 21.2.5.3 get RegExp.prototype.flags()
if(__webpack_require__(18) && /./g.flags != 'g')__webpack_require__(16).f(RegExp.prototype, 'flags', {
configurable: true,
get: __webpack_require__(219)
get: __webpack_require__(220)
});
/***/ }),
@@ -2276,7 +2276,7 @@ __webpack_require__(151)('search', 1, function(defined, SEARCH, $search){
// @@split logic
__webpack_require__(151)('split', 2, function(defined, SPLIT, $split){
'use strict';
var isRegExp = __webpack_require__(222)
var isRegExp = __webpack_require__(223)
, _split = $split
, $push = [].push
, $SPLIT = 'split'
@@ -2353,7 +2353,7 @@ __webpack_require__(151)('split', 2, function(defined, SPLIT, $split){
var strong = __webpack_require__(337);
// 23.2 Set Objects
module.exports = __webpack_require__(216)('Set', function(get){
module.exports = __webpack_require__(217)('Set', function(get){
return function Set(){ return get(this, arguments.length > 0 ? arguments[0] : undefined); };
}, {
// 23.2.3.1 Set.prototype.add(value)
@@ -2384,7 +2384,7 @@ var global = __webpack_require__(14)
, wksDefine = __webpack_require__(538)
, keyOf = __webpack_require__(535)
, enumKeys = __webpack_require__(533)
, isArray = __webpack_require__(221)
, isArray = __webpack_require__(222)
, anObject = __webpack_require__(4)
, toIObject = __webpack_require__(28)
, toPrimitive = __webpack_require__(68)
@@ -2520,7 +2520,7 @@ if(!USE_NATIVE){
__webpack_require__(154).f = $propertyIsEnumerable;
__webpack_require__(153).f = $getOwnPropertySymbols;
if(DESCRIPTORS && !__webpack_require__(224)){
if(DESCRIPTORS && !__webpack_require__(225)){
redefine(ObjectProto, 'propertyIsEnumerable', $propertyIsEnumerable, true);
}
@@ -3149,7 +3149,7 @@ module.exports = function(iter, ITERATOR){
/***/ (function(module, exports, __webpack_require__) {
var isObject = __webpack_require__(7)
, isArray = __webpack_require__(221)
, isArray = __webpack_require__(222)
, SPECIES = __webpack_require__(10)('species');
module.exports = function(original){
@@ -3182,11 +3182,11 @@ module.exports = function(original, length){
"use strict";
var redefineAll = __webpack_require__(227)
var redefineAll = __webpack_require__(228)
, getWeak = __webpack_require__(55).getWeak
, anObject = __webpack_require__(4)
, isObject = __webpack_require__(7)
, anInstance = __webpack_require__(215)
, anInstance = __webpack_require__(216)
, forOf = __webpack_require__(152)
, createArrayMethod = __webpack_require__(41)
, $has = __webpack_require__(20)
@@ -3366,7 +3366,7 @@ module.exports = Object.is || function is(x, y){
var global = __webpack_require__(14)
, core = __webpack_require__(13)
, LIBRARY = __webpack_require__(224)
, LIBRARY = __webpack_require__(225)
, wksExt = __webpack_require__(357)
, defineProperty = __webpack_require__(16).f;
module.exports = function(name){
@@ -3557,7 +3557,7 @@ $export($export.P + $export.F * (NEGATIVE_ZERO || !__webpack_require__(27)($nati
// 22.1.2.2 / 15.4.3.2 Array.isArray(arg)
var $export = __webpack_require__(1);
$export($export.S, 'Array', {isArray: __webpack_require__(221)});
$export($export.S, 'Array', {isArray: __webpack_require__(222)});
/***/ }),
/* 549 */
@@ -3761,7 +3761,7 @@ $export($export.P + $export.F * (fails(function(){
/* 558 */
/***/ (function(module, exports, __webpack_require__) {
__webpack_require__(229)('Array');
__webpack_require__(230)('Array');
/***/ }),
/* 559 */
@@ -3968,7 +3968,7 @@ $export($export.S + $export.F * !($atanh && 1 / $atanh(-0) < 0), 'Math', {
// 20.2.2.9 Math.cbrt(x)
var $export = __webpack_require__(1)
, sign = __webpack_require__(226);
, sign = __webpack_require__(227);
$export($export.S, 'Math', {
cbrt: function cbrt(x){
@@ -4009,7 +4009,7 @@ $export($export.S, 'Math', {
// 20.2.2.14 Math.expm1(x)
var $export = __webpack_require__(1)
, $expm1 = __webpack_require__(225);
, $expm1 = __webpack_require__(226);
$export($export.S + $export.F * ($expm1 != Math.expm1), 'Math', {expm1: $expm1});
@@ -4019,7 +4019,7 @@ $export($export.S + $export.F * ($expm1 != Math.expm1), 'Math', {expm1: $expm1})
// 20.2.2.16 Math.fround(x)
var $export = __webpack_require__(1)
, sign = __webpack_require__(226)
, sign = __webpack_require__(227)
, pow = Math.pow
, EPSILON = pow(2, -52)
, EPSILON32 = pow(2, -23)
@@ -4138,7 +4138,7 @@ $export($export.S, 'Math', {
// 20.2.2.28 Math.sign(x)
var $export = __webpack_require__(1);
$export($export.S, 'Math', {sign: __webpack_require__(226)});
$export($export.S, 'Math', {sign: __webpack_require__(227)});
/***/ }),
/* 581 */
@@ -4146,7 +4146,7 @@ $export($export.S, 'Math', {sign: __webpack_require__(226)});
// 20.2.2.30 Math.sinh(x)
var $export = __webpack_require__(1)
, expm1 = __webpack_require__(225)
, expm1 = __webpack_require__(226)
, exp = Math.exp;
// V8 near Chromium 38 has a problem with very small numbers
@@ -4166,7 +4166,7 @@ $export($export.S + $export.F * __webpack_require__(6)(function(){
// 20.2.2.33 Math.tanh(x)
var $export = __webpack_require__(1)
, expm1 = __webpack_require__(225)
, expm1 = __webpack_require__(226)
, exp = Math.exp;
$export($export.S, 'Math', {
@@ -4199,7 +4199,7 @@ $export($export.S, 'Math', {
var global = __webpack_require__(14)
, has = __webpack_require__(20)
, cof = __webpack_require__(66)
, inheritIfRequired = __webpack_require__(220)
, inheritIfRequired = __webpack_require__(221)
, toPrimitive = __webpack_require__(68)
, fails = __webpack_require__(6)
, gOPN = __webpack_require__(107).f
@@ -4683,7 +4683,7 @@ __webpack_require__(38)('seal', function($seal){
// 19.1.3.19 Object.setPrototypeOf(O, proto)
var $export = __webpack_require__(1);
$export($export.S, 'Object', {setPrototypeOf: __webpack_require__(228).set});
$export($export.S, 'Object', {setPrototypeOf: __webpack_require__(229).set});
/***/ }),
/* 612 */
@@ -4972,7 +4972,7 @@ $export($export.S, 'Reflect', {
// 26.1.14 Reflect.setPrototypeOf(target, proto)
var $export = __webpack_require__(1)
, setProto = __webpack_require__(228);
, setProto = __webpack_require__(229);
if(setProto)$export($export.S, 'Reflect', {
setPrototypeOf: function setPrototypeOf(target, proto){
@@ -5027,11 +5027,11 @@ $export($export.S, 'Reflect', {set: set});
/***/ (function(module, exports, __webpack_require__) {
var global = __webpack_require__(14)
, inheritIfRequired = __webpack_require__(220)
, inheritIfRequired = __webpack_require__(221)
, dP = __webpack_require__(16).f
, gOPN = __webpack_require__(107).f
, isRegExp = __webpack_require__(222)
, $flags = __webpack_require__(219)
, isRegExp = __webpack_require__(223)
, $flags = __webpack_require__(220)
, $RegExp = global.RegExp
, Base = $RegExp
, proto = $RegExp.prototype
@@ -5068,7 +5068,7 @@ if(__webpack_require__(18) && (!CORRECT_NEW || __webpack_require__(6)(function()
__webpack_require__(21)(global, 'RegExp', $RegExp);
}
__webpack_require__(229)('RegExp');
__webpack_require__(230)('RegExp');
/***/ }),
/* 629 */
@@ -5078,7 +5078,7 @@ __webpack_require__(229)('RegExp');
__webpack_require__(361);
var anObject = __webpack_require__(4)
, $flags = __webpack_require__(219)
, $flags = __webpack_require__(220)
, DESCRIPTORS = __webpack_require__(18)
, TO_STRING = 'toString'
, $toString = /./[TO_STRING];
@@ -5177,11 +5177,11 @@ $export($export.P, 'String', {
var $export = __webpack_require__(1)
, toLength = __webpack_require__(23)
, context = __webpack_require__(231)
, context = __webpack_require__(232)
, ENDS_WITH = 'endsWith'
, $endsWith = ''[ENDS_WITH];
$export($export.P + $export.F * __webpack_require__(218)(ENDS_WITH), 'String', {
$export($export.P + $export.F * __webpack_require__(219)(ENDS_WITH), 'String', {
endsWith: function endsWith(searchString /*, endPosition = @length */){
var that = context(this, searchString, ENDS_WITH)
, endPosition = arguments.length > 1 ? arguments[1] : undefined
@@ -5269,10 +5269,10 @@ $export($export.S + $export.F * (!!$fromCodePoint && $fromCodePoint.length != 1)
// 21.1.3.7 String.prototype.includes(searchString, position = 0)
var $export = __webpack_require__(1)
, context = __webpack_require__(231)
, context = __webpack_require__(232)
, INCLUDES = 'includes';
$export($export.P + $export.F * __webpack_require__(218)(INCLUDES), 'String', {
$export($export.P + $export.F * __webpack_require__(219)(INCLUDES), 'String', {
includes: function includes(searchString /*, position = 0 */){
return !!~context(this, searchString, INCLUDES)
.indexOf(searchString, arguments.length > 1 ? arguments[1] : undefined);
@@ -5361,11 +5361,11 @@ __webpack_require__(22)('small', function(createHTML){
var $export = __webpack_require__(1)
, toLength = __webpack_require__(23)
, context = __webpack_require__(231)
, context = __webpack_require__(232)
, STARTS_WITH = 'startsWith'
, $startsWith = ''[STARTS_WITH];
$export($export.P + $export.F * __webpack_require__(218)(STARTS_WITH), 'String', {
$export($export.P + $export.F * __webpack_require__(219)(STARTS_WITH), 'String', {
startsWith: function startsWith(searchString /*, position = 0 */){
var that = context(this, searchString, STARTS_WITH)
, index = toLength(Math.min(arguments.length > 1 ? arguments[1] : undefined, that.length))
@@ -5468,7 +5468,7 @@ var methods = {
};
// 23.3 WeakMap Objects
var $WeakMap = module.exports = __webpack_require__(216)('WeakMap', wrapper, methods, weak, true, true);
var $WeakMap = module.exports = __webpack_require__(217)('WeakMap', wrapper, methods, weak, true, true);
// IE11 WeakMap frozen keys fix
if(new $WeakMap().set((Object.freeze || Object)(tmp), 7).get(tmp) != 7){
+1 -1
View File
File diff suppressed because one or more lines are too long
+293 -293
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
+31
View File
@@ -7,9 +7,12 @@ import { LineData } from './line-data';
import { GraphData } from './graph-data';
import { LabelData } from './label-data';
import { Device } from './device';
@Injectable()
export class DataService {
private baseUrl: string = '/webapi/data';
private deviceUrl: string = '/webapi/device';
constructor(private http : Http){}
@@ -24,6 +27,18 @@ export class DataService {
return lineChartData$;
}
devices(): Observable<Device[]> {
let devices$ =
//<LineData>( {data: [65, 59, 80, 81, 56, 55, 40], label: 'Series A'} );
this.http
.get((`${this.deviceUrl}`)
, {headers: this.getHeaders()})
.map(mapDevice);
return devices$;
}
private getHeaders(){
let headers = new Headers();
headers.append('Accept', 'application/json');
@@ -51,3 +66,19 @@ function timeToData(r:any){
return times;
}
function mapDevice(response:Response): Device[] {
let devices = response.json().map(toDevice);
return devices;
}
function toDevice(r:any){
let device = <Device>({
sn: r.SN,
name: r.name
});
return device;
}
+9 -1
View File
@@ -1 +1,9 @@
<line-chart></line-chart>
<div>
<ul>
<li *ngFor="let device of devices">
<span class="badge"> {{device.sn}} </span> {{device.name}}
</li>
</ul>
</div>
+21 -2
View File
@@ -1,10 +1,29 @@
import { Component } from '@angular/core';
import { Component, OnInit } from '@angular/core';
import { Device } from './device';
import { DataService } from './data.service';
@Component({
selector: 'device',
templateUrl: './device.component.html'
})
export class DeviceComponent {
export class DeviceComponent implements OnInit {
public devices:Device[];
constructor(private dataService: DataService) {}
ngOnInit(): void {
this.dataService
.devices()
.subscribe(res => {
this.devices = res;
});
}
}
+4
View File
@@ -0,0 +1,4 @@
export class Device {
public sn: string;
public name: string;
}