diff --git a/web/src/components/MyEMS/Space/SpaceCost.js b/web/src/components/MyEMS/Space/SpaceCost.js index a59bc58f..bcbc5971 100644 --- a/web/src/components/MyEMS/Space/SpaceCost.js +++ b/web/src/components/MyEMS/Space/SpaceCost.js @@ -84,6 +84,7 @@ const SpaceCost = ({ setRedirect, setRedirectUrl, t }) => { const [spaceLineChartData, setSpaceLineChartData] = useState({}); const [spaceLineChartOptions, setSpaceLineChartOptions] = useState([]); const [childSpaceProportionList, setChildSpaceProportionList] = useState([]); + const [childSpacesProportionList, setChildSpacesProportionList] = useState([]); const [parameterLineChartLabels, setParameterLineChartLabels] = useState([]); const [parameterLineChartData, setParameterLineChartData] = useState({}); @@ -341,6 +342,29 @@ const SpaceCost = ({ setRedirect, setRedirectUrl, t }) => { }); setChildSpaceProportionList(childSpaceProportionArray); + let childSpacesProportionArray = []; + if (json['child_space']['child_space_names_array'].length > 0) { + let childSpacesProportionItem = {} + childSpacesProportionItem['data'] = [] + json['child_space']['child_space_names_array'][0].forEach((currentSpaceName, spaceIndex) => { + let total = 0.0; + json['child_space']['energy_category_names'].forEach((currentValue, energyCategoryIndex) => { + total += json['child_space']['subtotals_array'][energyCategoryIndex][spaceIndex] + // total = total.toFixed() + }); + let childSpacesProportionItemDataItem = {}; + childSpacesProportionItemDataItem['id'] = spaceIndex; + childSpacesProportionItemDataItem['name'] = currentSpaceName; + childSpacesProportionItemDataItem['value'] = total; + childSpacesProportionItemDataItem['color'] = "#"+((1<<24)*Math.random()|0).toString(16); + childSpacesProportionItem['data'].push(childSpacesProportionItemDataItem); + }); + childSpacesProportionItem['name'] = ""; + childSpacesProportionItem['unit'] = ""; + childSpacesProportionArray.push(childSpacesProportionItem); + }; + setChildSpacesProportionList(childSpacesProportionArray); + let timestamps = {} json['reporting_period']['timestamps'].forEach((currentValue, index) => { timestamps['a' + index] = currentValue; @@ -670,6 +694,17 @@ const SpaceCost = ({ setRedirect, setRedirectUrl, t }) => { /> ))} + {childSpacesProportionList.map(childSpacesProportionItem => ( +