diff --git a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentSaving.js b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentSaving.js index ca4e3859..e534c8b9 100644 --- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentSaving.js +++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentSaving.js @@ -34,6 +34,7 @@ import { comparisonTypeOptions } from '../common/ComparisonTypeOptions'; const DetailedDataTable = loadable(() => import('../common/DetailedDataTable')); +const AssociatedEquipmentTable = loadable(() => import('../common/AssociatedEquipmentTable')); const CombinedEquipmentSaving = ({ setRedirect, setRedirectUrl, t }) => { let current_moment = moment(); @@ -93,6 +94,10 @@ const CombinedEquipmentSaving = ({ 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(() => { @@ -297,6 +302,7 @@ const CombinedEquipmentSaving = ({ setRedirect, setRedirectUrl, t }) => { // Reinitialize tables setDetailedDataTableData([]); + setAssociatedEquipmentTableData([]); let isResponseOK = false; fetch(APIBaseURL + '/reports/combinedequipmentsaving?' + @@ -445,6 +451,38 @@ const CombinedEquipmentSaving = ({ 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, spaceIndex) => { + let associated_equipment_value = {}; + associated_equipment_value['id'] = spaceIndex; + associated_equipment_value['name'] = currentEquipmentName; + json['associated_equipment']['energy_category_names'].forEach((currentValue, energyCategoryIndex) => { + associated_equipment_value['a' + energyCategoryIndex] = json['associated_equipment']['subtotals_saving_array'][energyCategoryIndex][spaceIndex].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 @@ -676,6 +714,9 @@ const CombinedEquipmentSaving = ({ setRedirect, setRedirectUrl, t }) => {
+
+ + );