diff --git a/package-lock.json b/package-lock.json index 7c96af6..86d7354 100644 --- a/package-lock.json +++ b/package-lock.json @@ -864,11 +864,6 @@ "resolved": "https://registry.npmjs.org/@types/canvas-gauges/-/canvas-gauges-2.1.1.tgz", "integrity": "sha512-5UCsn5DSqRW9HzwUoZkkeE5Fw4GA35Z5Wu/h33CLp5+8qcTyhzslbP6VtlVwNq05LrfPjcMYuHbZhk6zTJdAsw==" }, - "@types/fusioncharts": { - "version": "3.11.5", - "resolved": "https://registry.npmjs.org/@types/fusioncharts/-/fusioncharts-3.11.5.tgz", - "integrity": "sha512-NwWxY4PA6nROJqIgEpG8wSFi4kvNQ9ATDNiNDOHSxffjqgap6+MLhczoik/RrG25Yd/Xkl5VpHBj24ZTax9xsg==" - }, "@types/jasmine": { "version": "2.8.16", "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.8.16.tgz", @@ -1216,22 +1211,6 @@ "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", "dev": true }, - "angular-fusioncharts": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/angular-fusioncharts/-/angular-fusioncharts-3.0.1.tgz", - "integrity": "sha512-zKtVwGxNn8BsppDOJLpM+UBp56oZcAF7pZacUiz+uF+JWWZULoY3z/eB7JAJMVLiJUqlVa6LYzt0bkhUmrMCpA==", - "requires": { - "@types/fusioncharts": "^3.11.0" - } - }, - "angular-gauge": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/angular-gauge/-/angular-gauge-3.1.1.tgz", - "integrity": "sha512-OFj1pOUAhWBv4f4k/G+OOPrvvbHtQjXopg27EUVV/PlMoS94lXg7Ef3CMEvoMKEZFI9kKZUWkwE3DkQpSVJ/Vg==", - "requires": { - "svg-gauge": "1.0.4" - } - }, "ansi-colors": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz", @@ -1295,6 +1274,7 @@ "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", "dev": true, + "optional": true, "requires": { "delegates": "^1.0.0", "readable-stream": "^2.0.6" @@ -2481,7 +2461,8 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true + "dev": true, + "optional": true }, "constants-browserify": { "version": "1.0.0", @@ -2677,14 +2658,6 @@ "regexpu-core": "^1.0.0" } }, - "css-vendor": { - "version": "0.3.8", - "resolved": "https://registry.npmjs.org/css-vendor/-/css-vendor-0.3.8.tgz", - "integrity": "sha1-ZCHP0wNM5mT+dnOXL9ARn8KJQfo=", - "requires": { - "is-in-browser": "^1.0.2" - } - }, "cssauron": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz", @@ -2756,7 +2729,8 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true + "dev": true, + "optional": true }, "decode-uri-component": { "version": "0.2.0", @@ -2885,7 +2859,8 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", - "dev": true + "dev": true, + "optional": true }, "depd": { "version": "1.1.2", @@ -3909,7 +3884,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -3930,12 +3906,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -3950,17 +3928,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -4077,7 +4058,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -4089,6 +4071,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -4103,6 +4086,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -4110,12 +4094,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -4134,6 +4120,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -4214,7 +4201,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -4226,6 +4214,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -4311,7 +4300,8 @@ "safe-buffer": { "version": "5.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -4347,6 +4337,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -4366,6 +4357,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -4409,12 +4401,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, @@ -4423,6 +4417,7 @@ "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=", "dev": true, + "optional": true, "requires": { "graceful-fs": "^4.1.2", "inherits": "~2.0.0", @@ -4430,30 +4425,12 @@ "rimraf": "2" } }, - "fusioncharts": { - "version": "3.13.4", - "resolved": "https://registry.npmjs.org/fusioncharts/-/fusioncharts-3.13.4.tgz", - "integrity": "sha512-ttuiXp67aOG+/s1wM6WjrPjSmfo93Js8ykilLb7ms7z0P+s6INF9V5sfSA5IEy3NY6EHyVeYMIN1mu0WJiveZw==", - "requires": { - "core-js": "2.5.6", - "jss": "9.8.7", - "jss-preset-default": "4.5.0", - "promise-polyfill": "7.1.2", - "ramda": "0.25.0" - }, - "dependencies": { - "core-js": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.6.tgz", - "integrity": "sha512-lQUVfQi0aLix2xpyjrrJEvfuYCqPc/HwmTKsC/VNf8q0zsjX7SQZtp4+oRONN5Tsur9GDETPjj+Ub2iDiGZfSQ==" - } - } - }, "gauge": { "version": "2.7.4", "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "dev": true, + "optional": true, "requires": { "aproba": "^1.0.3", "console-control-strings": "^1.0.0", @@ -4491,7 +4468,8 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", - "dev": true + "dev": true, + "optional": true }, "get-stream": { "version": "3.0.0", @@ -4727,7 +4705,8 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", - "dev": true + "dev": true, + "optional": true }, "has-value": { "version": "1.0.0", @@ -4943,11 +4922,6 @@ "ms": "^2.0.0" } }, - "hyphenate-style-name": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.3.tgz", - "integrity": "sha512-EcuixamT82oplpoJ2XU4pDtKGWQ7b00CD9f1ug9IaQ3p1bkHMiKCZ9ut9QDI6qsa6cpUuB+A/I+zLtdNK4n2DQ==" - }, "iconv-lite": { "version": "0.4.19", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", @@ -5320,11 +5294,6 @@ "is-extglob": "^2.1.1" } }, - "is-in-browser": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/is-in-browser/-/is-in-browser-1.1.3.tgz", - "integrity": "sha1-Vv9NtoOgeMYILrldrX3GLh0E+DU=" - }, "is-number": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", @@ -5406,7 +5375,8 @@ "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", - "dev": true + "dev": true, + "optional": true }, "is-windows": { "version": "1.0.2", @@ -5720,7 +5690,8 @@ "js-tokens": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", - "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=" + "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", + "dev": true }, "js-yaml": { "version": "3.13.0", @@ -5809,101 +5780,6 @@ "verror": "1.10.0" } }, - "jss": { - "version": "9.8.7", - "resolved": "https://registry.npmjs.org/jss/-/jss-9.8.7.tgz", - "integrity": "sha512-awj3XRZYxbrmmrx9LUSj5pXSUfm12m8xzi/VKeqI1ZwWBtQ0kVPTs3vYs32t4rFw83CgFDukA8wKzOE9sMQnoQ==", - "requires": { - "is-in-browser": "^1.1.3", - "symbol-observable": "^1.1.0", - "warning": "^3.0.0" - } - }, - "jss-camel-case": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jss-camel-case/-/jss-camel-case-6.1.0.tgz", - "integrity": "sha512-HPF2Q7wmNW1t79mCqSeU2vdd/vFFGpkazwvfHMOhPlMgXrJDzdj9viA2SaHk9ZbD5pfL63a8ylp4++irYbbzMQ==", - "requires": { - "hyphenate-style-name": "^1.0.2" - } - }, - "jss-compose": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/jss-compose/-/jss-compose-5.0.0.tgz", - "integrity": "sha512-YofRYuiA0+VbeOw0VjgkyO380sA4+TWDrW52nSluD9n+1FWOlDzNbgpZ/Sb3Y46+DcAbOS21W5jo6SAqUEiuwA==", - "requires": { - "warning": "^3.0.0" - } - }, - "jss-default-unit": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/jss-default-unit/-/jss-default-unit-8.0.2.tgz", - "integrity": "sha512-WxNHrF/18CdoAGw2H0FqOEvJdREXVXLazn7PQYU7V6/BWkCV0GkmWsppNiExdw8dP4TU1ma1dT9zBNJ95feLmg==" - }, - "jss-expand": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/jss-expand/-/jss-expand-5.3.0.tgz", - "integrity": "sha512-NiM4TbDVE0ykXSAw6dfFmB1LIqXP/jdd0ZMnlvlGgEMkMt+weJIl8Ynq1DsuBY9WwkNyzWktdqcEW2VN0RAtQg==" - }, - "jss-extend": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/jss-extend/-/jss-extend-6.2.0.tgz", - "integrity": "sha512-YszrmcB6o9HOsKPszK7NeDBNNjVyiW864jfoiHoMlgMIg2qlxKw70axZHqgczXHDcoyi/0/ikP1XaHDPRvYtEA==", - "requires": { - "warning": "^3.0.0" - } - }, - "jss-global": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/jss-global/-/jss-global-3.0.0.tgz", - "integrity": "sha512-wxYn7vL+TImyQYGAfdplg7yaxnPQ9RaXY/cIA8hawaVnmmWxDHzBK32u1y+RAvWboa3lW83ya3nVZ/C+jyjZ5Q==" - }, - "jss-nested": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/jss-nested/-/jss-nested-6.0.1.tgz", - "integrity": "sha512-rn964TralHOZxoyEgeq3hXY8hyuCElnvQoVrQwKHVmu55VRDd6IqExAx9be5HgK0yN/+hQdgAXQl/GUrBbbSTA==", - "requires": { - "warning": "^3.0.0" - } - }, - "jss-preset-default": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/jss-preset-default/-/jss-preset-default-4.5.0.tgz", - "integrity": "sha512-qZbpRVtHT7hBPpZEBPFfafZKWmq3tA/An5RNqywDsZQGrlinIF/mGD9lmj6jGqu8GrED2SMHZ3pPKLmjCZoiaQ==", - "requires": { - "jss-camel-case": "^6.1.0", - "jss-compose": "^5.0.0", - "jss-default-unit": "^8.0.2", - "jss-expand": "^5.3.0", - "jss-extend": "^6.2.0", - "jss-global": "^3.0.0", - "jss-nested": "^6.0.1", - "jss-props-sort": "^6.0.0", - "jss-template": "^1.0.1", - "jss-vendor-prefixer": "^7.0.0" - } - }, - "jss-props-sort": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/jss-props-sort/-/jss-props-sort-6.0.0.tgz", - "integrity": "sha512-E89UDcrphmI0LzmvYk25Hp4aE5ZBsXqMWlkFXS0EtPkunJkRr+WXdCNYbXbksIPnKlBenGB9OxzQY+mVc70S+g==" - }, - "jss-template": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/jss-template/-/jss-template-1.0.1.tgz", - "integrity": "sha512-m5BqEWha17fmIVXm1z8xbJhY6GFJxNB9H68GVnCWPyGYfxiAgY9WTQyvDAVj+pYRgrXSOfN5V1T4+SzN1sJTeg==", - "requires": { - "warning": "^3.0.0" - } - }, - "jss-vendor-prefixer": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/jss-vendor-prefixer/-/jss-vendor-prefixer-7.0.0.tgz", - "integrity": "sha512-Agd+FKmvsI0HLcYXkvy8GYOw3AAASBUpsmIRvVQheps+JWaN892uFOInTr0DRydwaD91vSSUCU4NssschvF7MA==", - "requires": { - "css-vendor": "^0.3.8" - } - }, "jszip": { "version": "3.1.5", "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.1.5.tgz", @@ -6133,6 +6009,7 @@ "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, + "optional": true, "requires": { "graceful-fs": "^4.1.2", "parse-json": "^2.2.0", @@ -6145,7 +6022,8 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true + "dev": true, + "optional": true } } }, @@ -6254,6 +6132,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "dev": true, "requires": { "js-tokens": "^3.0.0 || ^4.0.0" } @@ -6422,7 +6301,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", - "dev": true + "dev": true, + "optional": true }, "map-visit": { "version": "1.0.0", @@ -6781,100 +6661,15 @@ "integrity": "sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==", "dev": true }, - "ng-canvas-gauges": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/ng-canvas-gauges/-/ng-canvas-gauges-6.0.0.tgz", - "integrity": "sha512-p8IVLCvOnZYED3wRAqRa0/otCimoXJ/6yHzQvufDT9lyRBsmDv1va3Ths5u5aQxrQG2wZcIB/7EwCYGGhzJB9Q==", + "ng-beautiful-gauges": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/ng-beautiful-gauges/-/ng-beautiful-gauges-6.0.4.tgz", + "integrity": "sha512-nMlz4pruuZmWg81uQJxGx2zIJWPYxHcCTW/yEhGykDVayIWLLGFJnCSzjj6ZhFEuXT4CbpnhTEHVHig5Vudx3Q==", "requires": { - "@angular/animations": "~7.2.0", - "@angular/common": "~7.2.0", - "@angular/compiler": "~7.2.0", - "@angular/core": "~7.2.0", - "@angular/forms": "~7.2.0", - "@angular/platform-browser": "~7.2.0", - "@angular/platform-browser-dynamic": "~7.2.0", - "@angular/router": "~7.2.0", "@types/canvas-gauges": "^2.1.1", "canvas-gauges": "^2.1.5", - "core-js": "^2.5.4", - "rx-dom-html": "^7.0.3", - "rxjs": "~6.3.3", - "tslib": "^1.9.0", - "zone.js": "~0.8.26" - }, - "dependencies": { - "@angular/animations": { - "version": "7.2.11", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-7.2.11.tgz", - "integrity": "sha512-YlZATC4Gnd3eOBuSW/QqsMPHeJWVKR8yfen2qKgFO3waK+6qXHXIdRF3j81l07jlUx5kBw+f1OCEeHl2QChBiw==", - "requires": { - "tslib": "^1.9.0" - } - }, - "@angular/common": { - "version": "7.2.11", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-7.2.11.tgz", - "integrity": "sha512-78T65tt3zD0Oss6pyRvzLhPlTJMhPpXMCsJdr1s821i+/xg8TUzgU3Cqxvz37r3dysnY08r6BmEqJg3+fGxEwA==", - "requires": { - "tslib": "^1.9.0" - } - }, - "@angular/compiler": { - "version": "7.2.11", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-7.2.11.tgz", - "integrity": "sha512-PptrtUgzuxLtBFxcmkkmhr16Pu9A3xqRQGmgTKL2mzwpt/fZswYEv4QT2E5Br8f94UP5XPv+K30kY+exjPnFjg==", - "requires": { - "tslib": "^1.9.0" - } - }, - "@angular/core": { - "version": "7.2.11", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-7.2.11.tgz", - "integrity": "sha512-2FUgXbGn75D6HQESVVmnrjqP1l2YNwwIZISembzpr4WvTm0lxzq/9WsuPFJNWggwCerajyjYz+kDJT3RsonGZg==", - "requires": { - "tslib": "^1.9.0" - } - }, - "@angular/forms": { - "version": "7.2.11", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-7.2.11.tgz", - "integrity": "sha512-S7qpaA4lP4yU5HsOvPuf4bpDGiqP6YjwcWHcTkm1kx9oiHGvmUoQAkFw06SMh2YCsGi413Qqys/4L0H8+8Za2A==", - "requires": { - "tslib": "^1.9.0" - } - }, - "@angular/platform-browser": { - "version": "7.2.11", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-7.2.11.tgz", - "integrity": "sha512-M/XB1TQDHx2Ni+2NR75Zc1N+UuwfAMwNcBaOxtKRLkZhpyOAneA0ZyqT2GQm6XTGxDwQhz6Q3wG6SwGTm9aLYg==", - "requires": { - "tslib": "^1.9.0" - } - }, - "@angular/platform-browser-dynamic": { - "version": "7.2.11", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.11.tgz", - "integrity": "sha512-MDwNjH0BKfYabTJtfKAy87o+pRVcHsCwlrkp8/LBGNS42vDuzWWNUepMRTf2SloDUthL9Tsibdl1LfbMhUoGpw==", - "requires": { - "tslib": "^1.9.0" - } - }, - "@angular/router": { - "version": "7.2.11", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-7.2.11.tgz", - "integrity": "sha512-6TcXQgTCPrOgkGWkxO879t+kcMovno6VfN4xfqr36IMBRxhmeWFEhLJmsVGPa/TT4XZjYQXyBk57ZXmneUqjQQ==", - "requires": { - "tslib": "^1.9.0" - } - }, - "rxjs": { - "version": "6.3.3", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz", - "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", - "requires": { - "tslib": "^1.9.0" - } - } + "rx-dom-html": "^7.0.0", + "tslib": "^1.9.0" } }, "nice-try": { @@ -7160,6 +6955,7 @@ "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "dev": true, + "optional": true, "requires": { "are-we-there-yet": "~1.1.2", "console-control-strings": "~1.1.0", @@ -7645,6 +7441,7 @@ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "dev": true, + "optional": true, "requires": { "error-ex": "^1.2.0" } @@ -7940,11 +7737,6 @@ "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=", "dev": true }, - "promise-polyfill": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-7.1.2.tgz", - "integrity": "sha512-FuEc12/eKqqoRYIGBrUptCBRhobL19PS2U31vMNTfyck1FxPyMfgsXyW4Mav85y/ZN1hop3hOwRlUDok23oYfQ==" - }, "promise-retry": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz", @@ -8188,11 +7980,6 @@ "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==", "dev": true }, - "ramda": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.25.0.tgz", - "integrity": "sha512-GXpfrYVPwx3K7RQ6aYT8KPS8XViSXUVJT1ONhoKPE9VAleW42YE+U+8VEyGWt41EnEQW7gwecYJriTI0pKoecQ==" - }, "randomatic": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz", @@ -8307,6 +8094,7 @@ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "dev": true, + "optional": true, "requires": { "load-json-file": "^1.0.0", "normalize-package-data": "^2.3.2", @@ -8318,6 +8106,7 @@ "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "dev": true, + "optional": true, "requires": { "graceful-fs": "^4.1.2", "pify": "^2.0.0", @@ -8328,7 +8117,8 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true + "dev": true, + "optional": true } } }, @@ -8337,6 +8127,7 @@ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", "dev": true, + "optional": true, "requires": { "find-up": "^1.0.0", "read-pkg": "^1.0.0" @@ -8347,6 +8138,7 @@ "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, + "optional": true, "requires": { "path-exists": "^2.0.0", "pinkie-promise": "^2.0.0" @@ -8357,6 +8149,7 @@ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, + "optional": true, "requires": { "pinkie-promise": "^2.0.0" } @@ -9612,6 +9405,7 @@ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, + "optional": true, "requires": { "is-utf8": "^0.2.0" } @@ -9701,15 +9495,11 @@ "has-flag": "^3.0.0" } }, - "svg-gauge": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/svg-gauge/-/svg-gauge-1.0.4.tgz", - "integrity": "sha1-YMsm8vYN9F2w/XVfVQ0qer++GUE=" - }, "symbol-observable": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", - "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==" + "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==", + "dev": true }, "tapable": { "version": "1.1.1", @@ -10521,14 +10311,6 @@ "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=", "dev": true }, - "warning": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz", - "integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=", - "requires": { - "loose-envify": "^1.0.0" - } - }, "watchpack": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz", @@ -11039,6 +10821,7 @@ "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "dev": true, + "optional": true, "requires": { "string-width": "^1.0.2 || 2" } diff --git a/package.json b/package.json index 9aab074..34bf3de 100644 --- a/package.json +++ b/package.json @@ -22,12 +22,9 @@ "@angular/platform-browser": "^6.1.10", "@angular/platform-browser-dynamic": "^6.1.10", "@angular/router": "^6.1.10", - "angular-fusioncharts": "^3.0.1", - "angular-gauge": "^3.1.1", "core-js": "^2.6.3", - "fusioncharts": "^3.13.4", "hammerjs": "^2.0.8", - "ng-canvas-gauges": "^6.0.0", + "ng-beautiful-gauges": "^6.0.4", "rxjs": "^6.2.2", "rxjs-compat": "^6.2.2", "zone.js": "^0.8.29" diff --git a/src/app/app.module.ts b/src/app/app.module.ts index c5e778c..bb9eb0d 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -2,9 +2,7 @@ import { BrowserModule } from '@angular/platform-browser'; import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http'; -import { GaugeModule } from 'angular-gauge'; -import { FusionChartsModule } from 'angular-fusioncharts'; -import {GaugesModule} from 'ng-canvas-gauges'; +import { GaugesModule } from 'ng-beautiful-gauges'; import { AppComponent } from './app.component'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; @@ -19,15 +17,8 @@ import { SignUpComponent } from './sign-up/sign-up.component'; import { VisualizeAllComponent } from './visualize-all/visualize-all.component'; import { HttpErrorInterceptor } from './http-error.interceptor'; -import * as FusionCharts from 'fusioncharts'; -import * as Charts from 'fusioncharts/fusioncharts.charts'; -import * as Widgets from 'fusioncharts/fusioncharts.widgets'; -import * as FusionTheme from 'fusioncharts/themes/fusioncharts.theme.fusion'; - -FusionChartsModule.fcRoot(FusionCharts, Charts, Widgets, FusionTheme) - @NgModule({ - declarations: [ + declarations: [ AppComponent, HeaderComponent, StatisticsComponent, @@ -43,7 +34,6 @@ FusionChartsModule.fcRoot(FusionCharts, Charts, Widgets, FusionTheme) BrowserModule, BrowserAnimationsModule, HttpClientModule, - FusionChartsModule, GaugesModule, RouterModule.forRoot([ @@ -57,7 +47,6 @@ FusionChartsModule.fcRoot(FusionCharts, Charts, Widgets, FusionTheme) {path: 'visualize-all', component: VisualizeAllComponent}, ]), - GaugeModule.forRoot(), ], providers: [ diff --git a/src/app/statistics/statistics.component.html b/src/app/statistics/statistics.component.html index d23e00d..9dfa946 100644 --- a/src/app/statistics/statistics.component.html +++ b/src/app/statistics/statistics.component.html @@ -21,16 +21,18 @@
-
- - - -
-

- Year Average: {{fuelTempYearAvg}} -

+
-
+
+ +
+
+ +
+
+ +
+
@@ -106,4 +108,4 @@
-
--> \ No newline at end of file +
--> diff --git a/src/app/statistics/statistics.component.ts b/src/app/statistics/statistics.component.ts index 6e2ae53..b1eb7b8 100644 --- a/src/app/statistics/statistics.component.ts +++ b/src/app/statistics/statistics.component.ts @@ -1,6 +1,6 @@ -import { Component, OnInit } from '@angular/core'; -import { MetricsService } from '../services/metrics.service'; -import { HttpClient, HttpHeaders } from '@angular/common/http'; +import {Component, OnInit} from '@angular/core'; +import {MetricsService} from '../services/metrics.service'; +import {HttpClient, HttpHeaders} from '@angular/common/http'; @Component({ @@ -10,15 +10,15 @@ import { HttpClient, HttpHeaders } from '@angular/common/http'; }) export class StatisticsComponent implements OnInit { - fuelTempGraphData: any; - fuelTemp1: any; + fuelTempGraphData: any; + fuelTemp1: any; - oilTempGraphData: any; - oilTemp1: any; + oilTempGraphData: any; + oilTemp1: any; + + constructor(public data: MetricsService, private http: HttpClient) { - constructor(public data: MetricsService, private http: HttpClient) { - const jsonToken = localStorage.getItem('auth_token'); try { this.data.getRecentMetrics(jsonToken).subscribe((data) => { @@ -27,7 +27,7 @@ export class StatisticsComponent implements OnInit { this.fuelTemp1 = Math.round(this.metric.outputs[0].dps[0][1]); console.log(this.fuelTemp1); - this.oilTemp1 = this.metric.outputs[1].dps[0][1]; + this.oilTemp1 = this.metric.outputs[1].dps[0][1]; }); } catch (err) { @@ -35,11 +35,6 @@ export class StatisticsComponent implements OnInit { } - - - - - /* //console.log(this.fuelTemp1); @@ -77,7 +72,7 @@ export class StatisticsComponent implements OnInit { }; */ - + } @@ -94,145 +89,141 @@ export class StatisticsComponent implements OnInit { public isMonth: boolean = false; public isYear: boolean = false; - viewRecent() - { + viewRecent() { + + this.isRecent = true; + this.isHour = false; + this.isDay = false; + this.isWeek = false; + this.isMonth = false; + this.isYear = false; - this.isRecent = true; - this.isHour = false; - this.isDay = false; - this.isWeek = false; - this.isMonth = false; - this.isYear = false; - } - viewHour() - { - - this.isRecent = false; - this.isHour = true; - this.isDay = false; - this.isWeek = false; - this.isMonth = false; - this.isYear = false; - + + viewHour() { + + this.isRecent = false; + this.isHour = true; + this.isDay = false; + this.isWeek = false; + this.isMonth = false; + this.isYear = false; + } - viewDay() - { - - this.isRecent = false; - this.isHour = false; - this.isDay = true; - this.isWeek = false; - this.isMonth = false; - this.isYear = false; - + + viewDay() { + + this.isRecent = false; + this.isHour = false; + this.isDay = true; + this.isWeek = false; + this.isMonth = false; + this.isYear = false; + } - viewWeek() - { - - this.isRecent = false; - this.isHour = false; - this.isDay = false; - this.isWeek = true; - this.isMonth = false; - this.isYear = false; - + + viewWeek() { + + this.isRecent = false; + this.isHour = false; + this.isDay = false; + this.isWeek = true; + this.isMonth = false; + this.isYear = false; + } - viewMonth() - { - - this.isRecent = false; - this.isHour = false; - this.isDay = false; - this.isWeek = false; - this.isMonth = true; - this.isYear = false; - + + viewMonth() { + + this.isRecent = false; + this.isHour = false; + this.isDay = false; + this.isWeek = false; + this.isMonth = true; + this.isYear = false; + } - viewYear() - { - - this.isRecent = false; - this.isHour = false; - this.isDay = false; - this.isWeek = false; - this.isMonth = false; - this.isYear = true; - + + viewYear() { + + this.isRecent = false; + this.isHour = false; + this.isDay = false; + this.isWeek = false; + this.isMonth = false; + this.isYear = true; + } - setDial(dialValue, metricName) - { - console.log(dialValue); - var returnVal = { + setDial(dialValue, metricName) { + console.log(dialValue); + + var returnVal = { + + 'chart': { + 'caption': metricName, + 'lowerLimit': '0', + 'upperLimit': '200', + 'showValue': '1', + 'theme': 'fusion', + 'showToolTip': '0' + }, + 'colorRange': { + 'color': [{ + 'minValue': '0', + 'maxValue': '50', + 'code': '#F2726F' + }, { + 'minValue': '50', + 'maxValue': '75', + 'code': '#FFC533' + }, { + 'minValue': '75', + 'maxValue': '200', + 'code': '#62B58F' + }] + }, + 'dials': { + 'dial': [{ + 'value': dialValue + }] + } - "chart": { - "caption": metricName, - "lowerLimit": "0", - "upperLimit": "200", - "showValue": "1", - "theme": "fusion", - "showToolTip": "0" - }, - "colorRange": { - "color": [{ - "minValue": "0", - "maxValue": "50", - "code": "#F2726F" - }, { - "minValue": "50", - "maxValue": "75", - "code": "#FFC533" - }, { - "minValue": "75", - "maxValue": "200", - "code": "#62B58F" - }] - }, - "dials": { - "dial": [{ - "value": dialValue - }] - } - - }; - return returnVal; + }; + return returnVal; } - ngOnInit() - { + ngOnInit() { - const jsonToken = localStorage.getItem('auth_token'); + const jsonToken = localStorage.getItem('auth_token'); try { this.data.getRecentMetrics(jsonToken).subscribe((data) => { //console.log(data.outputs[1].dps[0][1]); this.metric = data; this.fuelTemp = Math.round(this.metric.outputs[0].dps[0][1]); - this.oilTemp = this.metric.outputs[1].dps[0][1]; + this.oilTemp = this.metric.outputs[1].dps[0][1]; - this.fuelTempGraphData = this.setDial(this.fuelTemp, "Fuel Temperature"); - this.oilTempGraphData = this.setDial(this.oilTemp, "Oil Temperature"); + this.fuelTempGraphData = this.setDial(this.fuelTemp, 'Fuel Temperature'); + this.oilTempGraphData = this.setDial(this.oilTemp, 'Oil Temperature'); }); } catch (err) { return err; } - try{ + try { - this.data.getYearMetrics(jsonToken).subscribe((data) => { + this.data.getYearMetrics(jsonToken).subscribe((data) => { - this.metricYearAvg = data; + this.metricYearAvg = data; - this.fuelTempYearAvg = this.metricYearAvg.outputs[0].dps[0][1]; + this.fuelTempYearAvg = this.metricYearAvg.outputs[0].dps[0][1]; - }); - } - catch(err) - { - return err; + }); + } catch (err) { + return err; }