From e38126e8b08a00c1da095bdd8604a0a3d3704aae Mon Sep 17 00:00:00 2001
From: "13621160019@163.com" <13621160019@163.com>
Date: Sat, 23 Oct 2021 20:00:17 +0800
Subject: [PATCH] fixed detailed data sort issues of Batch reports in Web UI

---
 .../CombinedEquipment/CombinedEquipmentBatch.js    |  7 +++++--
 .../components/MyEMS/Equipment/EquipmentBatch.js   |  7 +++++--
 web/src/components/MyEMS/Meter/MeterBatch.js       | 11 +++++++++--
 .../components/MyEMS/Shopfloor/ShopfloorBatch.js   |  7 +++++--
 web/src/components/MyEMS/Store/StoreBatch.js       |  5 +++--
 web/src/components/MyEMS/Tenant/TenantBatch.js     | 14 ++++++++++----
 6 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentBatch.js b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentBatch.js
index 90ba42b4..6a120158 100644
--- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentBatch.js
+++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentBatch.js
@@ -179,7 +179,7 @@ const CombinedEquipmentBatch = ({ setRedirect, setRedirectUrl, t }) => {
             detailed_value['space'] = currentCombinedEquipment['space_name'];
             detailed_value['costcenter'] = currentCombinedEquipment['cost_center_name'];
             currentCombinedEquipment['values'].forEach((currentValue, energyCategoryIndex) => {
-              detailed_value['a' + energyCategoryIndex] = currentValue.toFixed(2);
+              detailed_value['a' + energyCategoryIndex] = currentValue
             });
             combined_equipments.push(detailed_value);
           });
@@ -202,7 +202,10 @@ const CombinedEquipmentBatch = ({ setRedirect, setRedirectUrl, t }) => {
           detailed_column_list.push({
             dataField: 'a' + index,
             text: currentValue['name'] + ' (' + currentValue['unit_of_measure'] + ')',
-            sort: true
+            sort: true,
+            formatter: function (decimalValue) {
+              return decimalValue.toFixed(2);
+            }
           })
         });
         setDetailedDataTableColumns(detailed_column_list);
diff --git a/web/src/components/MyEMS/Equipment/EquipmentBatch.js b/web/src/components/MyEMS/Equipment/EquipmentBatch.js
index 978bfb0e..ce2482df 100644
--- a/web/src/components/MyEMS/Equipment/EquipmentBatch.js
+++ b/web/src/components/MyEMS/Equipment/EquipmentBatch.js
@@ -179,7 +179,7 @@ const EquipmentBatch = ({ setRedirect, setRedirectUrl, t }) => {
             detailed_value['space'] = currentEquipment['space_name'];
             detailed_value['costcenter'] = currentEquipment['cost_center_name'];
             currentEquipment['values'].forEach((currentValue, energyCategoryIndex) => {
-              detailed_value['a' + energyCategoryIndex] = currentValue.toFixed(2);
+              detailed_value['a' + energyCategoryIndex] = currentValue;
             });
             equipments.push(detailed_value);
           });
@@ -202,7 +202,10 @@ const EquipmentBatch = ({ setRedirect, setRedirectUrl, t }) => {
           detailed_column_list.push({
             dataField: 'a' + index,
             text: currentValue['name'] + ' (' + currentValue['unit_of_measure'] + ')',
-            sort: true
+            sort: true,
+            formatter: function (decimalValue) {
+              return decimalValue.toFixed(2);
+            }
           })
         });
         setDetailedDataTableColumns(detailed_column_list);
diff --git a/web/src/components/MyEMS/Meter/MeterBatch.js b/web/src/components/MyEMS/Meter/MeterBatch.js
index cac47e1e..3d239a6f 100644
--- a/web/src/components/MyEMS/Meter/MeterBatch.js
+++ b/web/src/components/MyEMS/Meter/MeterBatch.js
@@ -180,7 +180,7 @@ const MeterBatch = ({ setRedirect, setRedirectUrl, t }) => {
             detailed_value['costcenter'] = currentMeter['cost_center_name'];
             currentMeter['values'].forEach((currentValue, energyCategoryIndex) => {
               if (currentValue !== null) {
-                detailed_value['a' + energyCategoryIndex] = currentValue.toFixed(2);
+                detailed_value['a' + energyCategoryIndex] = currentValue;
               } else {
                 detailed_value['a' + energyCategoryIndex] = null;
               }
@@ -207,7 +207,14 @@ const MeterBatch = ({ setRedirect, setRedirectUrl, t }) => {
           detailed_column_list.push({
             dataField: 'a' + index,
             text: currentValue['name'] + ' (' + currentValue['unit_of_measure'] + ')',
-            sort: true
+            sort: true,
+            formatter: function (decimalValue) {
+              if (decimalValue !== null) {
+                return decimalValue.toFixed(2);
+              } else {
+                return null;
+              }
+            }
           })
         });
         setDetailedDataTableColumns(detailed_column_list);
diff --git a/web/src/components/MyEMS/Shopfloor/ShopfloorBatch.js b/web/src/components/MyEMS/Shopfloor/ShopfloorBatch.js
index 851b4769..84dc0e5a 100644
--- a/web/src/components/MyEMS/Shopfloor/ShopfloorBatch.js
+++ b/web/src/components/MyEMS/Shopfloor/ShopfloorBatch.js
@@ -179,7 +179,7 @@ const ShopfloorBatch = ({ setRedirect, setRedirectUrl, t }) => {
             detailed_value['space'] = currentShopfloor['space_name'];
             detailed_value['costcenter'] = currentShopfloor['cost_center_name'];
             currentShopfloor['values'].forEach((currentValue, energyCategoryIndex) => {
-              detailed_value['a' + energyCategoryIndex] = currentValue.toFixed(2);
+              detailed_value['a' + energyCategoryIndex] = currentValue;
             });
             shopfloors.push(detailed_value);
           });
@@ -202,7 +202,10 @@ const ShopfloorBatch = ({ setRedirect, setRedirectUrl, t }) => {
           detailed_column_list.push({
             dataField: 'a' + index,
             text: currentValue['name'] + ' (' + currentValue['unit_of_measure'] + ')',
-            sort: true
+            sort: true,
+            formatter: function (decimalValue) {
+              return decimalValue.toFixed(2);
+            }
           })
         });
         setDetailedDataTableColumns(detailed_column_list);
diff --git a/web/src/components/MyEMS/Store/StoreBatch.js b/web/src/components/MyEMS/Store/StoreBatch.js
index dbd93ed7..b8cb3a18 100644
--- a/web/src/components/MyEMS/Store/StoreBatch.js
+++ b/web/src/components/MyEMS/Store/StoreBatch.js
@@ -203,11 +203,12 @@ const StoreBatch = ({ setRedirect, setRedirectUrl, t }) => {
             dataField: 'a' + index,
             text: currentValue['name'] + ' (' + currentValue['unit_of_measure'] + ')',
             sort: true,
-            formatter: function (currentValue) {
-              return currentValue.toFixed(2);
+            formatter: function (decimalValue) {
+              return decimalValue.toFixed(2);
             }
           })
         });
+        console.log(detailed_column_list);
         setDetailedDataTableColumns(detailed_column_list);
 
         setExcelBytesBase64(json['excel_bytes_base64']);
diff --git a/web/src/components/MyEMS/Tenant/TenantBatch.js b/web/src/components/MyEMS/Tenant/TenantBatch.js
index 662c4d59..bf2b3582 100644
--- a/web/src/components/MyEMS/Tenant/TenantBatch.js
+++ b/web/src/components/MyEMS/Tenant/TenantBatch.js
@@ -179,10 +179,10 @@ const TenantBatch = ({ setRedirect, setRedirectUrl, t }) => {
             detailed_value['space'] = currentTenant['space_name'];
             detailed_value['costcenter'] = currentTenant['cost_center_name'];
             currentTenant['values'].forEach((currentValue, energyCategoryIndex) => {
-              detailed_value['a' + 2 * energyCategoryIndex] = currentValue.toFixed(2);
+              detailed_value['a' + 2 * energyCategoryIndex] = currentValue;
             });
             currentTenant['maximum'].forEach((currentValue, energyCategoryIndex) => {
-              detailed_value['a' + (2 * energyCategoryIndex + 1)] = currentValue.toFixed(2);
+              detailed_value['a' + (2 * energyCategoryIndex + 1)] = currentValue;
             });
             tenants.push(detailed_value);
           });
@@ -205,11 +205,17 @@ const TenantBatch = ({ setRedirect, setRedirectUrl, t }) => {
           detailed_column_list.push({
             dataField: 'a' + 2 * index,
             text: currentValue['name'] + ' (' + currentValue['unit_of_measure'] + ')',
-            sort: true
+            sort: true,
+            formatter: function (decimalValue) {
+              return decimalValue.toFixed(2);
+            }
           },{
             dataField: 'a' + (2 * index + 1),
             text: currentValue['name'] + ' ' + t('Maximum Load') + ' (' + currentValue['unit_of_measure'] + ')',
-            sort: true
+            sort: true,
+            formatter: function (decimalValue) {
+              return decimalValue.toFixed(2);
+            }
           })
         });