diff --git a/myems-api/excelexporters/equipmentcost.py b/myems-api/excelexporters/equipmentcost.py index d31e821f..39463177 100644 --- a/myems-api/excelexporters/equipmentcost.py +++ b/myems-api/excelexporters/equipmentcost.py @@ -427,7 +427,6 @@ def generate_excel(report, if len(time) > 0: has_data = True max_row = table_row + len(time) - print("max_row", max_row) if has_data: for i in range(0, len(time)): diff --git a/web/src/components/MyEMS/AuxiliarySystem/DistributionSystem.js b/web/src/components/MyEMS/AuxiliarySystem/DistributionSystem.js index e6cffb0b..5cf4ee7c 100644 --- a/web/src/components/MyEMS/AuxiliarySystem/DistributionSystem.js +++ b/web/src/components/MyEMS/AuxiliarySystem/DistributionSystem.js @@ -98,9 +98,6 @@ const DistributionSystem = ({ setRedirect, setRedirectUrl, t }) => { const labelClasses = 'ls text-uppercase text-600 font-weight-semi-bold mb-0'; let onDistributionSystemChange = (event) => { - // console.log('onDistributionSystemChange'); - // console.log(event.target.value); - setSelectedDistributionSystemID(event.target.value); distributionSystemList.forEach((currentItem, index) => { if (currentItem['value'] === event.target.value) { diff --git a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentCost.js b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentCost.js index 554c1cd4..53339207 100644 --- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentCost.js +++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentCost.js @@ -439,10 +439,10 @@ const CombinedEquipmentCost = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['startdatetime'] = currentTimestamp; let total_current_timstamp = 0.0; json['reporting_period']['values'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; total_current_timstamp += json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; }); - detailed_value['total'] = total_current_timstamp.toFixed(2); + detailed_value['total'] = total_current_timstamp; detailed_value_list.push(detailed_value); }); } @@ -452,10 +452,10 @@ const CombinedEquipmentCost = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['startdatetime'] = t('Subtotal'); let total_of_subtotals = 0.0; json['reporting_period']['subtotals'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; total_of_subtotals += currentValue }); - detailed_value['total'] = total_of_subtotals.toFixed(2); + detailed_value['total'] = total_of_subtotals; detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -470,13 +470,19 @@ const CombinedEquipmentCost = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); }); detailed_column_list.push({ dataField: 'total', text: t('Total') + ' (' + json['reporting_period']['total_unit'] + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); setDetailedDataTableColumns(detailed_column_list); @@ -488,10 +494,10 @@ const CombinedEquipmentCost = ({ setRedirect, setRedirectUrl, t }) => { associated_equipment_value['name'] = currentEquipmentName; let total = 0.0; 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['a' + energyCategoryIndex] = json['associated_equipment']['subtotals_array'][energyCategoryIndex][equipmentIndex]; total += json['associated_equipment']['subtotals_array'][energyCategoryIndex][equipmentIndex] }); - associated_equipment_value['total'] = total.toFixed(2); + associated_equipment_value['total'] = total; associated_equipment_value_list.push(associated_equipment_value); }); }; @@ -509,13 +515,19 @@ const CombinedEquipmentCost = ({ setRedirect, setRedirectUrl, t }) => { associated_equipment_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); }); associated_equipment_column_list.push({ dataField: 'total', text: t('Total') + ' (' + json['associated_equipment']['total_unit'] + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); setAssociatedEquipmentTableColumns(associated_equipment_column_list); diff --git a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEfficiency.js b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEfficiency.js index 8f794776..96f4b55a 100644 --- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEfficiency.js +++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEfficiency.js @@ -389,9 +389,9 @@ const CombinedEquipmentEfficiency = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['startdatetime'] = currentTimestamp; json['reporting_period_efficiency']['values'].forEach((currentValue, parameterIndex) => { if (json['reporting_period_efficiency']['values'][parameterIndex][timestampIndex] != null) { - detailed_value['a' + parameterIndex] = json['reporting_period_efficiency']['values'][parameterIndex][timestampIndex].toFixed(2); + detailed_value['a' + parameterIndex] = json['reporting_period_efficiency']['values'][parameterIndex][timestampIndex]; } else { - detailed_value['a' + parameterIndex] = ''; + detailed_value['a' + parameterIndex] = null; }; }); @@ -403,7 +403,7 @@ const CombinedEquipmentEfficiency = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Subtotal'); json['reporting_period_efficiency']['cumulations'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; }); detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -419,7 +419,14 @@ const CombinedEquipmentEfficiency = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - 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/CombinedEquipment/CombinedEquipmentEnergyCategory.js b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyCategory.js index c15269fa..ef820dab 100644 --- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyCategory.js +++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyCategory.js @@ -457,7 +457,7 @@ const CombinedEquipmentEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => detailed_value['id'] = timestampIndex; detailed_value['startdatetime'] = currentTimestamp; json['reporting_period']['values'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; }); detailed_value_list.push(detailed_value); }); @@ -467,7 +467,7 @@ const CombinedEquipmentEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Subtotal'); json['reporting_period']['subtotals'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; }); detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -483,7 +483,10 @@ const CombinedEquipmentEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }) }); setDetailedDataTableColumns(detailed_column_list); @@ -495,7 +498,7 @@ const CombinedEquipmentEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => 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['a' + energyCategoryIndex] = json['associated_equipment']['subtotals_array'][energyCategoryIndex][equipmentIndex]; }); associated_equipment_value_list.push(associated_equipment_value); }); @@ -514,7 +517,10 @@ const CombinedEquipmentEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => associated_equipment_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); }); diff --git a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyItem.js b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyItem.js index 37a34eeb..a8cd2b85 100644 --- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyItem.js +++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyItem.js @@ -418,7 +418,7 @@ const CombinedEquipmentEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = timestampIndex; detailed_value['startdatetime'] = currentTimestamp; json['reporting_period']['values'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; }); detailed_value_list.push(detailed_value); }); @@ -428,7 +428,7 @@ const CombinedEquipmentEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Subtotal'); json['reporting_period']['subtotals'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; }); detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -444,7 +444,10 @@ const CombinedEquipmentEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }) }); setDetailedDataTableColumns(detailed_column_list); @@ -456,7 +459,7 @@ const CombinedEquipmentEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { associated_equipment_value['id'] = equipmentIndex; associated_equipment_value['name'] = currentEquipmentName; json['associated_equipment']['energy_item_names'].forEach((currentValue, energyItemIndex) => { - associated_equipment_value['a' + energyItemIndex] = json['associated_equipment']['subtotals_array'][energyItemIndex][equipmentIndex].toFixed(2); + associated_equipment_value['a' + energyItemIndex] = json['associated_equipment']['subtotals_array'][energyItemIndex][equipmentIndex]; }); associated_equipment_value_list.push(associated_equipment_value); }); @@ -475,7 +478,10 @@ const CombinedEquipmentEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { associated_equipment_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); }); diff --git a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentIncome.js b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentIncome.js index 751fe5ae..722735e5 100644 --- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentIncome.js +++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentIncome.js @@ -403,10 +403,10 @@ const CombinedEquipmentIncome = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['startdatetime'] = currentTimestamp; let total_current_timstamp = 0.0; json['reporting_period']['values'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; total_current_timstamp += json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; }); - detailed_value['total'] = total_current_timstamp.toFixed(2); + detailed_value['total'] = total_current_timstamp; detailed_value_list.push(detailed_value); }); } @@ -416,10 +416,10 @@ const CombinedEquipmentIncome = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['startdatetime'] = t('Subtotal'); let total_of_subtotals = 0.0; json['reporting_period']['subtotals'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; total_of_subtotals += currentValue }); - detailed_value['total'] = total_of_subtotals.toFixed(2); + detailed_value['total'] = total_of_subtotals; detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -434,13 +434,19 @@ const CombinedEquipmentIncome = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); }); detailed_column_list.push({ dataField: 'total', text: t('Total') + ' (' + json['reporting_period']['total_unit'] + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); setDetailedDataTableColumns(detailed_column_list); @@ -452,10 +458,10 @@ const CombinedEquipmentIncome = ({ setRedirect, setRedirectUrl, t }) => { associated_equipment_value['name'] = currentEquipmentName; let total = 0.0; 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['a' + energyCategoryIndex] = json['associated_equipment']['subtotals_array'][energyCategoryIndex][equipmentIndex]; total += json['associated_equipment']['subtotals_array'][energyCategoryIndex][equipmentIndex] }); - associated_equipment_value['total'] = total.toFixed(2); + associated_equipment_value['total'] = total; associated_equipment_value_list.push(associated_equipment_value); }); }; @@ -473,13 +479,19 @@ const CombinedEquipmentIncome = ({ setRedirect, setRedirectUrl, t }) => { associated_equipment_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); }); associated_equipment_column_list.push({ dataField: 'total', text: t('Total') + ' (' + json['associated_equipment']['total_unit'] + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); setAssociatedEquipmentTableColumns(associated_equipment_column_list); diff --git a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentLoad.js b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentLoad.js index c1b0f107..7c628ef6 100644 --- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentLoad.js +++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentLoad.js @@ -387,15 +387,15 @@ const CombinedEquipmentLoad = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['startdatetime'] = currentTimestamp; json['reporting_period']['sub_averages'].forEach((currentValue, energyCategoryIndex) => { if (json['reporting_period']['sub_averages'][energyCategoryIndex][timestampIndex] != null) { - detailed_value['a' + 2 * energyCategoryIndex] = json['reporting_period']['sub_averages'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + 2 * energyCategoryIndex] = json['reporting_period']['sub_averages'][energyCategoryIndex][timestampIndex]; } else { - detailed_value['a' + 2 * energyCategoryIndex] = ''; + detailed_value['a' + 2 * energyCategoryIndex] = null; }; if (json['reporting_period']['sub_maximums'][energyCategoryIndex][timestampIndex] != null) { - detailed_value['a' + (2 * energyCategoryIndex + 1)] = json['reporting_period']['sub_maximums'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + (2 * energyCategoryIndex + 1)] = json['reporting_period']['sub_maximums'][energyCategoryIndex][timestampIndex]; } else { - detailed_value['a' + (2 * energyCategoryIndex + 1)] = ''; + detailed_value['a' + (2 * energyCategoryIndex + 1)] = null; }; }); detailed_value_list.push(detailed_value); @@ -415,12 +415,26 @@ const CombinedEquipmentLoad = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + 2 * index, text: currentValue + ' ' + t('Average Load') + ' (' + unit + '/H)', - sort: true + sort: true, + formatter: function (decimalValue) { + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } + } }); detailed_column_list.push({ dataField: 'a' + (2 * index + 1), text: currentValue + ' ' + t('Maximum Load') + ' (' + unit + '/H)', - sort: true + sort: true, + formatter: function (decimalValue) { + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } + } }); }); setDetailedDataTableColumns(detailed_column_list); @@ -433,14 +447,14 @@ const CombinedEquipmentLoad = ({ setRedirect, setRedirectUrl, t }) => { associated_equipment_value['name'] = currentEquipmentName; json['associated_equipment']['energy_category_names'].forEach((currentValue, energyCategoryIndex) => { if (json['associated_equipment']['sub_averages_array'][energyCategoryIndex][equipmentIndex] != null) { - associated_equipment_value['a' + 2 * energyCategoryIndex] = json['associated_equipment']['sub_averages_array'][energyCategoryIndex][equipmentIndex].toFixed(2); + associated_equipment_value['a' + 2 * energyCategoryIndex] = json['associated_equipment']['sub_averages_array'][energyCategoryIndex][equipmentIndex]; } else { - associated_equipment_value['a' + 2 * energyCategoryIndex] = ''; + associated_equipment_value['a' + 2 * energyCategoryIndex] = null }; if (json['associated_equipment']['sub_maximums_array'][energyCategoryIndex][equipmentIndex] != null) { - associated_equipment_value['a' + (2 * energyCategoryIndex + 1)] = json['associated_equipment']['sub_maximums_array'][energyCategoryIndex][equipmentIndex].toFixed(2); + associated_equipment_value['a' + (2 * energyCategoryIndex + 1)] = json['associated_equipment']['sub_maximums_array'][energyCategoryIndex][equipmentIndex]; } else { - associated_equipment_value['a' + (2 * energyCategoryIndex + 1)] = ''; + associated_equipment_value['a' + (2 * energyCategoryIndex + 1)] = null; }; }); @@ -461,12 +475,26 @@ const CombinedEquipmentLoad = ({ setRedirect, setRedirectUrl, t }) => { associated_equipment_column_list.push({ dataField: 'a' + 2 * index, text: currentValue + ' ' + t('Average Load') + ' (' + unit + '/H)', - sort: true + sort: true, + formatter: function (decimalValue) { + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } + } }); associated_equipment_column_list.push({ dataField: 'a' + (2 * index + 1), text: currentValue + ' ' + t('Maximum Load') + ' (' + unit + '/H)', - sort: true + sort: true, + formatter: function (decimalValue) { + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } + } }); }); diff --git a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentOutput.js b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentOutput.js index 77de5603..8828ede5 100644 --- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentOutput.js +++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentOutput.js @@ -381,7 +381,7 @@ const CombinedEquipmentOutput = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = timestampIndex; detailed_value['startdatetime'] = currentTimestamp; json['reporting_period']['values'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; }); detailed_value_list.push(detailed_value); }); @@ -391,7 +391,7 @@ const CombinedEquipmentOutput = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Subtotal'); json['reporting_period']['subtotals'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; }); detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -407,7 +407,10 @@ const CombinedEquipmentOutput = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }) }); setDetailedDataTableColumns(detailed_column_list); @@ -419,7 +422,7 @@ const CombinedEquipmentOutput = ({ setRedirect, setRedirectUrl, t }) => { 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['a' + energyCategoryIndex] = json['associated_equipment']['subtotals_array'][energyCategoryIndex][equipmentIndex]; }); associated_equipment_value_list.push(associated_equipment_value); }); @@ -438,7 +441,10 @@ const CombinedEquipmentOutput = ({ setRedirect, setRedirectUrl, t }) => { associated_equipment_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); }); diff --git a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentSaving.js b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentSaving.js index e78ac43e..3d6cdc0e 100644 --- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentSaving.js +++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentSaving.js @@ -420,7 +420,7 @@ const CombinedEquipmentSaving = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = timestampIndex; detailed_value['startdatetime'] = currentTimestamp; json['reporting_period']['values_saving'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values_saving'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values_saving'][energyCategoryIndex][timestampIndex]; }); detailed_value_list.push(detailed_value); }); @@ -430,7 +430,7 @@ const CombinedEquipmentSaving = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Subtotal'); json['reporting_period']['subtotals_saving'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; }); detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -446,7 +446,10 @@ const CombinedEquipmentSaving = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }) }); setDetailedDataTableColumns(detailed_column_list); @@ -458,7 +461,7 @@ const CombinedEquipmentSaving = ({ setRedirect, setRedirectUrl, t }) => { 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['a' + energyCategoryIndex] = json['associated_equipment']['subtotals_saving_array'][energyCategoryIndex][spaceIndex]; }); associated_equipment_value_list.push(associated_equipment_value); }); @@ -477,7 +480,10 @@ const CombinedEquipmentSaving = ({ setRedirect, setRedirectUrl, t }) => { associated_equipment_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); }); diff --git a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentStatistics.js b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentStatistics.js index 9c6dbb77..505c9a53 100644 --- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentStatistics.js +++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentStatistics.js @@ -392,7 +392,7 @@ const CombinedEquipmentStatistics = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = timestampIndex; detailed_value['startdatetime'] = currentTimestamp; json['reporting_period']['values'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; }); detailed_value_list.push(detailed_value); }); @@ -402,7 +402,7 @@ const CombinedEquipmentStatistics = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Subtotal'); json['reporting_period']['subtotals'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; }); detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -418,7 +418,10 @@ const CombinedEquipmentStatistics = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }) }); setDetailedDataTableColumns(detailed_column_list); @@ -429,7 +432,7 @@ const CombinedEquipmentStatistics = ({ setRedirect, setRedirectUrl, t }) => { 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['a' + energyCategoryIndex] = json['associated_equipment']['subtotals_array'][energyCategoryIndex][equipmentIndex]; }); associated_equipment_value_list.push(associated_equipment_value); }); @@ -448,7 +451,10 @@ const CombinedEquipmentStatistics = ({ setRedirect, setRedirectUrl, t }) => { associated_equipment_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); }); diff --git a/web/src/components/MyEMS/Equipment/EquipmentCost.js b/web/src/components/MyEMS/Equipment/EquipmentCost.js index 018864e4..03fc861f 100644 --- a/web/src/components/MyEMS/Equipment/EquipmentCost.js +++ b/web/src/components/MyEMS/Equipment/EquipmentCost.js @@ -434,10 +434,10 @@ const EquipmentCost = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['startdatetime'] = currentTimestamp; let total_current_timstamp = 0.0; json['reporting_period']['values'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; total_current_timstamp += json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; }); - detailed_value['total'] = total_current_timstamp.toFixed(2); + detailed_value['total'] = total_current_timstamp; detailed_value_list.push(detailed_value); }); }; @@ -447,10 +447,10 @@ const EquipmentCost = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['startdatetime'] = t('Subtotal'); let total_of_subtotals = 0.0; json['reporting_period']['subtotals'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; total_of_subtotals += currentValue }); - detailed_value['total'] = total_of_subtotals.toFixed(2); + detailed_value['total'] = total_of_subtotals; detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -465,13 +465,19 @@ const EquipmentCost = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); }); detailed_column_list.push({ dataField: 'total', text: t('Total') + ' (' + json['reporting_period']['total_unit'] + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); setDetailedDataTableColumns(detailed_column_list); diff --git a/web/src/components/MyEMS/Equipment/EquipmentEfficiency.js b/web/src/components/MyEMS/Equipment/EquipmentEfficiency.js index 913f30bb..fdff3106 100644 --- a/web/src/components/MyEMS/Equipment/EquipmentEfficiency.js +++ b/web/src/components/MyEMS/Equipment/EquipmentEfficiency.js @@ -381,9 +381,9 @@ const EquipmentEfficiency = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['startdatetime'] = currentTimestamp; json['reporting_period_efficiency']['values'].forEach((currentValue, parameterIndex) => { if (json['reporting_period_efficiency']['values'][parameterIndex][timestampIndex] != null) { - detailed_value['a' + parameterIndex] = json['reporting_period_efficiency']['values'][parameterIndex][timestampIndex].toFixed(2); + detailed_value['a' + parameterIndex] = json['reporting_period_efficiency']['values'][parameterIndex][timestampIndex]; } else { - detailed_value['a' + parameterIndex] = ''; + detailed_value['a' + parameterIndex] = null; }; }); @@ -395,7 +395,7 @@ const EquipmentEfficiency = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Subtotal'); json['reporting_period_efficiency']['cumulations'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; }); detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -411,7 +411,14 @@ const EquipmentEfficiency = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - 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/Equipment/EquipmentEnergyCategory.js b/web/src/components/MyEMS/Equipment/EquipmentEnergyCategory.js index 1a2850d3..0e290910 100644 --- a/web/src/components/MyEMS/Equipment/EquipmentEnergyCategory.js +++ b/web/src/components/MyEMS/Equipment/EquipmentEnergyCategory.js @@ -454,7 +454,7 @@ const EquipmentEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = timestampIndex; detailed_value['startdatetime'] = currentTimestamp; json['reporting_period']['values'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; }); detailed_value_list.push(detailed_value); }); @@ -464,7 +464,7 @@ const EquipmentEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Subtotal'); json['reporting_period']['subtotals'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; }); detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -480,7 +480,10 @@ const EquipmentEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }) }); setDetailedDataTableColumns(detailed_column_list); diff --git a/web/src/components/MyEMS/Equipment/EquipmentEnergyItem.js b/web/src/components/MyEMS/Equipment/EquipmentEnergyItem.js index e13b26b4..4e988b2f 100644 --- a/web/src/components/MyEMS/Equipment/EquipmentEnergyItem.js +++ b/web/src/components/MyEMS/Equipment/EquipmentEnergyItem.js @@ -414,7 +414,7 @@ const EquipmentEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = timestampIndex; detailed_value['startdatetime'] = currentTimestamp; json['reporting_period']['values'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; }); detailed_value_list.push(detailed_value); }); @@ -424,7 +424,7 @@ const EquipmentEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Subtotal'); json['reporting_period']['subtotals'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; }); detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -440,7 +440,10 @@ const EquipmentEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }) }); setDetailedDataTableColumns(detailed_column_list); diff --git a/web/src/components/MyEMS/Equipment/EquipmentIncome.js b/web/src/components/MyEMS/Equipment/EquipmentIncome.js index b904acbe..42f7c6b8 100644 --- a/web/src/components/MyEMS/Equipment/EquipmentIncome.js +++ b/web/src/components/MyEMS/Equipment/EquipmentIncome.js @@ -399,10 +399,10 @@ const EquipmentIncome = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['startdatetime'] = currentTimestamp; let total_current_timstamp = 0.0; json['reporting_period']['values'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; total_current_timstamp += json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; }); - detailed_value['total'] = total_current_timstamp.toFixed(2); + detailed_value['total'] = total_current_timstamp; detailed_value_list.push(detailed_value); }); }; @@ -412,10 +412,10 @@ const EquipmentIncome = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['startdatetime'] = t('Subtotal'); let total_of_subtotals = 0.0; json['reporting_period']['subtotals'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; total_of_subtotals += currentValue }); - detailed_value['total'] = total_of_subtotals.toFixed(2); + detailed_value['total'] = total_of_subtotals; detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -430,13 +430,19 @@ const EquipmentIncome = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); }); detailed_column_list.push({ dataField: 'total', text: t('Total') + ' (' + json['reporting_period']['total_unit'] + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); setDetailedDataTableColumns(detailed_column_list); diff --git a/web/src/components/MyEMS/Equipment/EquipmentLoad.js b/web/src/components/MyEMS/Equipment/EquipmentLoad.js index 7b295b10..48f5d8ea 100644 --- a/web/src/components/MyEMS/Equipment/EquipmentLoad.js +++ b/web/src/components/MyEMS/Equipment/EquipmentLoad.js @@ -382,15 +382,15 @@ const EquipmentLoad = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['startdatetime'] = currentTimestamp; json['reporting_period']['sub_averages'].forEach((currentValue, energyCategoryIndex) => { if (json['reporting_period']['sub_averages'][energyCategoryIndex][timestampIndex] != null) { - detailed_value['a' + 2 * energyCategoryIndex] = json['reporting_period']['sub_averages'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + 2 * energyCategoryIndex] = json['reporting_period']['sub_averages'][energyCategoryIndex][timestampIndex]; } else { - detailed_value['a' + 2 * energyCategoryIndex] = ''; + detailed_value['a' + 2 * energyCategoryIndex] = null; }; if (json['reporting_period']['sub_maximums'][energyCategoryIndex][timestampIndex] != null) { - detailed_value['a' + (2 * energyCategoryIndex + 1)] = json['reporting_period']['sub_maximums'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + (2 * energyCategoryIndex + 1)] = json['reporting_period']['sub_maximums'][energyCategoryIndex][timestampIndex]; } else { - detailed_value['a' + (2 * energyCategoryIndex + 1)] = ''; + detailed_value['a' + (2 * energyCategoryIndex + 1)] = null; }; }); detailed_value_list.push(detailed_value); @@ -410,12 +410,26 @@ const EquipmentLoad = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + 2 * index, text: currentValue + ' ' + t('Average Load') + ' (' + unit + '/H)', - sort: true + sort: true, + formatter: function (decimalValue) { + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } + } }); detailed_column_list.push({ dataField: 'a' + (2 * index + 1), text: currentValue + ' ' + t('Maximum Load') + ' (' + unit + '/H)', - 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/Equipment/EquipmentOutput.js b/web/src/components/MyEMS/Equipment/EquipmentOutput.js index e492ecf4..bf4a3091 100644 --- a/web/src/components/MyEMS/Equipment/EquipmentOutput.js +++ b/web/src/components/MyEMS/Equipment/EquipmentOutput.js @@ -376,7 +376,7 @@ const EquipmentOutput = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = timestampIndex; detailed_value['startdatetime'] = currentTimestamp; json['reporting_period']['values'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; }); detailed_value_list.push(detailed_value); }); @@ -386,7 +386,7 @@ const EquipmentOutput = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Subtotal'); json['reporting_period']['subtotals'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; }); detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -402,7 +402,10 @@ const EquipmentOutput = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }) }); setDetailedDataTableColumns(detailed_column_list); diff --git a/web/src/components/MyEMS/Equipment/EquipmentSaving.js b/web/src/components/MyEMS/Equipment/EquipmentSaving.js index 442e9616..98f5723d 100644 --- a/web/src/components/MyEMS/Equipment/EquipmentSaving.js +++ b/web/src/components/MyEMS/Equipment/EquipmentSaving.js @@ -416,7 +416,7 @@ const EquipmentSaving = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = timestampIndex; detailed_value['startdatetime'] = currentTimestamp; json['reporting_period']['values_saving'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values_saving'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values_saving'][energyCategoryIndex][timestampIndex]; }); detailed_value_list.push(detailed_value); }); @@ -426,7 +426,7 @@ const EquipmentSaving = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Subtotal'); json['reporting_period']['subtotals_saving'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; }); detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -442,7 +442,10 @@ const EquipmentSaving = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); }); setDetailedDataTableColumns(detailed_column_list); diff --git a/web/src/components/MyEMS/Equipment/EquipmentStatistics.js b/web/src/components/MyEMS/Equipment/EquipmentStatistics.js index 688b3c60..8db903c2 100644 --- a/web/src/components/MyEMS/Equipment/EquipmentStatistics.js +++ b/web/src/components/MyEMS/Equipment/EquipmentStatistics.js @@ -389,7 +389,7 @@ const EquipmentStatistics = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = timestampIndex; detailed_value['startdatetime'] = currentTimestamp; json['reporting_period']['values'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; }); detailed_value_list.push(detailed_value); }); @@ -399,7 +399,7 @@ const EquipmentStatistics = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Subtotal'); json['reporting_period']['subtotals'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; }); detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -415,7 +415,10 @@ const EquipmentStatistics = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }) }); setDetailedDataTableColumns(detailed_column_list); diff --git a/web/src/components/MyEMS/Meter/MeterCost.js b/web/src/components/MyEMS/Meter/MeterCost.js index 61d91a3b..e185c6f4 100644 --- a/web/src/components/MyEMS/Meter/MeterCost.js +++ b/web/src/components/MyEMS/Meter/MeterCost.js @@ -391,7 +391,10 @@ const MeterCost = ({ setRedirect, setRedirectUrl, t }) => { }, { dataField: 'a0', text: json['meter']['energy_category_name'] + ' (' + json['meter']['unit_of_measure'] + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }]); let detailed_value_list = []; @@ -399,14 +402,14 @@ const MeterCost = ({ setRedirect, setRedirectUrl, t }) => { let detailed_value = {}; detailed_value['id'] = timestampIndex; detailed_value['startdatetime'] = currentTimestamp; - detailed_value['a0'] = json['reporting_period']['values'][timestampIndex].toFixed(2); + detailed_value['a0'] = json['reporting_period']['values'][timestampIndex]; detailed_value_list.push(detailed_value); }); let detailed_value = {}; detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Total'); - detailed_value['a0'] = json['reporting_period']['total_in_category'].toFixed(2); + detailed_value['a0'] = json['reporting_period']['total_in_category']; detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); diff --git a/web/src/components/MyEMS/Meter/MeterEnergy.js b/web/src/components/MyEMS/Meter/MeterEnergy.js index cbe75898..ddd2e869 100644 --- a/web/src/components/MyEMS/Meter/MeterEnergy.js +++ b/web/src/components/MyEMS/Meter/MeterEnergy.js @@ -391,7 +391,10 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => { }, { dataField: 'a0', text: json['meter']['energy_category_name'] + ' (' + json['meter']['unit_of_measure'] + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }]); let detailed_value_list = []; @@ -399,14 +402,14 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => { let detailed_value = {}; detailed_value['id'] = timestampIndex; detailed_value['startdatetime'] = currentTimestamp; - detailed_value['a0'] = json['reporting_period']['values'][timestampIndex].toFixed(2); + detailed_value['a0'] = json['reporting_period']['values'][timestampIndex]; detailed_value_list.push(detailed_value); }); let detailed_value = {}; detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Total'); - detailed_value['a0'] = json['reporting_period']['total_in_category'].toFixed(2); + detailed_value['a0'] = json['reporting_period']['total_in_category']; detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); diff --git a/web/src/components/MyEMS/Meter/MeterSubmetersBalance.js b/web/src/components/MyEMS/Meter/MeterSubmetersBalance.js index 31710bfb..54905a2f 100644 --- a/web/src/components/MyEMS/Meter/MeterSubmetersBalance.js +++ b/web/src/components/MyEMS/Meter/MeterSubmetersBalance.js @@ -328,7 +328,10 @@ const MeterSubmetersBalance = ({ setRedirect, setRedirectUrl, t }) => { }, { dataField: 'a0', text: json['meter']['energy_category_name'] + ' (' + json['meter']['unit_of_measure'] + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }]); let detailed_value_list = []; @@ -336,14 +339,14 @@ const MeterSubmetersBalance = ({ setRedirect, setRedirectUrl, t }) => { let detailed_value = {}; detailed_value['id'] = timestampIndex; detailed_value['startdatetime'] = currentTimestamp; - detailed_value['a0'] = json['reporting_period']['difference_values'][timestampIndex].toFixed(2); + detailed_value['a0'] = json['reporting_period']['difference_values'][timestampIndex]; detailed_value_list.push(detailed_value); }); let detailed_value = {}; detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Total'); - detailed_value['a0'] = json['reporting_period']['difference_in_category'].toFixed(2); + detailed_value['a0'] = json['reporting_period']['difference_in_category']; detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); diff --git a/web/src/components/MyEMS/Meter/OfflineMeterCost.js b/web/src/components/MyEMS/Meter/OfflineMeterCost.js index 808befc6..96df9822 100644 --- a/web/src/components/MyEMS/Meter/OfflineMeterCost.js +++ b/web/src/components/MyEMS/Meter/OfflineMeterCost.js @@ -369,7 +369,10 @@ const OfflineMeterCost = ({ setRedirect, setRedirectUrl, t }) => { }, { dataField: 'a0', text: json['offline_meter']['energy_category_name'] + ' (' + json['offline_meter']['unit_of_measure'] + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }]); let detailed_value_list = []; @@ -377,14 +380,14 @@ const OfflineMeterCost = ({ setRedirect, setRedirectUrl, t }) => { let detailed_value = {}; detailed_value['id'] = timestampIndex; detailed_value['startdatetime'] = currentTimestamp; - detailed_value['a0'] = json['reporting_period']['values'][timestampIndex].toFixed(2); + detailed_value['a0'] = json['reporting_period']['values'][timestampIndex]; detailed_value_list.push(detailed_value); }); let detailed_value = {}; detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Total'); - detailed_value['a0'] = json['reporting_period']['total_in_category'].toFixed(2); + detailed_value['a0'] = json['reporting_period']['total_in_category']; detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); diff --git a/web/src/components/MyEMS/Meter/OfflineMeterEnergy.js b/web/src/components/MyEMS/Meter/OfflineMeterEnergy.js index 1cbbb13a..6d485a19 100644 --- a/web/src/components/MyEMS/Meter/OfflineMeterEnergy.js +++ b/web/src/components/MyEMS/Meter/OfflineMeterEnergy.js @@ -369,7 +369,10 @@ const OfflineMeterEnergy = ({ setRedirect, setRedirectUrl, t }) => { }, { dataField: 'a0', text: json['offline_meter']['energy_category_name'] + ' (' + json['offline_meter']['unit_of_measure'] + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }]); let detailed_value_list = []; @@ -377,14 +380,14 @@ const OfflineMeterEnergy = ({ setRedirect, setRedirectUrl, t }) => { let detailed_value = {}; detailed_value['id'] = timestampIndex; detailed_value['startdatetime'] = currentTimestamp; - detailed_value['a0'] = json['reporting_period']['values'][timestampIndex].toFixed(2); + detailed_value['a0'] = json['reporting_period']['values'][timestampIndex]; detailed_value_list.push(detailed_value); }); let detailed_value = {}; detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Total'); - detailed_value['a0'] = json['reporting_period']['total_in_category'].toFixed(2); + detailed_value['a0'] = json['reporting_period']['total_in_category']; detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); diff --git a/web/src/components/MyEMS/Meter/VirtualMeterCost.js b/web/src/components/MyEMS/Meter/VirtualMeterCost.js index 147a1dc0..91746b1d 100644 --- a/web/src/components/MyEMS/Meter/VirtualMeterCost.js +++ b/web/src/components/MyEMS/Meter/VirtualMeterCost.js @@ -369,7 +369,10 @@ const VirtualMeterCost = ({ setRedirect, setRedirectUrl, t }) => { }, { dataField: 'a0', text: json['virtual_meter']['energy_category_name'] + ' (' + json['virtual_meter']['unit_of_measure'] + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }]); let detailed_value_list = []; @@ -377,14 +380,14 @@ const VirtualMeterCost = ({ setRedirect, setRedirectUrl, t }) => { let detailed_value = {}; detailed_value['id'] = timestampIndex; detailed_value['startdatetime'] = currentTimestamp; - detailed_value['a0'] = json['reporting_period']['values'][timestampIndex].toFixed(2); + detailed_value['a0'] = json['reporting_period']['values'][timestampIndex]; detailed_value_list.push(detailed_value); }); let detailed_value = {}; detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Total'); - detailed_value['a0'] = json['reporting_period']['total_in_category'].toFixed(2); + detailed_value['a0'] = json['reporting_period']['total_in_category']; detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); diff --git a/web/src/components/MyEMS/Meter/VirtualMeterEnergy.js b/web/src/components/MyEMS/Meter/VirtualMeterEnergy.js index f014aaac..11915935 100644 --- a/web/src/components/MyEMS/Meter/VirtualMeterEnergy.js +++ b/web/src/components/MyEMS/Meter/VirtualMeterEnergy.js @@ -369,7 +369,10 @@ const VirtualMeterEnergy = ({ setRedirect, setRedirectUrl, t }) => { }, { dataField: 'a0', text: json['virtual_meter']['energy_category_name'] + ' (' + json['virtual_meter']['unit_of_measure'] + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }]); let detailed_value_list = []; @@ -377,14 +380,14 @@ const VirtualMeterEnergy = ({ setRedirect, setRedirectUrl, t }) => { let detailed_value = {}; detailed_value['id'] = timestampIndex; detailed_value['startdatetime'] = currentTimestamp; - detailed_value['a0'] = json['reporting_period']['values'][timestampIndex].toFixed(2); + detailed_value['a0'] = json['reporting_period']['values'][timestampIndex]; detailed_value_list.push(detailed_value); }); let detailed_value = {}; detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Total'); - detailed_value['a0'] = json['reporting_period']['total_in_category'].toFixed(2); + detailed_value['a0'] = json['reporting_period']['total_in_category']; detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); diff --git a/web/src/components/MyEMS/Shopfloor/ShopfloorCost.js b/web/src/components/MyEMS/Shopfloor/ShopfloorCost.js index e75fcd5e..8c2a1e5c 100644 --- a/web/src/components/MyEMS/Shopfloor/ShopfloorCost.js +++ b/web/src/components/MyEMS/Shopfloor/ShopfloorCost.js @@ -435,10 +435,10 @@ const ShopfloorCost = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['startdatetime'] = currentTimestamp; let total_current_timstamp = 0.0; json['reporting_period']['values'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; total_current_timstamp += json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; }); - detailed_value['total'] = total_current_timstamp.toFixed(2); + detailed_value['total'] = total_current_timstamp; detailed_value_list.push(detailed_value); }); }; @@ -448,10 +448,10 @@ const ShopfloorCost = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['startdatetime'] = t('Subtotal'); let total_of_subtotals = 0.0; json['reporting_period']['subtotals'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; total_of_subtotals += currentValue }); - detailed_value['total'] = total_of_subtotals.toFixed(2); + detailed_value['total'] = total_of_subtotals; detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -466,13 +466,19 @@ const ShopfloorCost = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); }); detailed_column_list.push({ dataField: 'total', text: t('Total') + ' (' + json['reporting_period']['total_unit'] + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); setDetailedDataTableColumns(detailed_column_list); diff --git a/web/src/components/MyEMS/Shopfloor/ShopfloorEnergyCategory.js b/web/src/components/MyEMS/Shopfloor/ShopfloorEnergyCategory.js index e9385053..907b79b7 100644 --- a/web/src/components/MyEMS/Shopfloor/ShopfloorEnergyCategory.js +++ b/web/src/components/MyEMS/Shopfloor/ShopfloorEnergyCategory.js @@ -455,7 +455,7 @@ const ShopfloorEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = timestampIndex; detailed_value['startdatetime'] = currentTimestamp; json['reporting_period']['values'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; }); detailed_value_list.push(detailed_value); }); @@ -465,7 +465,7 @@ const ShopfloorEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Subtotal'); json['reporting_period']['subtotals'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; }); detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -481,7 +481,10 @@ const ShopfloorEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }) }); setDetailedDataTableColumns(detailed_column_list); diff --git a/web/src/components/MyEMS/Shopfloor/ShopfloorEnergyItem.js b/web/src/components/MyEMS/Shopfloor/ShopfloorEnergyItem.js index b93f4463..9dd9a6ee 100644 --- a/web/src/components/MyEMS/Shopfloor/ShopfloorEnergyItem.js +++ b/web/src/components/MyEMS/Shopfloor/ShopfloorEnergyItem.js @@ -416,7 +416,7 @@ const ShopfloorEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = timestampIndex; detailed_value['startdatetime'] = currentTimestamp; json['reporting_period']['values'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; }); detailed_value_list.push(detailed_value); }); @@ -426,7 +426,7 @@ const ShopfloorEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Subtotal'); json['reporting_period']['subtotals'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; }); detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -442,7 +442,10 @@ const ShopfloorEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }) }); setDetailedDataTableColumns(detailed_column_list); diff --git a/web/src/components/MyEMS/Shopfloor/ShopfloorLoad.js b/web/src/components/MyEMS/Shopfloor/ShopfloorLoad.js index ef0d9590..4e7703f8 100644 --- a/web/src/components/MyEMS/Shopfloor/ShopfloorLoad.js +++ b/web/src/components/MyEMS/Shopfloor/ShopfloorLoad.js @@ -383,15 +383,15 @@ const ShopfloorLoad = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['startdatetime'] = currentTimestamp; json['reporting_period']['sub_averages'].forEach((currentValue, energyCategoryIndex) => { if (json['reporting_period']['sub_averages'][energyCategoryIndex][timestampIndex] != null) { - detailed_value['a' + 2 * energyCategoryIndex] = json['reporting_period']['sub_averages'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + 2 * energyCategoryIndex] = json['reporting_period']['sub_averages'][energyCategoryIndex][timestampIndex]; } else { - detailed_value['a' + 2 * energyCategoryIndex] = ''; + detailed_value['a' + 2 * energyCategoryIndex] = null; }; if (json['reporting_period']['sub_maximums'][energyCategoryIndex][timestampIndex] != null) { - detailed_value['a' + (2 * energyCategoryIndex + 1)] = json['reporting_period']['sub_maximums'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + (2 * energyCategoryIndex + 1)] = json['reporting_period']['sub_maximums'][energyCategoryIndex][timestampIndex]; } else { - detailed_value['a' + (2 * energyCategoryIndex + 1)] = ''; + detailed_value['a' + (2 * energyCategoryIndex + 1)] = null; }; }); detailed_value_list.push(detailed_value); @@ -411,12 +411,26 @@ const ShopfloorLoad = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + 2 * index, text: currentValue + ' ' + t('Average Load') + ' (' + unit + '/H)', - sort: true + sort: true, + formatter: function (decimalValue) { + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } + } }); detailed_column_list.push({ dataField: 'a' + (2 * index + 1), text: currentValue + ' ' + t('Maximum Load') + ' (' + unit + '/H)', - 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/ShopfloorSaving.js b/web/src/components/MyEMS/Shopfloor/ShopfloorSaving.js index c48d78a9..b1cbed02 100644 --- a/web/src/components/MyEMS/Shopfloor/ShopfloorSaving.js +++ b/web/src/components/MyEMS/Shopfloor/ShopfloorSaving.js @@ -417,7 +417,7 @@ const ShopfloorSaving = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = timestampIndex; detailed_value['startdatetime'] = currentTimestamp; json['reporting_period']['values_saving'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values_saving'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values_saving'][energyCategoryIndex][timestampIndex]; }); detailed_value_list.push(detailed_value); }); @@ -427,7 +427,7 @@ const ShopfloorSaving = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Subtotal'); json['reporting_period']['subtotals_saving'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; }); detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -443,7 +443,10 @@ const ShopfloorSaving = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }) }); setDetailedDataTableColumns(detailed_column_list); diff --git a/web/src/components/MyEMS/Shopfloor/ShopfloorStatistics.js b/web/src/components/MyEMS/Shopfloor/ShopfloorStatistics.js index db166f1f..46e66be0 100644 --- a/web/src/components/MyEMS/Shopfloor/ShopfloorStatistics.js +++ b/web/src/components/MyEMS/Shopfloor/ShopfloorStatistics.js @@ -393,7 +393,7 @@ const ShopfloorStatistics = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = timestampIndex; detailed_value['startdatetime'] = currentTimestamp; json['reporting_period']['values'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; }); detailed_value_list.push(detailed_value); }); @@ -403,7 +403,7 @@ const ShopfloorStatistics = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Subtotal'); json['reporting_period']['subtotals'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; }); detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -419,7 +419,10 @@ const ShopfloorStatistics = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }) }); setDetailedDataTableColumns(detailed_column_list); diff --git a/web/src/components/MyEMS/Space/SpaceCost.js b/web/src/components/MyEMS/Space/SpaceCost.js index c0d6a05e..287eea63 100644 --- a/web/src/components/MyEMS/Space/SpaceCost.js +++ b/web/src/components/MyEMS/Space/SpaceCost.js @@ -408,10 +408,10 @@ const SpaceCost = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['startdatetime'] = currentTimestamp; let total_current_timstamp = 0.0; json['reporting_period']['values'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; total_current_timstamp += json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; }); - detailed_value['total'] = total_current_timstamp.toFixed(2); + detailed_value['total'] = total_current_timstamp; detailed_value_list.push(detailed_value); }); }; @@ -421,10 +421,10 @@ const SpaceCost = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['startdatetime'] = t('Subtotal'); let total_of_subtotals = 0.0; json['reporting_period']['subtotals'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; total_of_subtotals += currentValue }); - detailed_value['total'] = total_of_subtotals.toFixed(2); + detailed_value['total'] = total_of_subtotals; detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -439,13 +439,19 @@ const SpaceCost = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); }); detailed_column_list.push({ dataField: 'total', text: t('Total') + ' (' + json['reporting_period']['total_unit'] + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); setDetailedDataTableColumns(detailed_column_list); @@ -457,10 +463,10 @@ const SpaceCost = ({ setRedirect, setRedirectUrl, t }) => { child_space_value['name'] = currentSpaceName; let total = 0.0; json['child_space']['energy_category_names'].forEach((currentValue, energyCategoryIndex) => { - child_space_value['a' + energyCategoryIndex] = json['child_space']['subtotals_array'][energyCategoryIndex][spaceIndex].toFixed(2); + child_space_value['a' + energyCategoryIndex] = json['child_space']['subtotals_array'][energyCategoryIndex][spaceIndex]; total += json['child_space']['subtotals_array'][energyCategoryIndex][spaceIndex] }); - child_space_value['total'] = total.toFixed(2); + child_space_value['total'] = total; child_space_value_list.push(child_space_value); }); }; @@ -478,13 +484,19 @@ const SpaceCost = ({ setRedirect, setRedirectUrl, t }) => { child_space_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); }); child_space_column_list.push({ dataField: 'total', text: t('Total') + ' (' + json['child_space']['total_unit'] + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); setChildSpacesTableColumns(child_space_column_list); diff --git a/web/src/components/MyEMS/Space/SpaceEfficiency.js b/web/src/components/MyEMS/Space/SpaceEfficiency.js index 44da2c5e..c0cb204c 100644 --- a/web/src/components/MyEMS/Space/SpaceEfficiency.js +++ b/web/src/components/MyEMS/Space/SpaceEfficiency.js @@ -304,9 +304,9 @@ const SpaceEfficiency = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['startdatetime'] = currentTimestamp; json['reporting_period_efficiency']['values'].forEach((currentValue, energyCategoryIndex) => { if (json['reporting_period_efficiency']['values'][energyCategoryIndex][timestampIndex] != null) { - detailed_value['a' + energyCategoryIndex] = json['reporting_period_efficiency']['values'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period_efficiency']['values'][energyCategoryIndex][timestampIndex]; } else { - detailed_value['a' + energyCategoryIndex] = ''; + detailed_value['a' + energyCategoryIndex] = null; }; }); @@ -319,9 +319,9 @@ const SpaceEfficiency = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['startdatetime'] = t('Subtotal'); json['reporting_period_efficiency']['cumulations'].forEach((currentValue, index) => { if (currentValue != null) { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; }else { - detailed_value['a' + index] = ''; + detailed_value['a' + index] = null; } }); detailed_value_list.push(detailed_value); @@ -338,7 +338,14 @@ const SpaceEfficiency = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - 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/Space/SpaceEnergyCategory.js b/web/src/components/MyEMS/Space/SpaceEnergyCategory.js index 642fa215..7c3c2c84 100644 --- a/web/src/components/MyEMS/Space/SpaceEnergyCategory.js +++ b/web/src/components/MyEMS/Space/SpaceEnergyCategory.js @@ -414,7 +414,7 @@ const SpaceEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = timestampIndex; detailed_value['startdatetime'] = currentTimestamp; json['reporting_period']['values'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; }); detailed_value_list.push(detailed_value); }); @@ -424,7 +424,7 @@ const SpaceEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Subtotal'); json['reporting_period']['subtotals'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; }); detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -440,7 +440,10 @@ const SpaceEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }) }); setDetailedDataTableColumns(detailed_column_list); @@ -452,7 +455,7 @@ const SpaceEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => { child_space_value['id'] = spaceIndex; child_space_value['name'] = currentSpaceName; json['child_space']['energy_category_names'].forEach((currentValue, energyCategoryIndex) => { - child_space_value['a' + energyCategoryIndex] = json['child_space']['subtotals_array'][energyCategoryIndex][spaceIndex].toFixed(2); + child_space_value['a' + energyCategoryIndex] = json['child_space']['subtotals_array'][energyCategoryIndex][spaceIndex]; }); child_space_value_list.push(child_space_value); }); @@ -471,7 +474,10 @@ const SpaceEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => { child_space_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); }); diff --git a/web/src/components/MyEMS/Space/SpaceEnergyItem.js b/web/src/components/MyEMS/Space/SpaceEnergyItem.js index 4617ef4c..921032bc 100644 --- a/web/src/components/MyEMS/Space/SpaceEnergyItem.js +++ b/web/src/components/MyEMS/Space/SpaceEnergyItem.js @@ -346,7 +346,7 @@ const SpaceEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = timestampIndex; detailed_value['startdatetime'] = currentTimestamp; json['reporting_period']['values'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; }); detailed_value_list.push(detailed_value); }); @@ -356,7 +356,7 @@ const SpaceEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Subtotal'); json['reporting_period']['subtotals'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; }); detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -372,7 +372,10 @@ const SpaceEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }) }); setDetailedDataTableColumns(detailed_column_list); @@ -384,7 +387,7 @@ const SpaceEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { child_space_value['id'] = spaceIndex; child_space_value['name'] = currentSpaceName; json['child_space']['energy_item_names'].forEach((currentValue, energyItemIndex) => { - child_space_value['a' + energyItemIndex] = json['child_space']['subtotals_array'][energyItemIndex][spaceIndex].toFixed(2); + child_space_value['a' + energyItemIndex] = json['child_space']['subtotals_array'][energyItemIndex][spaceIndex]; }); child_space_value_list.push(child_space_value); }); @@ -403,7 +406,10 @@ const SpaceEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { child_space_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); }); diff --git a/web/src/components/MyEMS/Space/SpaceIncome.js b/web/src/components/MyEMS/Space/SpaceIncome.js index 3572671e..ee028d97 100644 --- a/web/src/components/MyEMS/Space/SpaceIncome.js +++ b/web/src/components/MyEMS/Space/SpaceIncome.js @@ -332,10 +332,10 @@ const SpaceIncome = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['startdatetime'] = currentTimestamp; let total_current_timstamp = 0.0; json['reporting_period']['values'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; total_current_timstamp += json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; }); - detailed_value['total'] = total_current_timstamp.toFixed(2); + detailed_value['total'] = total_current_timstamp; detailed_value_list.push(detailed_value); }); }; @@ -345,10 +345,10 @@ const SpaceIncome = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['startdatetime'] = t('Subtotal'); let total_of_subtotals = 0.0; json['reporting_period']['subtotals'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; total_of_subtotals += currentValue }); - detailed_value['total'] = total_of_subtotals.toFixed(2); + detailed_value['total'] = total_of_subtotals; detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -363,13 +363,19 @@ const SpaceIncome = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); }); detailed_column_list.push({ dataField: 'total', text: t('Total') + ' (' + json['reporting_period']['total_unit'] + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); setDetailedDataTableColumns(detailed_column_list); @@ -381,10 +387,10 @@ const SpaceIncome = ({ setRedirect, setRedirectUrl, t }) => { child_space_value['name'] = currentSpaceName; let total = 0.0; json['child_space']['energy_category_names'].forEach((currentValue, energyCategoryIndex) => { - child_space_value['a' + energyCategoryIndex] = json['child_space']['subtotals_array'][energyCategoryIndex][spaceIndex].toFixed(2); + child_space_value['a' + energyCategoryIndex] = json['child_space']['subtotals_array'][energyCategoryIndex][spaceIndex]; total += json['child_space']['subtotals_array'][energyCategoryIndex][spaceIndex] }); - child_space_value['total'] = total.toFixed(2); + child_space_value['total'] = total; child_space_value_list.push(child_space_value); }); }; @@ -402,13 +408,19 @@ const SpaceIncome = ({ setRedirect, setRedirectUrl, t }) => { child_space_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); }); child_space_column_list.push({ dataField: 'total', text: t('Total') + ' (' + json['child_space']['total_unit'] + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); setChildSpacesTableColumns(child_space_column_list); diff --git a/web/src/components/MyEMS/Space/SpaceLoad.js b/web/src/components/MyEMS/Space/SpaceLoad.js index edf3e198..0ef284b7 100644 --- a/web/src/components/MyEMS/Space/SpaceLoad.js +++ b/web/src/components/MyEMS/Space/SpaceLoad.js @@ -311,15 +311,15 @@ const SpaceLoad = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['startdatetime'] = currentTimestamp; json['reporting_period']['sub_averages'].forEach((currentValue, energyCategoryIndex) => { if (json['reporting_period']['sub_averages'][energyCategoryIndex][timestampIndex] != null) { - detailed_value['a' + 2 * energyCategoryIndex] = json['reporting_period']['sub_averages'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + 2 * energyCategoryIndex] = json['reporting_period']['sub_averages'][energyCategoryIndex][timestampIndex]; } else { - detailed_value['a' + 2 * energyCategoryIndex] = ''; + detailed_value['a' + 2 * energyCategoryIndex] = null; }; if (json['reporting_period']['sub_maximums'][energyCategoryIndex][timestampIndex] != null) { - detailed_value['a' + (2 * energyCategoryIndex + 1)] = json['reporting_period']['sub_maximums'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + (2 * energyCategoryIndex + 1)] = json['reporting_period']['sub_maximums'][energyCategoryIndex][timestampIndex]; } else { - detailed_value['a' + (2 * energyCategoryIndex + 1)] = ''; + detailed_value['a' + (2 * energyCategoryIndex + 1)] = null; }; }); detailed_value_list.push(detailed_value); @@ -339,12 +339,26 @@ const SpaceLoad = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + 2 * index, text: currentValue + ' ' + t('Average Load') + ' (' + unit + '/H)', - sort: true + sort: true, + formatter: function (decimalValue) { + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } + } }); detailed_column_list.push({ dataField: 'a' + (2 * index + 1), text: currentValue + ' ' + t('Maximum Load') + ' (' + unit + '/H)', - 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/Space/SpaceOutput.js b/web/src/components/MyEMS/Space/SpaceOutput.js index 32982d15..7fa57506 100644 --- a/web/src/components/MyEMS/Space/SpaceOutput.js +++ b/web/src/components/MyEMS/Space/SpaceOutput.js @@ -309,7 +309,7 @@ const SpaceOutput = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = timestampIndex; detailed_value['startdatetime'] = currentTimestamp; json['reporting_period']['values'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; }); detailed_value_list.push(detailed_value); }); @@ -319,7 +319,7 @@ const SpaceOutput = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Subtotal'); json['reporting_period']['subtotals'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; }); detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -335,7 +335,10 @@ const SpaceOutput = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }) }); setDetailedDataTableColumns(detailed_column_list); @@ -347,7 +350,7 @@ const SpaceOutput = ({ setRedirect, setRedirectUrl, t }) => { child_space_value['id'] = spaceIndex; child_space_value['name'] = currentSpaceName; json['child_space']['energy_category_names'].forEach((currentValue, energyCategoryIndex) => { - child_space_value['a' + energyCategoryIndex] = json['child_space']['subtotals_array'][energyCategoryIndex][spaceIndex].toFixed(2); + child_space_value['a' + energyCategoryIndex] = json['child_space']['subtotals_array'][energyCategoryIndex][spaceIndex]; }); child_space_value_list.push(child_space_value); }); @@ -366,7 +369,10 @@ const SpaceOutput = ({ setRedirect, setRedirectUrl, t }) => { child_space_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); }); diff --git a/web/src/components/MyEMS/Space/SpaceSaving.js b/web/src/components/MyEMS/Space/SpaceSaving.js index a4c53544..1e710d88 100644 --- a/web/src/components/MyEMS/Space/SpaceSaving.js +++ b/web/src/components/MyEMS/Space/SpaceSaving.js @@ -350,7 +350,7 @@ const SpaceSaving = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = timestampIndex; detailed_value['startdatetime'] = currentTimestamp; json['reporting_period']['values_saving'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values_saving'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values_saving'][energyCategoryIndex][timestampIndex]; }); detailed_value_list.push(detailed_value); }); @@ -360,7 +360,7 @@ const SpaceSaving = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Subtotal'); json['reporting_period']['subtotals_saving'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; }); detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -376,7 +376,10 @@ const SpaceSaving = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }) }); setDetailedDataTableColumns(detailed_column_list); @@ -388,7 +391,7 @@ const SpaceSaving = ({ setRedirect, setRedirectUrl, t }) => { child_space_value['id'] = spaceIndex; child_space_value['name'] = currentSpaceName; json['child_space']['energy_category_names'].forEach((currentValue, energyCategoryIndex) => { - child_space_value['a' + energyCategoryIndex] = json['child_space']['subtotals_saving_array'][energyCategoryIndex][spaceIndex].toFixed(2); + child_space_value['a' + energyCategoryIndex] = json['child_space']['subtotals_saving_array'][energyCategoryIndex][spaceIndex]; }); child_space_value_list.push(child_space_value); }); @@ -407,7 +410,10 @@ const SpaceSaving = ({ setRedirect, setRedirectUrl, t }) => { child_space_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); }); diff --git a/web/src/components/MyEMS/Space/SpaceStatistics.js b/web/src/components/MyEMS/Space/SpaceStatistics.js index 1177464d..a6c48a4a 100644 --- a/web/src/components/MyEMS/Space/SpaceStatistics.js +++ b/web/src/components/MyEMS/Space/SpaceStatistics.js @@ -320,7 +320,7 @@ const SpaceStatistics = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = timestampIndex; detailed_value['startdatetime'] = currentTimestamp; json['reporting_period']['values'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; }); detailed_value_list.push(detailed_value); }); @@ -330,7 +330,7 @@ const SpaceStatistics = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Subtotal'); json['reporting_period']['subtotals'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; }); detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -346,7 +346,10 @@ const SpaceStatistics = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }) }); setDetailedDataTableColumns(detailed_column_list); diff --git a/web/src/components/MyEMS/Store/StoreCost.js b/web/src/components/MyEMS/Store/StoreCost.js index f2790e52..3aa691f2 100644 --- a/web/src/components/MyEMS/Store/StoreCost.js +++ b/web/src/components/MyEMS/Store/StoreCost.js @@ -436,10 +436,10 @@ const StoreCost = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['startdatetime'] = currentTimestamp; let total_current_timstamp = 0.0; json['reporting_period']['values'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; total_current_timstamp += json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; }); - detailed_value['total'] = total_current_timstamp.toFixed(2); + detailed_value['total'] = total_current_timstamp; detailed_value_list.push(detailed_value); }); }; @@ -449,10 +449,10 @@ const StoreCost = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['startdatetime'] = t('Subtotal'); let total_of_subtotals = 0.0; json['reporting_period']['subtotals'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; total_of_subtotals += currentValue }); - detailed_value['total'] = total_of_subtotals.toFixed(2); + detailed_value['total'] = total_of_subtotals; detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -467,13 +467,19 @@ const StoreCost = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); }); detailed_column_list.push({ dataField: 'total', text: t('Total') + ' (' + json['reporting_period']['total_unit'] + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); setDetailedDataTableColumns(detailed_column_list); diff --git a/web/src/components/MyEMS/Store/StoreEnergyCategory.js b/web/src/components/MyEMS/Store/StoreEnergyCategory.js index 36e1f544..87a64e46 100644 --- a/web/src/components/MyEMS/Store/StoreEnergyCategory.js +++ b/web/src/components/MyEMS/Store/StoreEnergyCategory.js @@ -455,7 +455,7 @@ const StoreEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = timestampIndex; detailed_value['startdatetime'] = currentTimestamp; json['reporting_period']['values'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; }); detailed_value_list.push(detailed_value); }); @@ -465,7 +465,7 @@ const StoreEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Subtotal'); json['reporting_period']['subtotals'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; }); detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -481,7 +481,10 @@ const StoreEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }) }); setDetailedDataTableColumns(detailed_column_list); diff --git a/web/src/components/MyEMS/Store/StoreEnergyItem.js b/web/src/components/MyEMS/Store/StoreEnergyItem.js index c4c864df..048df909 100644 --- a/web/src/components/MyEMS/Store/StoreEnergyItem.js +++ b/web/src/components/MyEMS/Store/StoreEnergyItem.js @@ -416,7 +416,7 @@ const StoreEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = timestampIndex; detailed_value['startdatetime'] = currentTimestamp; json['reporting_period']['values'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; }); detailed_value_list.push(detailed_value); }); @@ -426,7 +426,7 @@ const StoreEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Subtotal'); json['reporting_period']['subtotals'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; }); detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -442,7 +442,10 @@ const StoreEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }) }); setDetailedDataTableColumns(detailed_column_list); diff --git a/web/src/components/MyEMS/Store/StoreLoad.js b/web/src/components/MyEMS/Store/StoreLoad.js index 02fc9ed3..b5b837da 100644 --- a/web/src/components/MyEMS/Store/StoreLoad.js +++ b/web/src/components/MyEMS/Store/StoreLoad.js @@ -385,15 +385,15 @@ const StoreLoad = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['startdatetime'] = currentTimestamp; json['reporting_period']['sub_averages'].forEach((currentValue, energyCategoryIndex) => { if (json['reporting_period']['sub_averages'][energyCategoryIndex][timestampIndex] != null) { - detailed_value['a' + 2 * energyCategoryIndex] = json['reporting_period']['sub_averages'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + 2 * energyCategoryIndex] = json['reporting_period']['sub_averages'][energyCategoryIndex][timestampIndex]; } else { - detailed_value['a' + 2 * energyCategoryIndex] = ''; + detailed_value['a' + 2 * energyCategoryIndex] = null; }; if (json['reporting_period']['sub_maximums'][energyCategoryIndex][timestampIndex] != null) { - detailed_value['a' + (2 * energyCategoryIndex + 1)] = json['reporting_period']['sub_maximums'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + (2 * energyCategoryIndex + 1)] = json['reporting_period']['sub_maximums'][energyCategoryIndex][timestampIndex]; } else { - detailed_value['a' + (2 * energyCategoryIndex + 1)] = ''; + detailed_value['a' + (2 * energyCategoryIndex + 1)] = null; }; }); detailed_value_list.push(detailed_value); @@ -413,12 +413,26 @@ const StoreLoad = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + 2 * index, text: currentValue + ' ' + t('Average Load') + ' (' + unit + '/H)', - sort: true + sort: true, + formatter: function (decimalValue) { + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } + } }); detailed_column_list.push({ dataField: 'a' + (2 * index + 1), text: currentValue + ' ' + t('Maximum Load') + ' (' + unit + '/H)', - 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/Store/StoreSaving.js b/web/src/components/MyEMS/Store/StoreSaving.js index 102ee7e1..0fc90a16 100644 --- a/web/src/components/MyEMS/Store/StoreSaving.js +++ b/web/src/components/MyEMS/Store/StoreSaving.js @@ -417,7 +417,7 @@ const StoreSaving = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = timestampIndex; detailed_value['startdatetime'] = currentTimestamp; json['reporting_period']['values_saving'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values_saving'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values_saving'][energyCategoryIndex][timestampIndex]; }); detailed_value_list.push(detailed_value); }); @@ -427,7 +427,7 @@ const StoreSaving = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Subtotal'); json['reporting_period']['subtotals_saving'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; }); detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -443,7 +443,10 @@ const StoreSaving = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }) }); setDetailedDataTableColumns(detailed_column_list); diff --git a/web/src/components/MyEMS/Store/StoreStatistics.js b/web/src/components/MyEMS/Store/StoreStatistics.js index 8fdfb7ad..2623301f 100644 --- a/web/src/components/MyEMS/Store/StoreStatistics.js +++ b/web/src/components/MyEMS/Store/StoreStatistics.js @@ -392,7 +392,7 @@ const StoreStatistics = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = timestampIndex; detailed_value['startdatetime'] = currentTimestamp; json['reporting_period']['values'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; }); detailed_value_list.push(detailed_value); }); @@ -402,7 +402,7 @@ const StoreStatistics = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Subtotal'); json['reporting_period']['subtotals'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; }); detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -418,7 +418,10 @@ const StoreStatistics = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }) }); setDetailedDataTableColumns(detailed_column_list); diff --git a/web/src/components/MyEMS/Tenant/TenantCost.js b/web/src/components/MyEMS/Tenant/TenantCost.js index fa1f90c4..b4101bdf 100644 --- a/web/src/components/MyEMS/Tenant/TenantCost.js +++ b/web/src/components/MyEMS/Tenant/TenantCost.js @@ -436,10 +436,10 @@ const TenantCost = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['startdatetime'] = currentTimestamp; let total_current_timstamp = 0.0; json['reporting_period']['values'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; total_current_timstamp += json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; }); - detailed_value['total'] = total_current_timstamp.toFixed(2); + detailed_value['total'] = total_current_timstamp; detailed_value_list.push(detailed_value); }); }; @@ -449,10 +449,10 @@ const TenantCost = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['startdatetime'] = t('Subtotal'); let total_of_subtotals = 0.0; json['reporting_period']['subtotals'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; total_of_subtotals += currentValue }); - detailed_value['total'] = total_of_subtotals.toFixed(2); + detailed_value['total'] = total_of_subtotals; detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -467,13 +467,19 @@ const TenantCost = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); }); detailed_column_list.push({ dataField: 'total', text: t('Total') + ' (' + json['reporting_period']['total_unit'] + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); setDetailedDataTableColumns(detailed_column_list); diff --git a/web/src/components/MyEMS/Tenant/TenantEnergyCategory.js b/web/src/components/MyEMS/Tenant/TenantEnergyCategory.js index 2f947e49..937c246e 100644 --- a/web/src/components/MyEMS/Tenant/TenantEnergyCategory.js +++ b/web/src/components/MyEMS/Tenant/TenantEnergyCategory.js @@ -454,7 +454,7 @@ const TenantEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = timestampIndex; detailed_value['startdatetime'] = currentTimestamp; json['reporting_period']['values'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; }); detailed_value_list.push(detailed_value); }); @@ -464,7 +464,7 @@ const TenantEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Subtotal'); json['reporting_period']['subtotals'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; }); detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -480,7 +480,10 @@ const TenantEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }) }); setDetailedDataTableColumns(detailed_column_list); diff --git a/web/src/components/MyEMS/Tenant/TenantEnergyItem.js b/web/src/components/MyEMS/Tenant/TenantEnergyItem.js index 0492f35e..f7a0c7bb 100644 --- a/web/src/components/MyEMS/Tenant/TenantEnergyItem.js +++ b/web/src/components/MyEMS/Tenant/TenantEnergyItem.js @@ -416,7 +416,7 @@ const TenantEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = timestampIndex; detailed_value['startdatetime'] = currentTimestamp; json['reporting_period']['values'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; }); detailed_value_list.push(detailed_value); }); @@ -426,7 +426,7 @@ const TenantEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Subtotal'); json['reporting_period']['subtotals'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; }); detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -442,7 +442,10 @@ const TenantEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }) }); setDetailedDataTableColumns(detailed_column_list); diff --git a/web/src/components/MyEMS/Tenant/TenantLoad.js b/web/src/components/MyEMS/Tenant/TenantLoad.js index 2d708ab8..b5719d48 100644 --- a/web/src/components/MyEMS/Tenant/TenantLoad.js +++ b/web/src/components/MyEMS/Tenant/TenantLoad.js @@ -384,15 +384,15 @@ const TenantLoad = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['startdatetime'] = currentTimestamp; json['reporting_period']['sub_averages'].forEach((currentValue, energyCategoryIndex) => { if (json['reporting_period']['sub_averages'][energyCategoryIndex][timestampIndex] != null) { - detailed_value['a' + 2 * energyCategoryIndex] = json['reporting_period']['sub_averages'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + 2 * energyCategoryIndex] = json['reporting_period']['sub_averages'][energyCategoryIndex][timestampIndex]; } else { - detailed_value['a' + 2 * energyCategoryIndex] = ''; + detailed_value['a' + 2 * energyCategoryIndex] = null; }; if (json['reporting_period']['sub_maximums'][energyCategoryIndex][timestampIndex] != null) { - detailed_value['a' + (2 * energyCategoryIndex + 1)] = json['reporting_period']['sub_maximums'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + (2 * energyCategoryIndex + 1)] = json['reporting_period']['sub_maximums'][energyCategoryIndex][timestampIndex]; } else { - detailed_value['a' + (2 * energyCategoryIndex + 1)] = ''; + detailed_value['a' + (2 * energyCategoryIndex + 1)] = null; }; }); detailed_value_list.push(detailed_value); @@ -412,12 +412,26 @@ const TenantLoad = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + 2 * index, text: currentValue + ' ' + t('Average Load') + ' (' + unit + '/H)', - sort: true + sort: true, + formatter: function (decimalValue) { + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } + } }); detailed_column_list.push({ dataField: 'a' + (2 * index + 1), text: currentValue + ' ' + t('Maximum Load') + ' (' + unit + '/H)', - 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/Tenant/TenantSaving.js b/web/src/components/MyEMS/Tenant/TenantSaving.js index 28787a32..93ebbb3b 100644 --- a/web/src/components/MyEMS/Tenant/TenantSaving.js +++ b/web/src/components/MyEMS/Tenant/TenantSaving.js @@ -419,7 +419,7 @@ const TenantSaving = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = timestampIndex; detailed_value['startdatetime'] = currentTimestamp; json['reporting_period']['values_saving'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values_saving'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values_saving'][energyCategoryIndex][timestampIndex]; }); detailed_value_list.push(detailed_value); }); @@ -429,7 +429,7 @@ const TenantSaving = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Subtotal'); json['reporting_period']['subtotals_saving'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; }); detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -445,7 +445,10 @@ const TenantSaving = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }) }); setDetailedDataTableColumns(detailed_column_list); diff --git a/web/src/components/MyEMS/Tenant/TenantStatistics.js b/web/src/components/MyEMS/Tenant/TenantStatistics.js index 113b833a..f304ccc0 100644 --- a/web/src/components/MyEMS/Tenant/TenantStatistics.js +++ b/web/src/components/MyEMS/Tenant/TenantStatistics.js @@ -394,7 +394,7 @@ const TenantStatistics = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = timestampIndex; detailed_value['startdatetime'] = currentTimestamp; json['reporting_period']['values'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period']['values'][energyCategoryIndex][timestampIndex]; }); detailed_value_list.push(detailed_value); }); @@ -404,7 +404,7 @@ const TenantStatistics = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Subtotal'); json['reporting_period']['subtotals'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + detailed_value['a' + index] = currentValue; }); detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); @@ -420,7 +420,10 @@ const TenantStatistics = ({ setRedirect, setRedirectUrl, t }) => { detailed_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }) }); setDetailedDataTableColumns(detailed_column_list); diff --git a/web/src/components/MyEMS/dashboard/Dashboard.js b/web/src/components/MyEMS/dashboard/Dashboard.js index cfcc0e19..aac71bb5 100644 --- a/web/src/components/MyEMS/dashboard/Dashboard.js +++ b/web/src/components/MyEMS/dashboard/Dashboard.js @@ -50,10 +50,12 @@ const Dashboard = ({ setRedirect, setRedirectUrl, t }) => { const [spaceCostLineChartOptions, setSpaceCostLineChartOptions] = useState([]); const [detailedDataTableData, setDetailedDataTableData] = useState([]); - const [detailedDataTableColumns, setDetailedDataTableColumns] = useState([{dataField: 'startdatetime', text: t('Datetime'), sort: true}]); + const [detailedDataTableColumns, setDetailedDataTableColumns] = useState( + [{dataField: 'startdatetime', text: t('Datetime'), sort: true}]); const [childSpacesTableData, setChildSpacesTableData] = useState([]); - const [childSpacesTableColumns, setChildSpacesTableColumns] = useState([{dataField: 'name', text: t('Child Spaces'), sort: true }]); + const [childSpacesTableColumns, setChildSpacesTableColumns] = useState( + [{dataField: 'name', text: t('Child Spaces'), sort: true }]); useEffect(() => { @@ -319,8 +321,8 @@ const Dashboard = ({ setRedirect, setRedirectUrl, t }) => { child_space_value['id'] = spaceIndex; child_space_value['name'] = currentSpaceName; json['child_space_input']['energy_category_names'].forEach((currentValue, energyCategoryIndex) => { - child_space_value['a' + energyCategoryIndex] = json['child_space_input']['subtotals_array'][energyCategoryIndex][spaceIndex].toFixed(2); - child_space_value['b' + energyCategoryIndex] = json['child_space_cost']['subtotals_array'][energyCategoryIndex][spaceIndex].toFixed(2); + child_space_value['a' + energyCategoryIndex] = json['child_space_input']['subtotals_array'][energyCategoryIndex][spaceIndex]; + child_space_value['b' + energyCategoryIndex] = json['child_space_cost']['subtotals_array'][energyCategoryIndex][spaceIndex]; }); child_space_value_list.push(child_space_value); }); @@ -339,7 +341,10 @@ const Dashboard = ({ setRedirect, setRedirectUrl, t }) => { child_space_column_list.push({ dataField: 'a' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); }); json['child_space_cost']['energy_category_names'].forEach((currentValue, index) => { @@ -347,7 +352,10 @@ const Dashboard = ({ setRedirect, setRedirectUrl, t }) => { child_space_column_list.push({ dataField: 'b' + index, text: currentValue + ' (' + unit + ')', - sort: true + sort: true, + formatter: function (decimalValue) { + return decimalValue.toFixed(2); + } }); });