From 3efce5f6203a8b18f8567902944b1015d2ffc2cd Mon Sep 17 00:00:00 2001
From: "13621160019@163.com" <13621160019@163.com>
Date: Tue, 23 Mar 2021 18:09:52 +0800
Subject: [PATCH] added AssociatedEquipmentTable to CombinedEquipmentOutput
 report in web UI

---
 .../CombinedEquipmentOutput.js                | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentOutput.js b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentOutput.js
index 0a36042a..e2c78b24 100644
--- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentOutput.js
+++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentOutput.js
@@ -33,6 +33,7 @@ import { comparisonTypeOptions } from '../common/ComparisonTypeOptions';
 
 
 const DetailedDataTable = loadable(() => import('../common/DetailedDataTable'));
+const AssociatedEquipmentTable = loadable(() => import('../common/AssociatedEquipmentTable'));
 
 const CombinedEquipmentOutput = ({ setRedirect, setRedirectUrl, t }) => {
   let current_moment = moment();
@@ -87,6 +88,10 @@ const CombinedEquipmentOutput = ({ setRedirect, setRedirectUrl, t }) => {
 
   const [detailedDataTableData, setDetailedDataTableData] = useState([]);
   const [detailedDataTableColumns, setDetailedDataTableColumns] = useState([{dataField: 'startdatetime', text: t('Datetime'), sort: true}]);
+  
+  const [associatedEquipmentTableData, setAssociatedEquipmentTableData] = useState([]);
+  const [associatedEquipmentTableColumns, setAssociatedEquipmentTableColumns] = useState([{dataField: 'name', text: t('Associated Equipment'), sort: true }]);
+  
   const [excelBytesBase64, setExcelBytesBase64] = useState(undefined);
   
   useEffect(() => {
@@ -290,6 +295,7 @@ const CombinedEquipmentOutput = ({ setRedirect, setRedirectUrl, t }) => {
 
     // Reinitialize tables
     setDetailedDataTableData([]);
+    setAssociatedEquipmentTableData([]);
     
     let isResponseOK = false;
     fetch(APIBaseURL + '/reports/combinedequipmentoutput?' +
@@ -406,6 +412,38 @@ const CombinedEquipmentOutput = ({ setRedirect, setRedirectUrl, t }) => {
         });
         setDetailedDataTableColumns(detailed_column_list);
         
+        let associated_equipment_value_list = [];
+        if (json['associated_equipment']['associated_equipment_names_array'].length > 0) {
+          json['associated_equipment']['associated_equipment_names_array'][0].forEach((currentEquipmentName, equipmentIndex) => {
+            let associated_equipment_value = {};
+            associated_equipment_value['id'] = equipmentIndex;
+            associated_equipment_value['name'] = currentEquipmentName;
+            json['associated_equipment']['energy_category_names'].forEach((currentValue, energyCategoryIndex) => {
+              associated_equipment_value['a' + energyCategoryIndex] = json['associated_equipment']['subtotals_array'][energyCategoryIndex][equipmentIndex].toFixed(2);
+            });
+            associated_equipment_value_list.push(associated_equipment_value);
+          });
+        };
+
+        setAssociatedEquipmentTableData(associated_equipment_value_list);
+
+        let associated_equipment_column_list = [];
+        associated_equipment_column_list.push({
+          dataField: 'name',
+          text: t('Associated Equipment'),
+          sort: true
+        });
+        json['associated_equipment']['energy_category_names'].forEach((currentValue, index) => {
+          let unit = json['associated_equipment']['units'][index];
+          associated_equipment_column_list.push({
+            dataField: 'a' + index,
+            text: currentValue + ' (' + unit + ')',
+            sort: true
+          });
+        });
+
+        setAssociatedEquipmentTableColumns(associated_equipment_column_list);
+
         setExcelBytesBase64(json['excel_bytes_base64']);
 
         // enable submit button
@@ -615,6 +653,9 @@ const CombinedEquipmentOutput = ({ setRedirect, setRedirectUrl, t }) => {
       <br />
       <DetailedDataTable data={detailedDataTableData} title={t('Detailed Data')} columns={detailedDataTableColumns} pagesize={50} >
       </DetailedDataTable>
+      <br />
+      <AssociatedEquipmentTable data={associatedEquipmentTableData} title={t('Associated Equipment Data')} columns={associatedEquipmentTableColumns}>
+      </AssociatedEquipmentTable>
 
     </Fragment>
   );