From d2456134e92b013e897749cb6a779fe5d0c63453 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Tue, 22 Feb 2022 17:53:38 +0800 Subject: [PATCH] fixed TypeError cased by undefined decimal value in Web UI --- web/package-lock.json | 521 +++++++++++------- .../CombinedEquipmentBatch.js | 2 +- .../CombinedEquipmentCost.js | 8 +- .../CombinedEquipmentEfficiency.js | 6 +- .../CombinedEquipmentEnergyCategory.js | 4 +- .../CombinedEquipmentEnergyItem.js | 8 +- .../CombinedEquipmentIncome.js | 8 +- .../CombinedEquipmentLoad.js | 8 +- .../CombinedEquipmentOutput.js | 4 +- .../CombinedEquipmentSaving.js | 4 +- .../CombinedEquipmentStatistics.js | 4 +- .../MyEMS/Equipment/EquipmentBatch.js | 2 +- .../MyEMS/Equipment/EquipmentCost.js | 4 +- .../MyEMS/Equipment/EquipmentEfficiency.js | 6 +- .../Equipment/EquipmentEnergyCategory.js | 2 +- .../MyEMS/Equipment/EquipmentEnergyItem.js | 2 +- .../MyEMS/Equipment/EquipmentIncome.js | 4 +- .../MyEMS/Equipment/EquipmentLoad.js | 4 +- .../MyEMS/Equipment/EquipmentOutput.js | 2 +- .../MyEMS/Equipment/EquipmentSaving.js | 2 +- .../MyEMS/Equipment/EquipmentStatistics.js | 2 +- web/src/components/MyEMS/Meter/MeterBatch.js | 4 +- web/src/components/MyEMS/Meter/MeterCarbon.js | 2 +- web/src/components/MyEMS/Meter/MeterCost.js | 2 +- web/src/components/MyEMS/Meter/MeterEnergy.js | 2 +- .../MyEMS/Meter/MeterSubmetersBalance.js | 2 +- .../MyEMS/Meter/OfflineMeterCost.js | 2 +- .../MyEMS/Meter/OfflineMeterEnergy.js | 2 +- .../MyEMS/Meter/VirtualMeterCarbon.js | 2 +- .../MyEMS/Meter/VirtualMeterCost.js | 2 +- .../MyEMS/Meter/VirtualMeterEnergy.js | 2 +- .../MyEMS/Shopfloor/ShopfloorBatch.js | 2 +- .../MyEMS/Shopfloor/ShopfloorCost.js | 4 +- .../Shopfloor/ShopfloorEnergyCategory.js | 2 +- .../MyEMS/Shopfloor/ShopfloorEnergyItem.js | 2 +- .../MyEMS/Shopfloor/ShopfloorLoad.js | 4 +- .../MyEMS/Shopfloor/ShopfloorSaving.js | 2 +- .../MyEMS/Shopfloor/ShopfloorStatistics.js | 2 +- web/src/components/MyEMS/Space/SpaceCost.js | 8 +- .../components/MyEMS/Space/SpaceEfficiency.js | 2 +- .../MyEMS/Space/SpaceEnergyCategory.js | 4 +- .../components/MyEMS/Space/SpaceEnergyItem.js | 4 +- web/src/components/MyEMS/Space/SpaceIncome.js | 8 +- web/src/components/MyEMS/Space/SpaceLoad.js | 4 +- web/src/components/MyEMS/Space/SpaceOutput.js | 4 +- web/src/components/MyEMS/Space/SpaceSaving.js | 4 +- .../components/MyEMS/Space/SpaceStatistics.js | 2 +- web/src/components/MyEMS/Store/StoreBatch.js | 2 +- web/src/components/MyEMS/Store/StoreCost.js | 4 +- .../MyEMS/Store/StoreEnergyCategory.js | 2 +- .../components/MyEMS/Store/StoreEnergyItem.js | 2 +- web/src/components/MyEMS/Store/StoreLoad.js | 4 +- web/src/components/MyEMS/Store/StoreSaving.js | 2 +- .../components/MyEMS/Store/StoreStatistics.js | 2 +- .../components/MyEMS/Tenant/TenantBatch.js | 4 +- web/src/components/MyEMS/Tenant/TenantCost.js | 4 +- .../MyEMS/Tenant/TenantEnergyCategory.js | 2 +- .../MyEMS/Tenant/TenantEnergyItem.js | 2 +- web/src/components/MyEMS/Tenant/TenantLoad.js | 4 +- .../components/MyEMS/Tenant/TenantSaving.js | 2 +- .../MyEMS/Tenant/TenantStatistics.js | 2 +- .../components/MyEMS/dashboard/Dashboard.js | 4 +- 62 files changed, 429 insertions(+), 300 deletions(-) diff --git a/web/package-lock.json b/web/package-lock.json index d9177789..d822bb8b 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -303,9 +303,9 @@ } }, "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.17.1", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.1.tgz", - "integrity": "sha512-JBdSr/LtyYIno/pNnJ75lBcqc3Z1XXujzPanHqjvvrhOA+DTceTFuJi8XjmWTZh4r3fsdfqaCMN0iZemdkxZHQ==", + "version": "7.17.6", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz", + "integrity": "sha512-SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg==", "dependencies": { "@babel/helper-annotate-as-pure": "^7.16.7", "@babel/helper-environment-visitor": "^7.16.7", @@ -523,9 +523,9 @@ } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz", - "integrity": "sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==", + "version": "7.17.6", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.6.tgz", + "integrity": "sha512-2ULmRdqoOMpdvkbT8jONrZML/XALfzxlb052bldftkicAUy8AxSCkD5trDPQcwHNmolcl7wP6ehNqMlyUw6AaA==", "dependencies": { "@babel/helper-environment-visitor": "^7.16.7", "@babel/helper-module-imports": "^7.16.7", @@ -533,8 +533,8 @@ "@babel/helper-split-export-declaration": "^7.16.7", "@babel/helper-validator-identifier": "^7.16.7", "@babel/template": "^7.16.7", - "@babel/traverse": "^7.16.7", - "@babel/types": "^7.16.7" + "@babel/traverse": "^7.17.3", + "@babel/types": "^7.17.0" }, "engines": { "node": ">=6.9.0" @@ -792,11 +792,11 @@ } }, "node_modules/@babel/plugin-proposal-class-static-block": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.7.tgz", - "integrity": "sha512-dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw==", + "version": "7.17.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz", + "integrity": "sha512-X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA==", "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.16.7", + "@babel/helper-create-class-features-plugin": "^7.17.6", "@babel/helper-plugin-utils": "^7.16.7", "@babel/plugin-syntax-class-static-block": "^7.14.5" }, @@ -1614,9 +1614,9 @@ } }, "node_modules/@babel/plugin-transform-react-constant-elements": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.16.7.tgz", - "integrity": "sha512-lF+cfsyTgwWkcw715J88JhMYJ5GpysYNLhLP1PkvkhTRN7B3e74R/1KsDxFxhRpSn0UUD3IWM4GvdBR2PEbbQQ==", + "version": "7.17.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.17.6.tgz", + "integrity": "sha512-OBv9VkyyKtsHZiHLoSfCn+h6yU7YKX8nrs32xUmOa1SRSk+t03FosB6fBZ0Yz4BpD1WV7l73Nsad+2Tz7APpqw==", "dependencies": { "@babel/helper-plugin-utils": "^7.16.7" }, @@ -4292,9 +4292,9 @@ "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==" }, "node_modules/@types/node": { - "version": "17.0.18", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.18.tgz", - "integrity": "sha512-eKj4f/BsN/qcculZiRSujogjvp5O/k4lOW5m35NopjZM/QwLOR075a8pJW5hD+Rtdm2DaCVPENS6KtSQnUD6BA==" + "version": "17.0.19", + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.19.tgz", + "integrity": "sha512-PfeQhvcMR4cPFVuYfBN4ifG7p9c+Dlh3yUZR6k+5yQK7wX3gDgVxBly4/WkBRs9x4dmcy1TVl08SY67wwtEvmA==" }, "node_modules/@types/normalize-package-data": { "version": "2.4.1", @@ -4428,9 +4428,9 @@ "integrity": "sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg==" }, "node_modules/@types/ws": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.2.2.tgz", - "integrity": "sha512-NOn5eIcgWLOo6qW8AcuLZ7G8PycXu0xTxxkS6Q18VWFxgPUSOwV0pBj2a/4viNZVu25i7RIB7GttdkAIUUXOOg==", + "version": "8.2.3", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.2.3.tgz", + "integrity": "sha512-ahRJZquUYCdOZf/rCsWg88S0/+cb9wazUBHv6HZEe3XdYaBe2zr/slM8J28X07Hn88Pnm4ezo7N8/ofnOgrPVQ==", "dependencies": { "@types/node": "*" } @@ -4449,13 +4449,13 @@ "integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.12.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.12.0.tgz", - "integrity": "sha512-fwCMkDimwHVeIOKeBHiZhRUfJXU8n6xW1FL9diDxAyGAFvKcH4csy0v7twivOQdQdA0KC8TDr7GGRd3L4Lv0rQ==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.12.1.tgz", + "integrity": "sha512-M499lqa8rnNK7mUv74lSFFttuUsubIRdAbHcVaP93oFcKkEmHmLqy2n7jM9C8DVmFMYK61ExrZU6dLYhQZmUpw==", "dependencies": { - "@typescript-eslint/scope-manager": "5.12.0", - "@typescript-eslint/type-utils": "5.12.0", - "@typescript-eslint/utils": "5.12.0", + "@typescript-eslint/scope-manager": "5.12.1", + "@typescript-eslint/type-utils": "5.12.1", + "@typescript-eslint/utils": "5.12.1", "debug": "^4.3.2", "functional-red-black-tree": "^1.0.1", "ignore": "^5.1.8", @@ -4516,11 +4516,11 @@ } }, "node_modules/@typescript-eslint/experimental-utils": { - "version": "5.12.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.12.0.tgz", - "integrity": "sha512-iFVADWH2CmiDF+E9kFK2r474BO2JILDKw1NVD5ytqHrM3ezsfdu5uo6B+77DH0suM7iUC/yOayHNziuiI9BPbQ==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.12.1.tgz", + "integrity": "sha512-4bEa8WrS5DdzJq43smPH12ys4AOoCxVu2xjYGXQR4DnNyM8pqNzCr28zodf38Jc4bxWdniSEKKC1bQaccXGq5Q==", "dependencies": { - "@typescript-eslint/utils": "5.12.0" + "@typescript-eslint/utils": "5.12.1" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -4534,13 +4534,13 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "5.12.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.12.0.tgz", - "integrity": "sha512-MfSwg9JMBojMUoGjUmX+D2stoQj1CBYTCP0qnnVtu9A+YQXVKNtLjasYh+jozOcrb/wau8TCfWOkQTiOAruBog==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.12.1.tgz", + "integrity": "sha512-6LuVUbe7oSdHxUWoX/m40Ni8gsZMKCi31rlawBHt7VtW15iHzjbpj2WLiToG2758KjtCCiLRKZqfrOdl3cNKuw==", "dependencies": { - "@typescript-eslint/scope-manager": "5.12.0", - "@typescript-eslint/types": "5.12.0", - "@typescript-eslint/typescript-estree": "5.12.0", + "@typescript-eslint/scope-manager": "5.12.1", + "@typescript-eslint/types": "5.12.1", + "@typescript-eslint/typescript-estree": "5.12.1", "debug": "^4.3.2" }, "engines": { @@ -4581,12 +4581,12 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "node_modules/@typescript-eslint/scope-manager": { - "version": "5.12.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.12.0.tgz", - "integrity": "sha512-GAMobtIJI8FGf1sLlUWNUm2IOkIjvn7laFWyRx7CLrv6nLBI7su+B7lbStqVlK5NdLvHRFiJo2HhiDF7Ki01WQ==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.12.1.tgz", + "integrity": "sha512-J0Wrh5xS6XNkd4TkOosxdpObzlYfXjAFIm9QxYLCPOcHVv1FyyFCPom66uIh8uBr0sZCrtS+n19tzufhwab8ZQ==", "dependencies": { - "@typescript-eslint/types": "5.12.0", - "@typescript-eslint/visitor-keys": "5.12.0" + "@typescript-eslint/types": "5.12.1", + "@typescript-eslint/visitor-keys": "5.12.1" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -4597,11 +4597,11 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "5.12.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.12.0.tgz", - "integrity": "sha512-9j9rli3zEBV+ae7rlbBOotJcI6zfc6SHFMdKI9M3Nc0sy458LJ79Os+TPWeBBL96J9/e36rdJOfCuyRSgFAA0Q==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.12.1.tgz", + "integrity": "sha512-Gh8feEhsNLeCz6aYqynh61Vsdy+tiNNkQtc+bN3IvQvRqHkXGUhYkUi+ePKzP0Mb42se7FDb+y2SypTbpbR/Sg==", "dependencies": { - "@typescript-eslint/utils": "5.12.0", + "@typescript-eslint/utils": "5.12.1", "debug": "^4.3.2", "tsutils": "^3.21.0" }, @@ -4643,9 +4643,9 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "node_modules/@typescript-eslint/types": { - "version": "5.12.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.12.0.tgz", - "integrity": "sha512-JowqbwPf93nvf8fZn5XrPGFBdIK8+yx5UEGs2QFAYFI8IWYfrzz+6zqlurGr2ctShMaJxqwsqmra3WXWjH1nRQ==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.12.1.tgz", + "integrity": "sha512-hfcbq4qVOHV1YRdhkDldhV9NpmmAu2vp6wuFODL71Y0Ixak+FLeEU4rnPxgmZMnGreGEghlEucs9UZn5KOfHJA==", "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, @@ -4655,12 +4655,12 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.12.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.12.0.tgz", - "integrity": "sha512-Dd9gVeOqt38QHR0BEA8oRaT65WYqPYbIc5tRFQPkfLquVEFPD1HAtbZT98TLBkEcCkvwDYOAvuSvAD9DnQhMfQ==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.12.1.tgz", + "integrity": "sha512-ahOdkIY9Mgbza7L9sIi205Pe1inCkZWAHE1TV1bpxlU4RZNPtXaDZfiiFWcL9jdxvW1hDYZJXrFm+vlMkXRbBw==", "dependencies": { - "@typescript-eslint/types": "5.12.0", - "@typescript-eslint/visitor-keys": "5.12.0", + "@typescript-eslint/types": "5.12.1", + "@typescript-eslint/visitor-keys": "5.12.1", "debug": "^4.3.2", "globby": "^11.0.4", "is-glob": "^4.0.3", @@ -4716,14 +4716,14 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "5.12.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.12.0.tgz", - "integrity": "sha512-k4J2WovnMPGI4PzKgDtQdNrCnmBHpMUFy21qjX2CoPdoBcSBIMvVBr9P2YDP8jOqZOeK3ThOL6VO/sy6jtnvzw==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.12.1.tgz", + "integrity": "sha512-Qq9FIuU0EVEsi8fS6pG+uurbhNTtoYr4fq8tKjBupsK5Bgbk2I32UGm0Sh+WOyjOPgo/5URbxxSNV6HYsxV4MQ==", "dependencies": { "@types/json-schema": "^7.0.9", - "@typescript-eslint/scope-manager": "5.12.0", - "@typescript-eslint/types": "5.12.0", - "@typescript-eslint/typescript-estree": "5.12.0", + "@typescript-eslint/scope-manager": "5.12.1", + "@typescript-eslint/types": "5.12.1", + "@typescript-eslint/typescript-estree": "5.12.1", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0" }, @@ -4759,11 +4759,11 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.12.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.12.0.tgz", - "integrity": "sha512-cFwTlgnMV6TgezQynx2c/4/tx9Tufbuo9LPzmWqyRC3QC4qTGkAG1C6pBr0/4I10PAI/FlYunI3vJjIcu+ZHMg==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.12.1.tgz", + "integrity": "sha512-l1KSLfupuwrXx6wc0AuOmC7Ko5g14ZOQ86wJJqRbdLbXLK02pK/DPiDDqCc7BqqiiA04/eAA6ayL0bgOrAkH7A==", "dependencies": { - "@typescript-eslint/types": "5.12.0", + "@typescript-eslint/types": "5.12.1", "eslint-visitor-keys": "^3.0.0" }, "engines": { @@ -5073,9 +5073,9 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "node_modules/agentkeepalive": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.0.tgz", - "integrity": "sha512-0PhAp58jZNw13UJv7NVdTGb0ZcghHUb3DrZ046JiiJY/BOaTTpbwdHq2VObPCBV8M2GPh7sgrJ3AQ8Ey468LJw==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.1.tgz", + "integrity": "sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==", "dependencies": { "debug": "^4.1.0", "depd": "^1.1.2", @@ -6426,6 +6426,21 @@ "node": ">= 0.8" } }, + "node_modules/body-parser/node_modules/http-errors": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz", + "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==", + "dependencies": { + "depd": "~1.1.2", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.1" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/body-parser/node_modules/iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -6448,6 +6463,28 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/body-parser/node_modules/raw-body": { + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz", + "integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==", + "dependencies": { + "bytes": "3.1.2", + "http-errors": "1.8.1", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/body-parser/node_modules/statuses": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", + "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/bonjour": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz", @@ -7935,9 +7972,9 @@ } }, "node_modules/cssdb": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-6.3.1.tgz", - "integrity": "sha512-Ho3gIkGY4O8S3J54fHu7RP5GHWz85McDhimaXEwf7qV0MSPhLM0jdd61zqs1kkadIVDAvfqoku0kArbWaMYolw==" + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-6.4.0.tgz", + "integrity": "sha512-8NMWrur/ewSNrRNZndbtOTXc2Xb2b+NCTPHj8VErFYvJUlgsMAiBGaFaxG6hjy9zbCjj2ZLwSQrMM+tormO8qA==" }, "node_modules/cssesc": { "version": "3.0.0", @@ -9319,9 +9356,9 @@ } }, "node_modules/eslint-config-prettier": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz", - "integrity": "sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==", + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.4.0.tgz", + "integrity": "sha512-CFotdUcMY18nGRo5KGsnNxpznzhkopOcOo0InID+sgQssPrzjvsyKZPvOgymTFeHrFuC3Tzdf2YndhXtULK9Iw==", "dev": true, "bin": { "eslint-config-prettier": "bin/cli.js" @@ -10251,6 +10288,21 @@ "node": ">= 0.8" } }, + "node_modules/express/node_modules/http-errors": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz", + "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==", + "dependencies": { + "depd": "~1.1.2", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.1" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/express/node_modules/mime": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", @@ -12845,26 +12897,37 @@ "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=" }, "node_modules/http-errors": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz", - "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", + "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", + "dev": true, "dependencies": { - "depd": "~1.1.2", + "depd": "2.0.0", "inherits": "2.0.4", "setprototypeof": "1.2.0", - "statuses": ">= 1.5.0 < 2", + "statuses": "2.0.1", "toidentifier": "1.0.1" }, "engines": { - "node": ">= 0.6" + "node": ">= 0.8" + } + }, + "node_modules/http-errors/node_modules/depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "dev": true, + "engines": { + "node": ">= 0.8" } }, "node_modules/http-errors/node_modules/statuses": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "dev": true, "engines": { - "node": ">= 0.6" + "node": ">= 0.8" } }, "node_modules/http-parser-js": { @@ -19865,12 +19928,13 @@ "integrity": "sha512-sln+pNSc8NGaHoLzwNBssFSf/rSYkqeBXzX1AtJlkJiUaVSJSbRAWJk+4omsXkN+EJalzkZhWQ3th1m0FpR5xA==" }, "node_modules/raw-body": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz", - "integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.0.tgz", + "integrity": "sha512-XpyZ6O7PVu3ItMQl0LslfsRoKxMOxi3SzDkrOtxMES5AqLFpYjQCryxI4LGygUN2jL+RgFsPkMPPlG7cg/47+A==", + "dev": true, "dependencies": { "bytes": "3.1.2", - "http-errors": "1.8.1", + "http-errors": "2.0.0", "iconv-lite": "0.4.24", "unpipe": "1.0.0" }, @@ -19882,6 +19946,7 @@ "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, "dependencies": { "safer-buffer": ">= 2.1.2 < 3" }, @@ -20297,9 +20362,9 @@ } }, "node_modules/react-i18next": { - "version": "11.15.4", - "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.15.4.tgz", - "integrity": "sha512-jKJNAcVcbPGK+yrTcXhLblgPY16n6NbpZZL3Mk8nswj1v3ayIiUBVDU09SgqnT+DluyQBS97hwSvPU5yVFG0yg==", + "version": "11.15.5", + "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.15.5.tgz", + "integrity": "sha512-vBWuVEQgrhZrGKpyv8FmJ7Zs5jRQWl794Tte7yzJ0okZqqi3jd6j2pLYNg441WcREsbIOvWdiDXbY7W6E93p1A==", "dependencies": { "@babel/runtime": "^7.14.5", "html-escaper": "^2.0.2", @@ -21713,9 +21778,9 @@ } }, "node_modules/rollup": { - "version": "2.67.3", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.67.3.tgz", - "integrity": "sha512-G/x1vUwbGtP6O5ZM8/sWr8+p7YfZhI18pPqMRtMYMWSbHjKZ/ajHGiM+GWNTlWyOR0EHIdT8LHU+Z4ciIZ1oBw==", + "version": "2.68.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.68.0.tgz", + "integrity": "sha512-XrMKOYK7oQcTio4wyTz466mucnd8LzkiZLozZ4Rz0zQD+HeX4nUK4B8GrTX/2EvN2/vBF/i2WnaXboPxo0JylA==", "bin": { "rollup": "dist/bin/rollup" }, @@ -24017,10 +24082,11 @@ } }, "node_modules/terser": { - "version": "5.10.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz", - "integrity": "sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==", + "version": "5.11.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.11.0.tgz", + "integrity": "sha512-uCA9DLanzzWSsN1UirKwylhhRz3aKPInlfmpGfw8VN6jHsAtu8HJtIpeeHHK23rxnE/cDc+yvmq5wqkIC6Kn0A==", "dependencies": { + "acorn": "^8.5.0", "commander": "^2.20.0", "source-map": "~0.7.2", "source-map-support": "~0.5.20" @@ -24030,14 +24096,6 @@ }, "engines": { "node": ">=10" - }, - "peerDependencies": { - "acorn": "^8.5.0" - }, - "peerDependenciesMeta": { - "acorn": { - "optional": true - } } }, "node_modules/terser-webpack-plugin": { @@ -24073,6 +24131,17 @@ } } }, + "node_modules/terser/node_modules/acorn": { + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz", + "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/terser/node_modules/commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", @@ -26440,9 +26509,9 @@ } }, "@babel/helper-create-class-features-plugin": { - "version": "7.17.1", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.1.tgz", - "integrity": "sha512-JBdSr/LtyYIno/pNnJ75lBcqc3Z1XXujzPanHqjvvrhOA+DTceTFuJi8XjmWTZh4r3fsdfqaCMN0iZemdkxZHQ==", + "version": "7.17.6", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz", + "integrity": "sha512-SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg==", "requires": { "@babel/helper-annotate-as-pure": "^7.16.7", "@babel/helper-environment-visitor": "^7.16.7", @@ -26602,9 +26671,9 @@ } }, "@babel/helper-module-transforms": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz", - "integrity": "sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==", + "version": "7.17.6", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.6.tgz", + "integrity": "sha512-2ULmRdqoOMpdvkbT8jONrZML/XALfzxlb052bldftkicAUy8AxSCkD5trDPQcwHNmolcl7wP6ehNqMlyUw6AaA==", "requires": { "@babel/helper-environment-visitor": "^7.16.7", "@babel/helper-module-imports": "^7.16.7", @@ -26612,8 +26681,8 @@ "@babel/helper-split-export-declaration": "^7.16.7", "@babel/helper-validator-identifier": "^7.16.7", "@babel/template": "^7.16.7", - "@babel/traverse": "^7.16.7", - "@babel/types": "^7.16.7" + "@babel/traverse": "^7.17.3", + "@babel/types": "^7.17.0" } }, "@babel/helper-optimise-call-expression": { @@ -26792,11 +26861,11 @@ } }, "@babel/plugin-proposal-class-static-block": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.7.tgz", - "integrity": "sha512-dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw==", + "version": "7.17.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz", + "integrity": "sha512-X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA==", "requires": { - "@babel/helper-create-class-features-plugin": "^7.16.7", + "@babel/helper-create-class-features-plugin": "^7.17.6", "@babel/helper-plugin-utils": "^7.16.7", "@babel/plugin-syntax-class-static-block": "^7.14.5" } @@ -27305,9 +27374,9 @@ } }, "@babel/plugin-transform-react-constant-elements": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.16.7.tgz", - "integrity": "sha512-lF+cfsyTgwWkcw715J88JhMYJ5GpysYNLhLP1PkvkhTRN7B3e74R/1KsDxFxhRpSn0UUD3IWM4GvdBR2PEbbQQ==", + "version": "7.17.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.17.6.tgz", + "integrity": "sha512-OBv9VkyyKtsHZiHLoSfCn+h6yU7YKX8nrs32xUmOa1SRSk+t03FosB6fBZ0Yz4BpD1WV7l73Nsad+2Tz7APpqw==", "requires": { "@babel/helper-plugin-utils": "^7.16.7" } @@ -29312,9 +29381,9 @@ "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==" }, "@types/node": { - "version": "17.0.18", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.18.tgz", - "integrity": "sha512-eKj4f/BsN/qcculZiRSujogjvp5O/k4lOW5m35NopjZM/QwLOR075a8pJW5hD+Rtdm2DaCVPENS6KtSQnUD6BA==" + "version": "17.0.19", + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.19.tgz", + "integrity": "sha512-PfeQhvcMR4cPFVuYfBN4ifG7p9c+Dlh3yUZR6k+5yQK7wX3gDgVxBly4/WkBRs9x4dmcy1TVl08SY67wwtEvmA==" }, "@types/normalize-package-data": { "version": "2.4.1", @@ -29448,9 +29517,9 @@ "integrity": "sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg==" }, "@types/ws": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.2.2.tgz", - "integrity": "sha512-NOn5eIcgWLOo6qW8AcuLZ7G8PycXu0xTxxkS6Q18VWFxgPUSOwV0pBj2a/4viNZVu25i7RIB7GttdkAIUUXOOg==", + "version": "8.2.3", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.2.3.tgz", + "integrity": "sha512-ahRJZquUYCdOZf/rCsWg88S0/+cb9wazUBHv6HZEe3XdYaBe2zr/slM8J28X07Hn88Pnm4ezo7N8/ofnOgrPVQ==", "requires": { "@types/node": "*" } @@ -29469,13 +29538,13 @@ "integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==" }, "@typescript-eslint/eslint-plugin": { - "version": "5.12.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.12.0.tgz", - "integrity": "sha512-fwCMkDimwHVeIOKeBHiZhRUfJXU8n6xW1FL9diDxAyGAFvKcH4csy0v7twivOQdQdA0KC8TDr7GGRd3L4Lv0rQ==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.12.1.tgz", + "integrity": "sha512-M499lqa8rnNK7mUv74lSFFttuUsubIRdAbHcVaP93oFcKkEmHmLqy2n7jM9C8DVmFMYK61ExrZU6dLYhQZmUpw==", "requires": { - "@typescript-eslint/scope-manager": "5.12.0", - "@typescript-eslint/type-utils": "5.12.0", - "@typescript-eslint/utils": "5.12.0", + "@typescript-eslint/scope-manager": "5.12.1", + "@typescript-eslint/type-utils": "5.12.1", + "@typescript-eslint/utils": "5.12.1", "debug": "^4.3.2", "functional-red-black-tree": "^1.0.1", "ignore": "^5.1.8", @@ -29508,21 +29577,21 @@ } }, "@typescript-eslint/experimental-utils": { - "version": "5.12.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.12.0.tgz", - "integrity": "sha512-iFVADWH2CmiDF+E9kFK2r474BO2JILDKw1NVD5ytqHrM3ezsfdu5uo6B+77DH0suM7iUC/yOayHNziuiI9BPbQ==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.12.1.tgz", + "integrity": "sha512-4bEa8WrS5DdzJq43smPH12ys4AOoCxVu2xjYGXQR4DnNyM8pqNzCr28zodf38Jc4bxWdniSEKKC1bQaccXGq5Q==", "requires": { - "@typescript-eslint/utils": "5.12.0" + "@typescript-eslint/utils": "5.12.1" } }, "@typescript-eslint/parser": { - "version": "5.12.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.12.0.tgz", - "integrity": "sha512-MfSwg9JMBojMUoGjUmX+D2stoQj1CBYTCP0qnnVtu9A+YQXVKNtLjasYh+jozOcrb/wau8TCfWOkQTiOAruBog==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.12.1.tgz", + "integrity": "sha512-6LuVUbe7oSdHxUWoX/m40Ni8gsZMKCi31rlawBHt7VtW15iHzjbpj2WLiToG2758KjtCCiLRKZqfrOdl3cNKuw==", "requires": { - "@typescript-eslint/scope-manager": "5.12.0", - "@typescript-eslint/types": "5.12.0", - "@typescript-eslint/typescript-estree": "5.12.0", + "@typescript-eslint/scope-manager": "5.12.1", + "@typescript-eslint/types": "5.12.1", + "@typescript-eslint/typescript-estree": "5.12.1", "debug": "^4.3.2" }, "dependencies": { @@ -29542,20 +29611,20 @@ } }, "@typescript-eslint/scope-manager": { - "version": "5.12.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.12.0.tgz", - "integrity": "sha512-GAMobtIJI8FGf1sLlUWNUm2IOkIjvn7laFWyRx7CLrv6nLBI7su+B7lbStqVlK5NdLvHRFiJo2HhiDF7Ki01WQ==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.12.1.tgz", + "integrity": "sha512-J0Wrh5xS6XNkd4TkOosxdpObzlYfXjAFIm9QxYLCPOcHVv1FyyFCPom66uIh8uBr0sZCrtS+n19tzufhwab8ZQ==", "requires": { - "@typescript-eslint/types": "5.12.0", - "@typescript-eslint/visitor-keys": "5.12.0" + "@typescript-eslint/types": "5.12.1", + "@typescript-eslint/visitor-keys": "5.12.1" } }, "@typescript-eslint/type-utils": { - "version": "5.12.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.12.0.tgz", - "integrity": "sha512-9j9rli3zEBV+ae7rlbBOotJcI6zfc6SHFMdKI9M3Nc0sy458LJ79Os+TPWeBBL96J9/e36rdJOfCuyRSgFAA0Q==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.12.1.tgz", + "integrity": "sha512-Gh8feEhsNLeCz6aYqynh61Vsdy+tiNNkQtc+bN3IvQvRqHkXGUhYkUi+ePKzP0Mb42se7FDb+y2SypTbpbR/Sg==", "requires": { - "@typescript-eslint/utils": "5.12.0", + "@typescript-eslint/utils": "5.12.1", "debug": "^4.3.2", "tsutils": "^3.21.0" }, @@ -29576,17 +29645,17 @@ } }, "@typescript-eslint/types": { - "version": "5.12.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.12.0.tgz", - "integrity": "sha512-JowqbwPf93nvf8fZn5XrPGFBdIK8+yx5UEGs2QFAYFI8IWYfrzz+6zqlurGr2ctShMaJxqwsqmra3WXWjH1nRQ==" + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.12.1.tgz", + "integrity": "sha512-hfcbq4qVOHV1YRdhkDldhV9NpmmAu2vp6wuFODL71Y0Ixak+FLeEU4rnPxgmZMnGreGEghlEucs9UZn5KOfHJA==" }, "@typescript-eslint/typescript-estree": { - "version": "5.12.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.12.0.tgz", - "integrity": "sha512-Dd9gVeOqt38QHR0BEA8oRaT65WYqPYbIc5tRFQPkfLquVEFPD1HAtbZT98TLBkEcCkvwDYOAvuSvAD9DnQhMfQ==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.12.1.tgz", + "integrity": "sha512-ahOdkIY9Mgbza7L9sIi205Pe1inCkZWAHE1TV1bpxlU4RZNPtXaDZfiiFWcL9jdxvW1hDYZJXrFm+vlMkXRbBw==", "requires": { - "@typescript-eslint/types": "5.12.0", - "@typescript-eslint/visitor-keys": "5.12.0", + "@typescript-eslint/types": "5.12.1", + "@typescript-eslint/visitor-keys": "5.12.1", "debug": "^4.3.2", "globby": "^11.0.4", "is-glob": "^4.0.3", @@ -29618,14 +29687,14 @@ } }, "@typescript-eslint/utils": { - "version": "5.12.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.12.0.tgz", - "integrity": "sha512-k4J2WovnMPGI4PzKgDtQdNrCnmBHpMUFy21qjX2CoPdoBcSBIMvVBr9P2YDP8jOqZOeK3ThOL6VO/sy6jtnvzw==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.12.1.tgz", + "integrity": "sha512-Qq9FIuU0EVEsi8fS6pG+uurbhNTtoYr4fq8tKjBupsK5Bgbk2I32UGm0Sh+WOyjOPgo/5URbxxSNV6HYsxV4MQ==", "requires": { "@types/json-schema": "^7.0.9", - "@typescript-eslint/scope-manager": "5.12.0", - "@typescript-eslint/types": "5.12.0", - "@typescript-eslint/typescript-estree": "5.12.0", + "@typescript-eslint/scope-manager": "5.12.1", + "@typescript-eslint/types": "5.12.1", + "@typescript-eslint/typescript-estree": "5.12.1", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0" }, @@ -29647,11 +29716,11 @@ } }, "@typescript-eslint/visitor-keys": { - "version": "5.12.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.12.0.tgz", - "integrity": "sha512-cFwTlgnMV6TgezQynx2c/4/tx9Tufbuo9LPzmWqyRC3QC4qTGkAG1C6pBr0/4I10PAI/FlYunI3vJjIcu+ZHMg==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.12.1.tgz", + "integrity": "sha512-l1KSLfupuwrXx6wc0AuOmC7Ko5g14ZOQ86wJJqRbdLbXLK02pK/DPiDDqCc7BqqiiA04/eAA6ayL0bgOrAkH7A==", "requires": { - "@typescript-eslint/types": "5.12.0", + "@typescript-eslint/types": "5.12.1", "eslint-visitor-keys": "^3.0.0" } }, @@ -29913,9 +29982,9 @@ } }, "agentkeepalive": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.0.tgz", - "integrity": "sha512-0PhAp58jZNw13UJv7NVdTGb0ZcghHUb3DrZ046JiiJY/BOaTTpbwdHq2VObPCBV8M2GPh7sgrJ3AQ8Ey468LJw==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.1.tgz", + "integrity": "sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==", "requires": { "debug": "^4.1.0", "depd": "^1.1.2", @@ -30956,6 +31025,18 @@ "type-is": "~1.6.18" }, "dependencies": { + "http-errors": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz", + "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==", + "requires": { + "depd": "~1.1.2", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.1" + } + }, "iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -30968,6 +31049,22 @@ "version": "6.9.7", "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz", "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==" + }, + "raw-body": { + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz", + "integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==", + "requires": { + "bytes": "3.1.2", + "http-errors": "1.8.1", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + } + }, + "statuses": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", + "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" } } }, @@ -32104,9 +32201,9 @@ "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==" }, "cssdb": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-6.3.1.tgz", - "integrity": "sha512-Ho3gIkGY4O8S3J54fHu7RP5GHWz85McDhimaXEwf7qV0MSPhLM0jdd61zqs1kkadIVDAvfqoku0kArbWaMYolw==" + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-6.4.0.tgz", + "integrity": "sha512-8NMWrur/ewSNrRNZndbtOTXc2Xb2b+NCTPHj8VErFYvJUlgsMAiBGaFaxG6hjy9zbCjj2ZLwSQrMM+tormO8qA==" }, "cssesc": { "version": "3.0.0", @@ -33316,9 +33413,9 @@ } }, "eslint-config-prettier": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz", - "integrity": "sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==", + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.4.0.tgz", + "integrity": "sha512-CFotdUcMY18nGRo5KGsnNxpznzhkopOcOo0InID+sgQssPrzjvsyKZPvOgymTFeHrFuC3Tzdf2YndhXtULK9Iw==", "dev": true }, "eslint-config-react-app": { @@ -33867,6 +33964,18 @@ "unpipe": "~1.0.0" } }, + "http-errors": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz", + "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==", + "requires": { + "depd": "~1.1.2", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.1" + } + }, "mime": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", @@ -35906,21 +36015,29 @@ "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=" }, "http-errors": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz", - "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", + "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", + "dev": true, "requires": { - "depd": "~1.1.2", + "depd": "2.0.0", "inherits": "2.0.4", "setprototypeof": "1.2.0", - "statuses": ">= 1.5.0 < 2", + "statuses": "2.0.1", "toidentifier": "1.0.1" }, "dependencies": { + "depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "dev": true + }, "statuses": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "dev": true } } }, @@ -40950,12 +41067,13 @@ "integrity": "sha512-sln+pNSc8NGaHoLzwNBssFSf/rSYkqeBXzX1AtJlkJiUaVSJSbRAWJk+4omsXkN+EJalzkZhWQ3th1m0FpR5xA==" }, "raw-body": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz", - "integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.0.tgz", + "integrity": "sha512-XpyZ6O7PVu3ItMQl0LslfsRoKxMOxi3SzDkrOtxMES5AqLFpYjQCryxI4LGygUN2jL+RgFsPkMPPlG7cg/47+A==", + "dev": true, "requires": { "bytes": "3.1.2", - "http-errors": "1.8.1", + "http-errors": "2.0.0", "iconv-lite": "0.4.24", "unpipe": "1.0.0" }, @@ -40964,6 +41082,7 @@ "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, "requires": { "safer-buffer": ">= 2.1.2 < 3" } @@ -41267,9 +41386,9 @@ "integrity": "sha512-Ule/KqHBwUvuubqGC4WDvOARS6VjlULSS+WHspgQ5FhFKR4ytHDc4AMpjVfnv+Wbz2TEbMp9/ZHmuZsUksPCiA==" }, "react-i18next": { - "version": "11.15.4", - "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.15.4.tgz", - "integrity": "sha512-jKJNAcVcbPGK+yrTcXhLblgPY16n6NbpZZL3Mk8nswj1v3ayIiUBVDU09SgqnT+DluyQBS97hwSvPU5yVFG0yg==", + "version": "11.15.5", + "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.15.5.tgz", + "integrity": "sha512-vBWuVEQgrhZrGKpyv8FmJ7Zs5jRQWl794Tte7yzJ0okZqqi3jd6j2pLYNg441WcREsbIOvWdiDXbY7W6E93p1A==", "requires": { "@babel/runtime": "^7.14.5", "html-escaper": "^2.0.2", @@ -42324,9 +42443,9 @@ } }, "rollup": { - "version": "2.67.3", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.67.3.tgz", - "integrity": "sha512-G/x1vUwbGtP6O5ZM8/sWr8+p7YfZhI18pPqMRtMYMWSbHjKZ/ajHGiM+GWNTlWyOR0EHIdT8LHU+Z4ciIZ1oBw==", + "version": "2.68.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.68.0.tgz", + "integrity": "sha512-XrMKOYK7oQcTio4wyTz466mucnd8LzkiZLozZ4Rz0zQD+HeX4nUK4B8GrTX/2EvN2/vBF/i2WnaXboPxo0JylA==", "requires": { "fsevents": "~2.3.2" } @@ -44133,15 +44252,21 @@ } }, "terser": { - "version": "5.10.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz", - "integrity": "sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==", + "version": "5.11.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.11.0.tgz", + "integrity": "sha512-uCA9DLanzzWSsN1UirKwylhhRz3aKPInlfmpGfw8VN6jHsAtu8HJtIpeeHHK23rxnE/cDc+yvmq5wqkIC6Kn0A==", "requires": { + "acorn": "^8.5.0", "commander": "^2.20.0", "source-map": "~0.7.2", "source-map-support": "~0.5.20" }, "dependencies": { + "acorn": { + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz", + "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==" + }, "commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", diff --git a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentBatch.js b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentBatch.js index db54378b..dcc0190e 100644 --- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentBatch.js +++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentBatch.js @@ -204,7 +204,7 @@ const CombinedEquipmentBatch = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue['name'] + ' (' + currentValue['unit_of_measure'] + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentCost.js b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentCost.js index 00ad9607..82146674 100644 --- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentCost.js +++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentCost.js @@ -472,7 +472,7 @@ const CombinedEquipmentCost = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -485,7 +485,7 @@ const CombinedEquipmentCost = ({ setRedirect, setRedirectUrl, t }) => { text: t('Total') + ' (' + json['reporting_period']['total_unit'] + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -525,7 +525,7 @@ const CombinedEquipmentCost = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -538,7 +538,7 @@ const CombinedEquipmentCost = ({ setRedirect, setRedirectUrl, t }) => { text: t('Total') + ' (' + json['associated_equipment']['total_unit'] + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEfficiency.js b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEfficiency.js index 8db9e513..bcd5e0bc 100644 --- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEfficiency.js +++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEfficiency.js @@ -478,7 +478,7 @@ const CombinedEquipmentEfficiency = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -490,7 +490,7 @@ const CombinedEquipmentEfficiency = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + '-' + numerator_name + ' (' + numerator_unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -502,7 +502,7 @@ const CombinedEquipmentEfficiency = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + '-' + denominator_name + ' (' + denominator_unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyCategory.js b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyCategory.js index 571e04a9..6d74eabd 100644 --- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyCategory.js +++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyCategory.js @@ -485,7 +485,7 @@ const CombinedEquipmentEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -523,7 +523,7 @@ const CombinedEquipmentEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyItem.js b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyItem.js index 4c974df8..f5649edf 100644 --- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyItem.js +++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyItem.js @@ -446,7 +446,7 @@ const CombinedEquipmentEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -484,7 +484,11 @@ const CombinedEquipmentEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (typeof decimalValue === 'number') { + return decimalValue.toFixed(2); + } else { + return null; + } } }); }); diff --git a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentIncome.js b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentIncome.js index ce440eb1..829e7191 100644 --- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentIncome.js +++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentIncome.js @@ -436,7 +436,7 @@ const CombinedEquipmentIncome = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -449,7 +449,7 @@ const CombinedEquipmentIncome = ({ setRedirect, setRedirectUrl, t }) => { text: t('Total') + ' (' + json['reporting_period']['total_unit'] + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -489,7 +489,7 @@ const CombinedEquipmentIncome = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -502,7 +502,7 @@ const CombinedEquipmentIncome = ({ setRedirect, setRedirectUrl, t }) => { text: t('Total') + ' (' + json['associated_equipment']['total_unit'] + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentLoad.js b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentLoad.js index 061b8d59..7ea85e45 100644 --- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentLoad.js +++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentLoad.js @@ -417,7 +417,7 @@ const CombinedEquipmentLoad = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' ' + t('Average Load') + ' (' + unit + '/H)', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -429,7 +429,7 @@ const CombinedEquipmentLoad = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' ' + t('Maximum Load') + ' (' + unit + '/H)', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -477,7 +477,7 @@ const CombinedEquipmentLoad = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' ' + t('Average Load') + ' (' + unit + '/H)', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -489,7 +489,7 @@ const CombinedEquipmentLoad = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' ' + t('Maximum Load') + ' (' + unit + '/H)', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentOutput.js b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentOutput.js index d454b9c2..b81e8e76 100644 --- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentOutput.js +++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentOutput.js @@ -409,7 +409,7 @@ const CombinedEquipmentOutput = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -447,7 +447,7 @@ const CombinedEquipmentOutput = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentSaving.js b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentSaving.js index 40298755..7375313a 100644 --- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentSaving.js +++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentSaving.js @@ -448,7 +448,7 @@ const CombinedEquipmentSaving = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -486,7 +486,7 @@ const CombinedEquipmentSaving = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentStatistics.js b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentStatistics.js index 7584d1f2..7a5dcc4f 100644 --- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentStatistics.js +++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentStatistics.js @@ -420,7 +420,7 @@ const CombinedEquipmentStatistics = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -457,7 +457,7 @@ const CombinedEquipmentStatistics = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Equipment/EquipmentBatch.js b/web/src/components/MyEMS/Equipment/EquipmentBatch.js index f49b0871..902ba009 100644 --- a/web/src/components/MyEMS/Equipment/EquipmentBatch.js +++ b/web/src/components/MyEMS/Equipment/EquipmentBatch.js @@ -204,7 +204,7 @@ const EquipmentBatch = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue['name'] + ' (' + currentValue['unit_of_measure'] + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Equipment/EquipmentCost.js b/web/src/components/MyEMS/Equipment/EquipmentCost.js index 14a4ab4b..2aa09333 100644 --- a/web/src/components/MyEMS/Equipment/EquipmentCost.js +++ b/web/src/components/MyEMS/Equipment/EquipmentCost.js @@ -467,7 +467,7 @@ const EquipmentCost = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -480,7 +480,7 @@ const EquipmentCost = ({ setRedirect, setRedirectUrl, t }) => { text: t('Total') + ' (' + json['reporting_period']['total_unit'] + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Equipment/EquipmentEfficiency.js b/web/src/components/MyEMS/Equipment/EquipmentEfficiency.js index 67e2a83d..32d122f7 100644 --- a/web/src/components/MyEMS/Equipment/EquipmentEfficiency.js +++ b/web/src/components/MyEMS/Equipment/EquipmentEfficiency.js @@ -474,7 +474,7 @@ const EquipmentEfficiency = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -489,7 +489,7 @@ const EquipmentEfficiency = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -504,7 +504,7 @@ const EquipmentEfficiency = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Equipment/EquipmentEnergyCategory.js b/web/src/components/MyEMS/Equipment/EquipmentEnergyCategory.js index 467d0018..2b28128b 100644 --- a/web/src/components/MyEMS/Equipment/EquipmentEnergyCategory.js +++ b/web/src/components/MyEMS/Equipment/EquipmentEnergyCategory.js @@ -482,7 +482,7 @@ const EquipmentEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Equipment/EquipmentEnergyItem.js b/web/src/components/MyEMS/Equipment/EquipmentEnergyItem.js index 03e1a903..3e8a4a31 100644 --- a/web/src/components/MyEMS/Equipment/EquipmentEnergyItem.js +++ b/web/src/components/MyEMS/Equipment/EquipmentEnergyItem.js @@ -442,7 +442,7 @@ const EquipmentEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Equipment/EquipmentIncome.js b/web/src/components/MyEMS/Equipment/EquipmentIncome.js index e1a57f69..e90aa396 100644 --- a/web/src/components/MyEMS/Equipment/EquipmentIncome.js +++ b/web/src/components/MyEMS/Equipment/EquipmentIncome.js @@ -432,7 +432,7 @@ const EquipmentIncome = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -445,7 +445,7 @@ const EquipmentIncome = ({ setRedirect, setRedirectUrl, t }) => { text: t('Total') + ' (' + json['reporting_period']['total_unit'] + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Equipment/EquipmentLoad.js b/web/src/components/MyEMS/Equipment/EquipmentLoad.js index 472e9605..7b0be4c5 100644 --- a/web/src/components/MyEMS/Equipment/EquipmentLoad.js +++ b/web/src/components/MyEMS/Equipment/EquipmentLoad.js @@ -412,7 +412,7 @@ const EquipmentLoad = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' ' + t('Average Load') + ' (' + unit + '/H)', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -424,7 +424,7 @@ const EquipmentLoad = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' ' + t('Maximum Load') + ' (' + unit + '/H)', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Equipment/EquipmentOutput.js b/web/src/components/MyEMS/Equipment/EquipmentOutput.js index a90411fe..a2ba1916 100644 --- a/web/src/components/MyEMS/Equipment/EquipmentOutput.js +++ b/web/src/components/MyEMS/Equipment/EquipmentOutput.js @@ -404,7 +404,7 @@ const EquipmentOutput = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Equipment/EquipmentSaving.js b/web/src/components/MyEMS/Equipment/EquipmentSaving.js index 7156ffff..d6394368 100644 --- a/web/src/components/MyEMS/Equipment/EquipmentSaving.js +++ b/web/src/components/MyEMS/Equipment/EquipmentSaving.js @@ -444,7 +444,7 @@ const EquipmentSaving = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Equipment/EquipmentStatistics.js b/web/src/components/MyEMS/Equipment/EquipmentStatistics.js index 7f1081b6..dd17f5af 100644 --- a/web/src/components/MyEMS/Equipment/EquipmentStatistics.js +++ b/web/src/components/MyEMS/Equipment/EquipmentStatistics.js @@ -417,7 +417,7 @@ const EquipmentStatistics = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Meter/MeterBatch.js b/web/src/components/MyEMS/Meter/MeterBatch.js index 6137edf5..9e75219e 100644 --- a/web/src/components/MyEMS/Meter/MeterBatch.js +++ b/web/src/components/MyEMS/Meter/MeterBatch.js @@ -179,7 +179,7 @@ const MeterBatch = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['space'] = currentMeter['space_name']; detailed_value['costcenter'] = currentMeter['cost_center_name']; currentMeter['values'].forEach((currentValue, energyCategoryIndex) => { - if (currentValue !== null) { + if (typeof currentValue === 'number') { detailed_value['a' + energyCategoryIndex] = currentValue; } else { detailed_value['a' + energyCategoryIndex] = null; @@ -209,7 +209,7 @@ const MeterBatch = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue['name'] + ' (' + currentValue['unit_of_measure'] + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Meter/MeterCarbon.js b/web/src/components/MyEMS/Meter/MeterCarbon.js index fb29de42..8be4a07e 100644 --- a/web/src/components/MyEMS/Meter/MeterCarbon.js +++ b/web/src/components/MyEMS/Meter/MeterCarbon.js @@ -393,7 +393,7 @@ const MeterCarbon = ({ setRedirect, setRedirectUrl, t }) => { text: json['meter']['energy_category_name'] + ' (' + json['meter']['unit_of_measure'] + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Meter/MeterCost.js b/web/src/components/MyEMS/Meter/MeterCost.js index 7962a244..d34070d3 100644 --- a/web/src/components/MyEMS/Meter/MeterCost.js +++ b/web/src/components/MyEMS/Meter/MeterCost.js @@ -393,7 +393,7 @@ const MeterCost = ({ setRedirect, setRedirectUrl, t }) => { text: json['meter']['energy_category_name'] + ' (' + json['meter']['unit_of_measure'] + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Meter/MeterEnergy.js b/web/src/components/MyEMS/Meter/MeterEnergy.js index 22ece156..6205e66d 100644 --- a/web/src/components/MyEMS/Meter/MeterEnergy.js +++ b/web/src/components/MyEMS/Meter/MeterEnergy.js @@ -399,7 +399,7 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => { text: json['meter']['energy_category_name'] + ' (' + json['meter']['unit_of_measure'] + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Meter/MeterSubmetersBalance.js b/web/src/components/MyEMS/Meter/MeterSubmetersBalance.js index f544259e..5cf00f8e 100644 --- a/web/src/components/MyEMS/Meter/MeterSubmetersBalance.js +++ b/web/src/components/MyEMS/Meter/MeterSubmetersBalance.js @@ -330,7 +330,7 @@ const MeterSubmetersBalance = ({ setRedirect, setRedirectUrl, t }) => { text: json['meter']['energy_category_name'] + ' (' + json['meter']['unit_of_measure'] + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Meter/OfflineMeterCost.js b/web/src/components/MyEMS/Meter/OfflineMeterCost.js index f054f0ff..5a112402 100644 --- a/web/src/components/MyEMS/Meter/OfflineMeterCost.js +++ b/web/src/components/MyEMS/Meter/OfflineMeterCost.js @@ -371,7 +371,7 @@ const OfflineMeterCost = ({ setRedirect, setRedirectUrl, t }) => { text: json['offline_meter']['energy_category_name'] + ' (' + json['offline_meter']['unit_of_measure'] + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Meter/OfflineMeterEnergy.js b/web/src/components/MyEMS/Meter/OfflineMeterEnergy.js index aa17199b..7034b990 100644 --- a/web/src/components/MyEMS/Meter/OfflineMeterEnergy.js +++ b/web/src/components/MyEMS/Meter/OfflineMeterEnergy.js @@ -371,7 +371,7 @@ const OfflineMeterEnergy = ({ setRedirect, setRedirectUrl, t }) => { text: json['offline_meter']['energy_category_name'] + ' (' + json['offline_meter']['unit_of_measure'] + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Meter/VirtualMeterCarbon.js b/web/src/components/MyEMS/Meter/VirtualMeterCarbon.js index 5fdf9659..3295ef69 100644 --- a/web/src/components/MyEMS/Meter/VirtualMeterCarbon.js +++ b/web/src/components/MyEMS/Meter/VirtualMeterCarbon.js @@ -371,7 +371,7 @@ const VirtualMeterCarbon = ({ setRedirect, setRedirectUrl, t }) => { text: json['virtual_meter']['energy_category_name'] + ' (' + json['virtual_meter']['unit_of_measure'] + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Meter/VirtualMeterCost.js b/web/src/components/MyEMS/Meter/VirtualMeterCost.js index c1e910e3..3a9427ec 100644 --- a/web/src/components/MyEMS/Meter/VirtualMeterCost.js +++ b/web/src/components/MyEMS/Meter/VirtualMeterCost.js @@ -371,7 +371,7 @@ const VirtualMeterCost = ({ setRedirect, setRedirectUrl, t }) => { text: json['virtual_meter']['energy_category_name'] + ' (' + json['virtual_meter']['unit_of_measure'] + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Meter/VirtualMeterEnergy.js b/web/src/components/MyEMS/Meter/VirtualMeterEnergy.js index af5d0138..419ed38b 100644 --- a/web/src/components/MyEMS/Meter/VirtualMeterEnergy.js +++ b/web/src/components/MyEMS/Meter/VirtualMeterEnergy.js @@ -371,7 +371,7 @@ const VirtualMeterEnergy = ({ setRedirect, setRedirectUrl, t }) => { text: json['virtual_meter']['energy_category_name'] + ' (' + json['virtual_meter']['unit_of_measure'] + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Shopfloor/ShopfloorBatch.js b/web/src/components/MyEMS/Shopfloor/ShopfloorBatch.js index 7a41cb5d..0c78b706 100644 --- a/web/src/components/MyEMS/Shopfloor/ShopfloorBatch.js +++ b/web/src/components/MyEMS/Shopfloor/ShopfloorBatch.js @@ -204,7 +204,7 @@ const ShopfloorBatch = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue['name'] + ' (' + currentValue['unit_of_measure'] + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Shopfloor/ShopfloorCost.js b/web/src/components/MyEMS/Shopfloor/ShopfloorCost.js index 5ab7d6f1..96a7c044 100644 --- a/web/src/components/MyEMS/Shopfloor/ShopfloorCost.js +++ b/web/src/components/MyEMS/Shopfloor/ShopfloorCost.js @@ -468,7 +468,7 @@ const ShopfloorCost = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -481,7 +481,7 @@ const ShopfloorCost = ({ setRedirect, setRedirectUrl, t }) => { text: t('Total') + ' (' + json['reporting_period']['total_unit'] + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Shopfloor/ShopfloorEnergyCategory.js b/web/src/components/MyEMS/Shopfloor/ShopfloorEnergyCategory.js index 256a7880..d340888b 100644 --- a/web/src/components/MyEMS/Shopfloor/ShopfloorEnergyCategory.js +++ b/web/src/components/MyEMS/Shopfloor/ShopfloorEnergyCategory.js @@ -483,7 +483,7 @@ const ShopfloorEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Shopfloor/ShopfloorEnergyItem.js b/web/src/components/MyEMS/Shopfloor/ShopfloorEnergyItem.js index 4493a743..cd5bb182 100644 --- a/web/src/components/MyEMS/Shopfloor/ShopfloorEnergyItem.js +++ b/web/src/components/MyEMS/Shopfloor/ShopfloorEnergyItem.js @@ -444,7 +444,7 @@ const ShopfloorEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Shopfloor/ShopfloorLoad.js b/web/src/components/MyEMS/Shopfloor/ShopfloorLoad.js index 009fe5ca..8f873d81 100644 --- a/web/src/components/MyEMS/Shopfloor/ShopfloorLoad.js +++ b/web/src/components/MyEMS/Shopfloor/ShopfloorLoad.js @@ -413,7 +413,7 @@ const ShopfloorLoad = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' ' + t('Average Load') + ' (' + unit + '/H)', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -425,7 +425,7 @@ const ShopfloorLoad = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' ' + t('Maximum Load') + ' (' + unit + '/H)', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Shopfloor/ShopfloorSaving.js b/web/src/components/MyEMS/Shopfloor/ShopfloorSaving.js index db7cbbe3..9d483412 100644 --- a/web/src/components/MyEMS/Shopfloor/ShopfloorSaving.js +++ b/web/src/components/MyEMS/Shopfloor/ShopfloorSaving.js @@ -445,7 +445,7 @@ const ShopfloorSaving = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Shopfloor/ShopfloorStatistics.js b/web/src/components/MyEMS/Shopfloor/ShopfloorStatistics.js index b68dcb72..ae331d90 100644 --- a/web/src/components/MyEMS/Shopfloor/ShopfloorStatistics.js +++ b/web/src/components/MyEMS/Shopfloor/ShopfloorStatistics.js @@ -421,7 +421,7 @@ const ShopfloorStatistics = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Space/SpaceCost.js b/web/src/components/MyEMS/Space/SpaceCost.js index f6ddc494..5c8db652 100644 --- a/web/src/components/MyEMS/Space/SpaceCost.js +++ b/web/src/components/MyEMS/Space/SpaceCost.js @@ -441,7 +441,7 @@ const SpaceCost = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -454,7 +454,7 @@ const SpaceCost = ({ setRedirect, setRedirectUrl, t }) => { text: t('Total') + ' (' + json['reporting_period']['total_unit'] + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -494,7 +494,7 @@ const SpaceCost = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -507,7 +507,7 @@ const SpaceCost = ({ setRedirect, setRedirectUrl, t }) => { text: t('Total') + ' (' + json['child_space']['total_unit'] + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Space/SpaceEfficiency.js b/web/src/components/MyEMS/Space/SpaceEfficiency.js index a179f65e..c55d48c9 100644 --- a/web/src/components/MyEMS/Space/SpaceEfficiency.js +++ b/web/src/components/MyEMS/Space/SpaceEfficiency.js @@ -340,7 +340,7 @@ const SpaceEfficiency = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Space/SpaceEnergyCategory.js b/web/src/components/MyEMS/Space/SpaceEnergyCategory.js index 1280c5f6..2648dc25 100644 --- a/web/src/components/MyEMS/Space/SpaceEnergyCategory.js +++ b/web/src/components/MyEMS/Space/SpaceEnergyCategory.js @@ -442,7 +442,7 @@ const SpaceEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -480,7 +480,7 @@ const SpaceEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Space/SpaceEnergyItem.js b/web/src/components/MyEMS/Space/SpaceEnergyItem.js index bf305671..28d92453 100644 --- a/web/src/components/MyEMS/Space/SpaceEnergyItem.js +++ b/web/src/components/MyEMS/Space/SpaceEnergyItem.js @@ -374,7 +374,7 @@ const SpaceEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -412,7 +412,7 @@ const SpaceEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Space/SpaceIncome.js b/web/src/components/MyEMS/Space/SpaceIncome.js index ad8b7252..b4fa2238 100644 --- a/web/src/components/MyEMS/Space/SpaceIncome.js +++ b/web/src/components/MyEMS/Space/SpaceIncome.js @@ -365,7 +365,7 @@ const SpaceIncome = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -378,7 +378,7 @@ const SpaceIncome = ({ setRedirect, setRedirectUrl, t }) => { text: t('Total') + ' (' + json['reporting_period']['total_unit'] + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -418,7 +418,7 @@ const SpaceIncome = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -431,7 +431,7 @@ const SpaceIncome = ({ setRedirect, setRedirectUrl, t }) => { text: t('Total') + ' (' + json['child_space']['total_unit'] + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Space/SpaceLoad.js b/web/src/components/MyEMS/Space/SpaceLoad.js index 66e1a9d7..403bcad3 100644 --- a/web/src/components/MyEMS/Space/SpaceLoad.js +++ b/web/src/components/MyEMS/Space/SpaceLoad.js @@ -341,7 +341,7 @@ const SpaceLoad = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' ' + t('Average Load') + ' (' + unit + '/H)', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -353,7 +353,7 @@ const SpaceLoad = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' ' + t('Maximum Load') + ' (' + unit + '/H)', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Space/SpaceOutput.js b/web/src/components/MyEMS/Space/SpaceOutput.js index 5f551e3c..23c1d59d 100644 --- a/web/src/components/MyEMS/Space/SpaceOutput.js +++ b/web/src/components/MyEMS/Space/SpaceOutput.js @@ -337,7 +337,7 @@ const SpaceOutput = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -375,7 +375,7 @@ const SpaceOutput = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Space/SpaceSaving.js b/web/src/components/MyEMS/Space/SpaceSaving.js index 7510ac51..ff36ae64 100644 --- a/web/src/components/MyEMS/Space/SpaceSaving.js +++ b/web/src/components/MyEMS/Space/SpaceSaving.js @@ -378,7 +378,7 @@ const SpaceSaving = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -416,7 +416,7 @@ const SpaceSaving = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Space/SpaceStatistics.js b/web/src/components/MyEMS/Space/SpaceStatistics.js index 4673512e..fd7a1a54 100644 --- a/web/src/components/MyEMS/Space/SpaceStatistics.js +++ b/web/src/components/MyEMS/Space/SpaceStatistics.js @@ -348,7 +348,7 @@ const SpaceStatistics = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Store/StoreBatch.js b/web/src/components/MyEMS/Store/StoreBatch.js index b2dffe90..e40754c1 100644 --- a/web/src/components/MyEMS/Store/StoreBatch.js +++ b/web/src/components/MyEMS/Store/StoreBatch.js @@ -204,7 +204,7 @@ const StoreBatch = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue['name'] + ' (' + currentValue['unit_of_measure'] + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Store/StoreCost.js b/web/src/components/MyEMS/Store/StoreCost.js index 8b7118c2..e24b814f 100644 --- a/web/src/components/MyEMS/Store/StoreCost.js +++ b/web/src/components/MyEMS/Store/StoreCost.js @@ -469,7 +469,7 @@ const StoreCost = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -482,7 +482,7 @@ const StoreCost = ({ setRedirect, setRedirectUrl, t }) => { text: t('Total') + ' (' + json['reporting_period']['total_unit'] + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Store/StoreEnergyCategory.js b/web/src/components/MyEMS/Store/StoreEnergyCategory.js index 37df2538..6631c1ea 100644 --- a/web/src/components/MyEMS/Store/StoreEnergyCategory.js +++ b/web/src/components/MyEMS/Store/StoreEnergyCategory.js @@ -483,7 +483,7 @@ const StoreEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Store/StoreEnergyItem.js b/web/src/components/MyEMS/Store/StoreEnergyItem.js index 5a3d366b..e1cb3205 100644 --- a/web/src/components/MyEMS/Store/StoreEnergyItem.js +++ b/web/src/components/MyEMS/Store/StoreEnergyItem.js @@ -444,7 +444,7 @@ const StoreEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Store/StoreLoad.js b/web/src/components/MyEMS/Store/StoreLoad.js index 03140106..549d69e6 100644 --- a/web/src/components/MyEMS/Store/StoreLoad.js +++ b/web/src/components/MyEMS/Store/StoreLoad.js @@ -415,7 +415,7 @@ const StoreLoad = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' ' + t('Average Load') + ' (' + unit + '/H)', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -427,7 +427,7 @@ const StoreLoad = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' ' + t('Maximum Load') + ' (' + unit + '/H)', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Store/StoreSaving.js b/web/src/components/MyEMS/Store/StoreSaving.js index 08ce42d1..d1b85cec 100644 --- a/web/src/components/MyEMS/Store/StoreSaving.js +++ b/web/src/components/MyEMS/Store/StoreSaving.js @@ -445,7 +445,7 @@ const StoreSaving = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Store/StoreStatistics.js b/web/src/components/MyEMS/Store/StoreStatistics.js index a0bb8d45..a42a0b0d 100644 --- a/web/src/components/MyEMS/Store/StoreStatistics.js +++ b/web/src/components/MyEMS/Store/StoreStatistics.js @@ -420,7 +420,7 @@ const StoreStatistics = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Tenant/TenantBatch.js b/web/src/components/MyEMS/Tenant/TenantBatch.js index 01629418..15baf7b9 100644 --- a/web/src/components/MyEMS/Tenant/TenantBatch.js +++ b/web/src/components/MyEMS/Tenant/TenantBatch.js @@ -207,7 +207,7 @@ const TenantBatch = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue['name'] + ' (' + currentValue['unit_of_measure'] + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -218,7 +218,7 @@ const TenantBatch = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue['name'] + ' ' + t('Maximum Load') + ' (' + currentValue['unit_of_measure'] + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Tenant/TenantCost.js b/web/src/components/MyEMS/Tenant/TenantCost.js index e51ceae6..4ad52373 100644 --- a/web/src/components/MyEMS/Tenant/TenantCost.js +++ b/web/src/components/MyEMS/Tenant/TenantCost.js @@ -469,7 +469,7 @@ const TenantCost = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -482,7 +482,7 @@ const TenantCost = ({ setRedirect, setRedirectUrl, t }) => { text: t('Total') + ' (' + json['reporting_period']['total_unit'] + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Tenant/TenantEnergyCategory.js b/web/src/components/MyEMS/Tenant/TenantEnergyCategory.js index 633a1b34..71f82414 100644 --- a/web/src/components/MyEMS/Tenant/TenantEnergyCategory.js +++ b/web/src/components/MyEMS/Tenant/TenantEnergyCategory.js @@ -482,7 +482,7 @@ const TenantEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Tenant/TenantEnergyItem.js b/web/src/components/MyEMS/Tenant/TenantEnergyItem.js index aa7c7334..b9dd7fad 100644 --- a/web/src/components/MyEMS/Tenant/TenantEnergyItem.js +++ b/web/src/components/MyEMS/Tenant/TenantEnergyItem.js @@ -444,7 +444,7 @@ const TenantEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Tenant/TenantLoad.js b/web/src/components/MyEMS/Tenant/TenantLoad.js index 640c0194..a793bccc 100644 --- a/web/src/components/MyEMS/Tenant/TenantLoad.js +++ b/web/src/components/MyEMS/Tenant/TenantLoad.js @@ -414,7 +414,7 @@ const TenantLoad = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' ' + t('Average Load') + ' (' + unit + '/H)', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -426,7 +426,7 @@ const TenantLoad = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' ' + t('Maximum Load') + ' (' + unit + '/H)', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Tenant/TenantSaving.js b/web/src/components/MyEMS/Tenant/TenantSaving.js index 28e4d79d..e867008f 100644 --- a/web/src/components/MyEMS/Tenant/TenantSaving.js +++ b/web/src/components/MyEMS/Tenant/TenantSaving.js @@ -447,7 +447,7 @@ const TenantSaving = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/Tenant/TenantStatistics.js b/web/src/components/MyEMS/Tenant/TenantStatistics.js index a87496ee..08301247 100644 --- a/web/src/components/MyEMS/Tenant/TenantStatistics.js +++ b/web/src/components/MyEMS/Tenant/TenantStatistics.js @@ -422,7 +422,7 @@ const TenantStatistics = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; diff --git a/web/src/components/MyEMS/dashboard/Dashboard.js b/web/src/components/MyEMS/dashboard/Dashboard.js index b23a38b1..9927e368 100644 --- a/web/src/components/MyEMS/dashboard/Dashboard.js +++ b/web/src/components/MyEMS/dashboard/Dashboard.js @@ -343,7 +343,7 @@ const Dashboard = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null; @@ -358,7 +358,7 @@ const Dashboard = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - if (decimalValue !== null) { + if (typeof decimalValue === 'number') { return decimalValue.toFixed(2); } else { return null;