From 70659c78977c9098825f8ae206b25c3ef063fa24 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Tue, 23 Feb 2021 14:16:19 +0800 Subject: [PATCH 1/2] fixed energy category names and units issue in EnergyItem reports --- .../CombinedEquipmentEnergyItem.js | 12 ++++++++++-- .../MyEMS/Equipment/EquipmentEnergyItem.js | 12 ++++++++++-- .../MyEMS/Shopfloor/ShopfloorEnergyItem.js | 12 ++++++++++-- web/src/components/MyEMS/Space/SpaceEnergyItem.js | 14 +++++++++++--- web/src/components/MyEMS/Store/StoreEnergyItem.js | 12 ++++++++++-- .../components/MyEMS/Tenant/TenantEnergyItem.js | 12 ++++++++++-- 6 files changed, 61 insertions(+), 13 deletions(-) diff --git a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyItem.js b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyItem.js index 23d20cb0..48c443a1 100644 --- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyItem.js +++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyItem.js @@ -330,6 +330,7 @@ const CombinedEquipmentEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { setCardSummaryList(cardSummaryArray); let sharePieDict = {} + let energyCategoryDict = {}; json['reporting_period']['names'].forEach((currentValue, index) => { let sharePieSubItem = {} sharePieSubItem['id'] = index; @@ -344,13 +345,20 @@ const CombinedEquipmentEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { sharePieDict[current_energy_category_id] = []; sharePieDict[current_energy_category_id].push(sharePieSubItem); } + + if (!(current_energy_category_id in energyCategoryDict)) { + energyCategoryDict[current_energy_category_id] = + {'name': json['reporting_period']['energy_category_names'][index], + 'unit': json['reporting_period']['units'][index], + } + } }); let sharePieArray = []; for (let current_energy_category_id in sharePieDict) { let sharePieItem = {} sharePieItem['data'] = sharePieDict[current_energy_category_id]; - sharePieItem['energy_category_name'] = json['reporting_period']['energy_category_names'][current_energy_category_id]; - sharePieItem['unit'] = json['reporting_period']['units'][current_energy_category_id]; + sharePieItem['energy_category_name'] = energyCategoryDict[current_energy_category_id]['name']; + sharePieItem['unit'] = energyCategoryDict[current_energy_category_id]['unit']; sharePieArray.push(sharePieItem); } diff --git a/web/src/components/MyEMS/Equipment/EquipmentEnergyItem.js b/web/src/components/MyEMS/Equipment/EquipmentEnergyItem.js index d4b89ce0..2f3f5a58 100644 --- a/web/src/components/MyEMS/Equipment/EquipmentEnergyItem.js +++ b/web/src/components/MyEMS/Equipment/EquipmentEnergyItem.js @@ -332,6 +332,7 @@ const EquipmentEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { setCardSummaryList(cardSummaryArray); let sharePieDict = {} + let energyCategoryDict = {}; json['reporting_period']['names'].forEach((currentValue, index) => { let sharePieSubItem = {} sharePieSubItem['id'] = index; @@ -346,13 +347,20 @@ const EquipmentEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { sharePieDict[current_energy_category_id] = []; sharePieDict[current_energy_category_id].push(sharePieSubItem); } + + if (!(current_energy_category_id in energyCategoryDict)) { + energyCategoryDict[current_energy_category_id] = + {'name': json['reporting_period']['energy_category_names'][index], + 'unit': json['reporting_period']['units'][index], + } + } }); let sharePieArray = []; for (let current_energy_category_id in sharePieDict) { let sharePieItem = {} sharePieItem['data'] = sharePieDict[current_energy_category_id]; - sharePieItem['energy_category_name'] = json['reporting_period']['energy_category_names'][current_energy_category_id]; - sharePieItem['unit'] = json['reporting_period']['units'][current_energy_category_id]; + sharePieItem['energy_category_name'] = energyCategoryDict[current_energy_category_id]['name']; + sharePieItem['unit'] = energyCategoryDict[current_energy_category_id]['unit']; sharePieArray.push(sharePieItem); } diff --git a/web/src/components/MyEMS/Shopfloor/ShopfloorEnergyItem.js b/web/src/components/MyEMS/Shopfloor/ShopfloorEnergyItem.js index 36cda6d5..8264a0d0 100644 --- a/web/src/components/MyEMS/Shopfloor/ShopfloorEnergyItem.js +++ b/web/src/components/MyEMS/Shopfloor/ShopfloorEnergyItem.js @@ -334,6 +334,7 @@ const ShopfloorEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { setCardSummaryList(cardSummaryArray); let sharePieDict = {} + let energyCategoryDict = {}; json['reporting_period']['names'].forEach((currentValue, index) => { let sharePieSubItem = {} sharePieSubItem['id'] = index; @@ -348,13 +349,20 @@ const ShopfloorEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { sharePieDict[current_energy_category_id] = []; sharePieDict[current_energy_category_id].push(sharePieSubItem); } + + if (!(current_energy_category_id in energyCategoryDict)) { + energyCategoryDict[current_energy_category_id] = + {'name': json['reporting_period']['energy_category_names'][index], + 'unit': json['reporting_period']['units'][index], + } + } }); let sharePieArray = []; for (let current_energy_category_id in sharePieDict) { let sharePieItem = {} sharePieItem['data'] = sharePieDict[current_energy_category_id]; - sharePieItem['energy_category_name'] = json['reporting_period']['energy_category_names'][current_energy_category_id]; - sharePieItem['unit'] = json['reporting_period']['units'][current_energy_category_id]; + sharePieItem['energy_category_name'] = energyCategoryDict[current_energy_category_id]['name']; + sharePieItem['unit'] = energyCategoryDict[current_energy_category_id]['unit']; sharePieArray.push(sharePieItem); } diff --git a/web/src/components/MyEMS/Space/SpaceEnergyItem.js b/web/src/components/MyEMS/Space/SpaceEnergyItem.js index cab9eef3..49a457b6 100644 --- a/web/src/components/MyEMS/Space/SpaceEnergyItem.js +++ b/web/src/components/MyEMS/Space/SpaceEnergyItem.js @@ -263,7 +263,8 @@ const SpaceEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { }); setCardSummaryList(cardSummaryArray); - let sharePieDict = {} + let sharePieDict = {}; + let energyCategoryDict = {}; json['reporting_period']['names'].forEach((currentValue, index) => { let sharePieSubItem = {} sharePieSubItem['id'] = index; @@ -278,13 +279,20 @@ const SpaceEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { sharePieDict[current_energy_category_id] = []; sharePieDict[current_energy_category_id].push(sharePieSubItem); } + + if (!(current_energy_category_id in energyCategoryDict)) { + energyCategoryDict[current_energy_category_id] = + {'name': json['reporting_period']['energy_category_names'][index], + 'unit': json['reporting_period']['units'][index], + } + } }); let sharePieArray = []; for (let current_energy_category_id in sharePieDict) { let sharePieItem = {} sharePieItem['data'] = sharePieDict[current_energy_category_id]; - sharePieItem['energy_category_name'] = json['reporting_period']['energy_category_names'][current_energy_category_id]; - sharePieItem['unit'] = json['reporting_period']['units'][current_energy_category_id]; + sharePieItem['energy_category_name'] = energyCategoryDict[current_energy_category_id]['name']; + sharePieItem['unit'] = energyCategoryDict[current_energy_category_id]['unit']; sharePieArray.push(sharePieItem); } diff --git a/web/src/components/MyEMS/Store/StoreEnergyItem.js b/web/src/components/MyEMS/Store/StoreEnergyItem.js index fdcb9f6e..ebdf0917 100644 --- a/web/src/components/MyEMS/Store/StoreEnergyItem.js +++ b/web/src/components/MyEMS/Store/StoreEnergyItem.js @@ -334,6 +334,7 @@ const StoreEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { setCardSummaryList(cardSummaryArray); let sharePieDict = {} + let energyCategoryDict = {}; json['reporting_period']['names'].forEach((currentValue, index) => { let sharePieSubItem = {} sharePieSubItem['id'] = index; @@ -348,13 +349,20 @@ const StoreEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { sharePieDict[current_energy_category_id] = []; sharePieDict[current_energy_category_id].push(sharePieSubItem); } + + if (!(current_energy_category_id in energyCategoryDict)) { + energyCategoryDict[current_energy_category_id] = + {'name': json['reporting_period']['energy_category_names'][index], + 'unit': json['reporting_period']['units'][index], + } + } }); let sharePieArray = []; for (let current_energy_category_id in sharePieDict) { let sharePieItem = {} sharePieItem['data'] = sharePieDict[current_energy_category_id]; - sharePieItem['energy_category_name'] = json['reporting_period']['energy_category_names'][current_energy_category_id]; - sharePieItem['unit'] = json['reporting_period']['units'][current_energy_category_id]; + sharePieItem['energy_category_name'] = energyCategoryDict[current_energy_category_id]['name']; + sharePieItem['unit'] = energyCategoryDict[current_energy_category_id]['unit']; sharePieArray.push(sharePieItem); } diff --git a/web/src/components/MyEMS/Tenant/TenantEnergyItem.js b/web/src/components/MyEMS/Tenant/TenantEnergyItem.js index 8cb2e828..e2509ff5 100644 --- a/web/src/components/MyEMS/Tenant/TenantEnergyItem.js +++ b/web/src/components/MyEMS/Tenant/TenantEnergyItem.js @@ -334,6 +334,7 @@ const TenantEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { setCardSummaryList(cardSummaryArray); let sharePieDict = {} + let energyCategoryDict = {}; json['reporting_period']['names'].forEach((currentValue, index) => { let sharePieSubItem = {} sharePieSubItem['id'] = index; @@ -348,13 +349,20 @@ const TenantEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { sharePieDict[current_energy_category_id] = []; sharePieDict[current_energy_category_id].push(sharePieSubItem); } + + if (!(current_energy_category_id in energyCategoryDict)) { + energyCategoryDict[current_energy_category_id] = + {'name': json['reporting_period']['energy_category_names'][index], + 'unit': json['reporting_period']['units'][index], + } + } }); let sharePieArray = []; for (let current_energy_category_id in sharePieDict) { let sharePieItem = {} sharePieItem['data'] = sharePieDict[current_energy_category_id]; - sharePieItem['energy_category_name'] = json['reporting_period']['energy_category_names'][current_energy_category_id]; - sharePieItem['unit'] = json['reporting_period']['units'][current_energy_category_id]; + sharePieItem['energy_category_name'] = energyCategoryDict[current_energy_category_id]['name']; + sharePieItem['unit'] = energyCategoryDict[current_energy_category_id]['unit']; sharePieArray.push(sharePieItem); } From d59d0a7f1d3d9608ec1559f75c22fdb168431522 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Tue, 23 Feb 2021 14:18:20 +0800 Subject: [PATCH 2/2] added changelog --- CHANGELOG | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 CHANGELOG diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 00000000..d091fa2d --- /dev/null +++ b/CHANGELOG @@ -0,0 +1,4 @@ +v1.0.6: +1. fixed energy category names and units issue in EnergyItem reports. + +