From df57994c7aacb8a856815e9e9ddefd5578c7274a Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Thu, 4 Nov 2021 22:13:22 +0800 Subject: [PATCH] fixed NoneType errors in detailed data formatters of Web UI --- .../CombinedEquipmentBatch.js | 6 ++++- .../CombinedEquipmentCost.js | 24 +++++++++++++++---- .../CombinedEquipmentEnergyCategory.js | 12 ++++++++-- .../CombinedEquipmentEnergyItem.js | 6 ++++- .../CombinedEquipmentIncome.js | 24 +++++++++++++++---- .../CombinedEquipmentOutput.js | 12 ++++++++-- .../CombinedEquipmentSaving.js | 12 ++++++++-- .../CombinedEquipmentStatistics.js | 12 ++++++++-- .../MyEMS/Equipment/EquipmentBatch.js | 6 ++++- .../MyEMS/Equipment/EquipmentCost.js | 12 ++++++++-- .../Equipment/EquipmentEnergyCategory.js | 6 ++++- .../MyEMS/Equipment/EquipmentEnergyItem.js | 6 ++++- .../MyEMS/Equipment/EquipmentIncome.js | 12 ++++++++-- .../MyEMS/Equipment/EquipmentOutput.js | 6 ++++- .../MyEMS/Equipment/EquipmentSaving.js | 6 ++++- .../MyEMS/Equipment/EquipmentStatistics.js | 6 ++++- web/src/components/MyEMS/Meter/MeterCost.js | 6 ++++- web/src/components/MyEMS/Meter/MeterEnergy.js | 6 ++++- .../MyEMS/Meter/MeterSubmetersBalance.js | 6 ++++- .../MyEMS/Meter/OfflineMeterCost.js | 6 ++++- .../MyEMS/Meter/OfflineMeterEnergy.js | 6 ++++- .../MyEMS/Meter/VirtualMeterCost.js | 6 ++++- .../MyEMS/Meter/VirtualMeterEnergy.js | 6 ++++- .../MyEMS/Shopfloor/ShopfloorBatch.js | 6 ++++- .../MyEMS/Shopfloor/ShopfloorCost.js | 12 ++++++++-- .../Shopfloor/ShopfloorEnergyCategory.js | 6 ++++- .../MyEMS/Shopfloor/ShopfloorEnergyItem.js | 6 ++++- .../MyEMS/Shopfloor/ShopfloorSaving.js | 6 ++++- .../MyEMS/Shopfloor/ShopfloorStatistics.js | 6 ++++- web/src/components/MyEMS/Space/SpaceCost.js | 24 +++++++++++++++---- .../MyEMS/Space/SpaceEnergyCategory.js | 12 ++++++++-- .../components/MyEMS/Space/SpaceEnergyItem.js | 12 ++++++++-- web/src/components/MyEMS/Space/SpaceIncome.js | 24 +++++++++++++++---- web/src/components/MyEMS/Space/SpaceOutput.js | 12 ++++++++-- web/src/components/MyEMS/Space/SpaceSaving.js | 12 ++++++++-- .../components/MyEMS/Space/SpaceStatistics.js | 6 ++++- web/src/components/MyEMS/Store/StoreBatch.js | 6 ++++- web/src/components/MyEMS/Store/StoreCost.js | 12 ++++++++-- .../MyEMS/Store/StoreEnergyCategory.js | 6 ++++- .../components/MyEMS/Store/StoreEnergyItem.js | 6 ++++- web/src/components/MyEMS/Store/StoreSaving.js | 6 ++++- .../components/MyEMS/Store/StoreStatistics.js | 6 ++++- .../components/MyEMS/Tenant/TenantBatch.js | 12 ++++++++-- web/src/components/MyEMS/Tenant/TenantCost.js | 12 ++++++++-- .../MyEMS/Tenant/TenantEnergyCategory.js | 6 ++++- .../MyEMS/Tenant/TenantEnergyItem.js | 6 ++++- .../components/MyEMS/Tenant/TenantSaving.js | 6 ++++- .../MyEMS/Tenant/TenantStatistics.js | 6 ++++- .../components/MyEMS/dashboard/Dashboard.js | 12 ++++++++-- 49 files changed, 380 insertions(+), 76 deletions(-) diff --git a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentBatch.js b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentBatch.js index 6a120158..f9b4984f 100644 --- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentBatch.js +++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentBatch.js @@ -204,7 +204,11 @@ const CombinedEquipmentBatch = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue['name'] + ' (' + currentValue['unit_of_measure'] + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }) }); diff --git a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentCost.js b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentCost.js index 53339207..9ac68fa1 100644 --- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentCost.js +++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentCost.js @@ -472,7 +472,11 @@ const CombinedEquipmentCost = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }); }); @@ -481,7 +485,11 @@ const CombinedEquipmentCost = ({ setRedirect, setRedirectUrl, t }) => { text: t('Total') + ' (' + json['reporting_period']['total_unit'] + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }); setDetailedDataTableColumns(detailed_column_list); @@ -517,7 +525,11 @@ const CombinedEquipmentCost = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }); }); @@ -526,7 +538,11 @@ const CombinedEquipmentCost = ({ setRedirect, setRedirectUrl, t }) => { text: t('Total') + ' (' + json['associated_equipment']['total_unit'] + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }); diff --git a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyCategory.js b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyCategory.js index ef820dab..b7d42092 100644 --- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyCategory.js +++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyCategory.js @@ -485,7 +485,11 @@ const CombinedEquipmentEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }) }); @@ -519,7 +523,11 @@ const CombinedEquipmentEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }); }); diff --git a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyItem.js b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyItem.js index a8cd2b85..468d0584 100644 --- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyItem.js +++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyItem.js @@ -446,7 +446,11 @@ const CombinedEquipmentEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }) }); diff --git a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentIncome.js b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentIncome.js index 722735e5..42eb7866 100644 --- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentIncome.js +++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentIncome.js @@ -436,7 +436,11 @@ const CombinedEquipmentIncome = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }); }); @@ -445,7 +449,11 @@ const CombinedEquipmentIncome = ({ setRedirect, setRedirectUrl, t }) => { text: t('Total') + ' (' + json['reporting_period']['total_unit'] + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }); setDetailedDataTableColumns(detailed_column_list); @@ -481,7 +489,11 @@ const CombinedEquipmentIncome = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }); }); @@ -490,7 +502,11 @@ const CombinedEquipmentIncome = ({ setRedirect, setRedirectUrl, t }) => { text: t('Total') + ' (' + json['associated_equipment']['total_unit'] + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + 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 8828ede5..864a490b 100644 --- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentOutput.js +++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentOutput.js @@ -409,7 +409,11 @@ const CombinedEquipmentOutput = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }) }); @@ -443,7 +447,11 @@ const CombinedEquipmentOutput = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }); }); diff --git a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentSaving.js b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentSaving.js index 3d6cdc0e..086e8271 100644 --- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentSaving.js +++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentSaving.js @@ -448,7 +448,11 @@ const CombinedEquipmentSaving = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }) }); @@ -482,7 +486,11 @@ const CombinedEquipmentSaving = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }); }); diff --git a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentStatistics.js b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentStatistics.js index 505c9a53..34822858 100644 --- a/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentStatistics.js +++ b/web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentStatistics.js @@ -420,7 +420,11 @@ const CombinedEquipmentStatistics = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }) }); @@ -453,7 +457,11 @@ const CombinedEquipmentStatistics = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }); }); diff --git a/web/src/components/MyEMS/Equipment/EquipmentBatch.js b/web/src/components/MyEMS/Equipment/EquipmentBatch.js index ce2482df..5827a2de 100644 --- a/web/src/components/MyEMS/Equipment/EquipmentBatch.js +++ b/web/src/components/MyEMS/Equipment/EquipmentBatch.js @@ -204,7 +204,11 @@ const EquipmentBatch = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue['name'] + ' (' + currentValue['unit_of_measure'] + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }) }); diff --git a/web/src/components/MyEMS/Equipment/EquipmentCost.js b/web/src/components/MyEMS/Equipment/EquipmentCost.js index 03fc861f..932a0a35 100644 --- a/web/src/components/MyEMS/Equipment/EquipmentCost.js +++ b/web/src/components/MyEMS/Equipment/EquipmentCost.js @@ -467,7 +467,11 @@ const EquipmentCost = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }); }); @@ -476,7 +480,11 @@ const EquipmentCost = ({ setRedirect, setRedirectUrl, t }) => { text: t('Total') + ' (' + json['reporting_period']['total_unit'] + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + 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 0e290910..5e2b64ff 100644 --- a/web/src/components/MyEMS/Equipment/EquipmentEnergyCategory.js +++ b/web/src/components/MyEMS/Equipment/EquipmentEnergyCategory.js @@ -482,7 +482,11 @@ const EquipmentEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }) }); diff --git a/web/src/components/MyEMS/Equipment/EquipmentEnergyItem.js b/web/src/components/MyEMS/Equipment/EquipmentEnergyItem.js index 4e988b2f..3a0ab383 100644 --- a/web/src/components/MyEMS/Equipment/EquipmentEnergyItem.js +++ b/web/src/components/MyEMS/Equipment/EquipmentEnergyItem.js @@ -442,7 +442,11 @@ const EquipmentEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }) }); diff --git a/web/src/components/MyEMS/Equipment/EquipmentIncome.js b/web/src/components/MyEMS/Equipment/EquipmentIncome.js index 42f7c6b8..8d78981a 100644 --- a/web/src/components/MyEMS/Equipment/EquipmentIncome.js +++ b/web/src/components/MyEMS/Equipment/EquipmentIncome.js @@ -432,7 +432,11 @@ const EquipmentIncome = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }); }); @@ -441,7 +445,11 @@ const EquipmentIncome = ({ setRedirect, setRedirectUrl, t }) => { text: t('Total') + ' (' + json['reporting_period']['total_unit'] + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + 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 bf4a3091..d42922e1 100644 --- a/web/src/components/MyEMS/Equipment/EquipmentOutput.js +++ b/web/src/components/MyEMS/Equipment/EquipmentOutput.js @@ -404,7 +404,11 @@ const EquipmentOutput = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }) }); diff --git a/web/src/components/MyEMS/Equipment/EquipmentSaving.js b/web/src/components/MyEMS/Equipment/EquipmentSaving.js index 98f5723d..4731cefb 100644 --- a/web/src/components/MyEMS/Equipment/EquipmentSaving.js +++ b/web/src/components/MyEMS/Equipment/EquipmentSaving.js @@ -444,7 +444,11 @@ const EquipmentSaving = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }); }); diff --git a/web/src/components/MyEMS/Equipment/EquipmentStatistics.js b/web/src/components/MyEMS/Equipment/EquipmentStatistics.js index 8db903c2..88ff1b6f 100644 --- a/web/src/components/MyEMS/Equipment/EquipmentStatistics.js +++ b/web/src/components/MyEMS/Equipment/EquipmentStatistics.js @@ -417,7 +417,11 @@ const EquipmentStatistics = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }) }); diff --git a/web/src/components/MyEMS/Meter/MeterCost.js b/web/src/components/MyEMS/Meter/MeterCost.js index e185c6f4..4d6c91e0 100644 --- a/web/src/components/MyEMS/Meter/MeterCost.js +++ b/web/src/components/MyEMS/Meter/MeterCost.js @@ -393,7 +393,11 @@ const MeterCost = ({ setRedirect, setRedirectUrl, t }) => { text: json['meter']['energy_category_name'] + ' (' + json['meter']['unit_of_measure'] + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }]); diff --git a/web/src/components/MyEMS/Meter/MeterEnergy.js b/web/src/components/MyEMS/Meter/MeterEnergy.js index ddd2e869..90042aca 100644 --- a/web/src/components/MyEMS/Meter/MeterEnergy.js +++ b/web/src/components/MyEMS/Meter/MeterEnergy.js @@ -393,7 +393,11 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => { text: json['meter']['energy_category_name'] + ' (' + json['meter']['unit_of_measure'] + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }]); diff --git a/web/src/components/MyEMS/Meter/MeterSubmetersBalance.js b/web/src/components/MyEMS/Meter/MeterSubmetersBalance.js index 54905a2f..c66ecd59 100644 --- a/web/src/components/MyEMS/Meter/MeterSubmetersBalance.js +++ b/web/src/components/MyEMS/Meter/MeterSubmetersBalance.js @@ -330,7 +330,11 @@ const MeterSubmetersBalance = ({ setRedirect, setRedirectUrl, t }) => { text: json['meter']['energy_category_name'] + ' (' + json['meter']['unit_of_measure'] + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }]); diff --git a/web/src/components/MyEMS/Meter/OfflineMeterCost.js b/web/src/components/MyEMS/Meter/OfflineMeterCost.js index 96df9822..47d44e53 100644 --- a/web/src/components/MyEMS/Meter/OfflineMeterCost.js +++ b/web/src/components/MyEMS/Meter/OfflineMeterCost.js @@ -371,7 +371,11 @@ const OfflineMeterCost = ({ setRedirect, setRedirectUrl, t }) => { text: json['offline_meter']['energy_category_name'] + ' (' + json['offline_meter']['unit_of_measure'] + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }]); diff --git a/web/src/components/MyEMS/Meter/OfflineMeterEnergy.js b/web/src/components/MyEMS/Meter/OfflineMeterEnergy.js index 6d485a19..e233e462 100644 --- a/web/src/components/MyEMS/Meter/OfflineMeterEnergy.js +++ b/web/src/components/MyEMS/Meter/OfflineMeterEnergy.js @@ -371,7 +371,11 @@ const OfflineMeterEnergy = ({ setRedirect, setRedirectUrl, t }) => { text: json['offline_meter']['energy_category_name'] + ' (' + json['offline_meter']['unit_of_measure'] + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }]); diff --git a/web/src/components/MyEMS/Meter/VirtualMeterCost.js b/web/src/components/MyEMS/Meter/VirtualMeterCost.js index 91746b1d..48eb6910 100644 --- a/web/src/components/MyEMS/Meter/VirtualMeterCost.js +++ b/web/src/components/MyEMS/Meter/VirtualMeterCost.js @@ -371,7 +371,11 @@ const VirtualMeterCost = ({ setRedirect, setRedirectUrl, t }) => { text: json['virtual_meter']['energy_category_name'] + ' (' + json['virtual_meter']['unit_of_measure'] + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }]); diff --git a/web/src/components/MyEMS/Meter/VirtualMeterEnergy.js b/web/src/components/MyEMS/Meter/VirtualMeterEnergy.js index 11915935..284909dc 100644 --- a/web/src/components/MyEMS/Meter/VirtualMeterEnergy.js +++ b/web/src/components/MyEMS/Meter/VirtualMeterEnergy.js @@ -371,7 +371,11 @@ const VirtualMeterEnergy = ({ setRedirect, setRedirectUrl, t }) => { text: json['virtual_meter']['energy_category_name'] + ' (' + json['virtual_meter']['unit_of_measure'] + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }]); diff --git a/web/src/components/MyEMS/Shopfloor/ShopfloorBatch.js b/web/src/components/MyEMS/Shopfloor/ShopfloorBatch.js index 84dc0e5a..d58073ed 100644 --- a/web/src/components/MyEMS/Shopfloor/ShopfloorBatch.js +++ b/web/src/components/MyEMS/Shopfloor/ShopfloorBatch.js @@ -204,7 +204,11 @@ const ShopfloorBatch = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue['name'] + ' (' + currentValue['unit_of_measure'] + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }) }); diff --git a/web/src/components/MyEMS/Shopfloor/ShopfloorCost.js b/web/src/components/MyEMS/Shopfloor/ShopfloorCost.js index 8c2a1e5c..4afb66c4 100644 --- a/web/src/components/MyEMS/Shopfloor/ShopfloorCost.js +++ b/web/src/components/MyEMS/Shopfloor/ShopfloorCost.js @@ -468,7 +468,11 @@ const ShopfloorCost = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }); }); @@ -477,7 +481,11 @@ const ShopfloorCost = ({ setRedirect, setRedirectUrl, t }) => { text: t('Total') + ' (' + json['reporting_period']['total_unit'] + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }); setDetailedDataTableColumns(detailed_column_list); diff --git a/web/src/components/MyEMS/Shopfloor/ShopfloorEnergyCategory.js b/web/src/components/MyEMS/Shopfloor/ShopfloorEnergyCategory.js index 907b79b7..15f46b4b 100644 --- a/web/src/components/MyEMS/Shopfloor/ShopfloorEnergyCategory.js +++ b/web/src/components/MyEMS/Shopfloor/ShopfloorEnergyCategory.js @@ -483,7 +483,11 @@ const ShopfloorEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }) }); diff --git a/web/src/components/MyEMS/Shopfloor/ShopfloorEnergyItem.js b/web/src/components/MyEMS/Shopfloor/ShopfloorEnergyItem.js index 9dd9a6ee..aa70920d 100644 --- a/web/src/components/MyEMS/Shopfloor/ShopfloorEnergyItem.js +++ b/web/src/components/MyEMS/Shopfloor/ShopfloorEnergyItem.js @@ -444,7 +444,11 @@ const ShopfloorEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }) }); diff --git a/web/src/components/MyEMS/Shopfloor/ShopfloorSaving.js b/web/src/components/MyEMS/Shopfloor/ShopfloorSaving.js index b1cbed02..a043537a 100644 --- a/web/src/components/MyEMS/Shopfloor/ShopfloorSaving.js +++ b/web/src/components/MyEMS/Shopfloor/ShopfloorSaving.js @@ -445,7 +445,11 @@ const ShopfloorSaving = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }) }); diff --git a/web/src/components/MyEMS/Shopfloor/ShopfloorStatistics.js b/web/src/components/MyEMS/Shopfloor/ShopfloorStatistics.js index 46e66be0..91fc480a 100644 --- a/web/src/components/MyEMS/Shopfloor/ShopfloorStatistics.js +++ b/web/src/components/MyEMS/Shopfloor/ShopfloorStatistics.js @@ -421,7 +421,11 @@ const ShopfloorStatistics = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }) }); diff --git a/web/src/components/MyEMS/Space/SpaceCost.js b/web/src/components/MyEMS/Space/SpaceCost.js index 287eea63..f4ba07d9 100644 --- a/web/src/components/MyEMS/Space/SpaceCost.js +++ b/web/src/components/MyEMS/Space/SpaceCost.js @@ -441,7 +441,11 @@ const SpaceCost = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }); }); @@ -450,7 +454,11 @@ const SpaceCost = ({ setRedirect, setRedirectUrl, t }) => { text: t('Total') + ' (' + json['reporting_period']['total_unit'] + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }); setDetailedDataTableColumns(detailed_column_list); @@ -486,7 +494,11 @@ const SpaceCost = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }); }); @@ -495,7 +507,11 @@ const SpaceCost = ({ setRedirect, setRedirectUrl, t }) => { text: t('Total') + ' (' + json['child_space']['total_unit'] + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }); diff --git a/web/src/components/MyEMS/Space/SpaceEnergyCategory.js b/web/src/components/MyEMS/Space/SpaceEnergyCategory.js index 7c3c2c84..797b8975 100644 --- a/web/src/components/MyEMS/Space/SpaceEnergyCategory.js +++ b/web/src/components/MyEMS/Space/SpaceEnergyCategory.js @@ -442,7 +442,11 @@ const SpaceEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }) }); @@ -476,7 +480,11 @@ const SpaceEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }); }); diff --git a/web/src/components/MyEMS/Space/SpaceEnergyItem.js b/web/src/components/MyEMS/Space/SpaceEnergyItem.js index 921032bc..2115111f 100644 --- a/web/src/components/MyEMS/Space/SpaceEnergyItem.js +++ b/web/src/components/MyEMS/Space/SpaceEnergyItem.js @@ -374,7 +374,11 @@ const SpaceEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }) }); @@ -408,7 +412,11 @@ const SpaceEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }); }); diff --git a/web/src/components/MyEMS/Space/SpaceIncome.js b/web/src/components/MyEMS/Space/SpaceIncome.js index ee028d97..5b564522 100644 --- a/web/src/components/MyEMS/Space/SpaceIncome.js +++ b/web/src/components/MyEMS/Space/SpaceIncome.js @@ -365,7 +365,11 @@ const SpaceIncome = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }); }); @@ -374,7 +378,11 @@ const SpaceIncome = ({ setRedirect, setRedirectUrl, t }) => { text: t('Total') + ' (' + json['reporting_period']['total_unit'] + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }); setDetailedDataTableColumns(detailed_column_list); @@ -410,7 +418,11 @@ const SpaceIncome = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }); }); @@ -419,7 +431,11 @@ const SpaceIncome = ({ setRedirect, setRedirectUrl, t }) => { text: t('Total') + ' (' + json['child_space']['total_unit'] + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }); diff --git a/web/src/components/MyEMS/Space/SpaceOutput.js b/web/src/components/MyEMS/Space/SpaceOutput.js index 7fa57506..d3ed79c0 100644 --- a/web/src/components/MyEMS/Space/SpaceOutput.js +++ b/web/src/components/MyEMS/Space/SpaceOutput.js @@ -337,7 +337,11 @@ const SpaceOutput = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }) }); @@ -371,7 +375,11 @@ const SpaceOutput = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }); }); diff --git a/web/src/components/MyEMS/Space/SpaceSaving.js b/web/src/components/MyEMS/Space/SpaceSaving.js index 1e710d88..d72eee3f 100644 --- a/web/src/components/MyEMS/Space/SpaceSaving.js +++ b/web/src/components/MyEMS/Space/SpaceSaving.js @@ -378,7 +378,11 @@ const SpaceSaving = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }) }); @@ -412,7 +416,11 @@ const SpaceSaving = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }); }); diff --git a/web/src/components/MyEMS/Space/SpaceStatistics.js b/web/src/components/MyEMS/Space/SpaceStatistics.js index a6c48a4a..66900ab2 100644 --- a/web/src/components/MyEMS/Space/SpaceStatistics.js +++ b/web/src/components/MyEMS/Space/SpaceStatistics.js @@ -348,7 +348,11 @@ const SpaceStatistics = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }) }); diff --git a/web/src/components/MyEMS/Store/StoreBatch.js b/web/src/components/MyEMS/Store/StoreBatch.js index b8cb3a18..af3ac615 100644 --- a/web/src/components/MyEMS/Store/StoreBatch.js +++ b/web/src/components/MyEMS/Store/StoreBatch.js @@ -204,7 +204,11 @@ const StoreBatch = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue['name'] + ' (' + currentValue['unit_of_measure'] + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }) }); diff --git a/web/src/components/MyEMS/Store/StoreCost.js b/web/src/components/MyEMS/Store/StoreCost.js index 3aa691f2..4ad636d9 100644 --- a/web/src/components/MyEMS/Store/StoreCost.js +++ b/web/src/components/MyEMS/Store/StoreCost.js @@ -469,7 +469,11 @@ const StoreCost = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }); }); @@ -478,7 +482,11 @@ const StoreCost = ({ setRedirect, setRedirectUrl, t }) => { text: t('Total') + ' (' + json['reporting_period']['total_unit'] + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }); setDetailedDataTableColumns(detailed_column_list); diff --git a/web/src/components/MyEMS/Store/StoreEnergyCategory.js b/web/src/components/MyEMS/Store/StoreEnergyCategory.js index 87a64e46..d3f27db5 100644 --- a/web/src/components/MyEMS/Store/StoreEnergyCategory.js +++ b/web/src/components/MyEMS/Store/StoreEnergyCategory.js @@ -483,7 +483,11 @@ const StoreEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }) }); diff --git a/web/src/components/MyEMS/Store/StoreEnergyItem.js b/web/src/components/MyEMS/Store/StoreEnergyItem.js index 048df909..81d9d0d5 100644 --- a/web/src/components/MyEMS/Store/StoreEnergyItem.js +++ b/web/src/components/MyEMS/Store/StoreEnergyItem.js @@ -444,7 +444,11 @@ const StoreEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }) }); diff --git a/web/src/components/MyEMS/Store/StoreSaving.js b/web/src/components/MyEMS/Store/StoreSaving.js index 0fc90a16..e841ad21 100644 --- a/web/src/components/MyEMS/Store/StoreSaving.js +++ b/web/src/components/MyEMS/Store/StoreSaving.js @@ -445,7 +445,11 @@ const StoreSaving = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }) }); diff --git a/web/src/components/MyEMS/Store/StoreStatistics.js b/web/src/components/MyEMS/Store/StoreStatistics.js index 2623301f..e44a00c6 100644 --- a/web/src/components/MyEMS/Store/StoreStatistics.js +++ b/web/src/components/MyEMS/Store/StoreStatistics.js @@ -420,7 +420,11 @@ const StoreStatistics = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }) }); diff --git a/web/src/components/MyEMS/Tenant/TenantBatch.js b/web/src/components/MyEMS/Tenant/TenantBatch.js index bf2b3582..61011529 100644 --- a/web/src/components/MyEMS/Tenant/TenantBatch.js +++ b/web/src/components/MyEMS/Tenant/TenantBatch.js @@ -207,14 +207,22 @@ const TenantBatch = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue['name'] + ' (' + currentValue['unit_of_measure'] + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } },{ dataField: 'a' + (2 * index + 1), text: currentValue['name'] + ' ' + t('Maximum Load') + ' (' + currentValue['unit_of_measure'] + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }) }); diff --git a/web/src/components/MyEMS/Tenant/TenantCost.js b/web/src/components/MyEMS/Tenant/TenantCost.js index b4101bdf..356e4c0f 100644 --- a/web/src/components/MyEMS/Tenant/TenantCost.js +++ b/web/src/components/MyEMS/Tenant/TenantCost.js @@ -469,7 +469,11 @@ const TenantCost = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }); }); @@ -478,7 +482,11 @@ const TenantCost = ({ setRedirect, setRedirectUrl, t }) => { text: t('Total') + ' (' + json['reporting_period']['total_unit'] + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }); setDetailedDataTableColumns(detailed_column_list); diff --git a/web/src/components/MyEMS/Tenant/TenantEnergyCategory.js b/web/src/components/MyEMS/Tenant/TenantEnergyCategory.js index 937c246e..28af015a 100644 --- a/web/src/components/MyEMS/Tenant/TenantEnergyCategory.js +++ b/web/src/components/MyEMS/Tenant/TenantEnergyCategory.js @@ -482,7 +482,11 @@ const TenantEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }) }); diff --git a/web/src/components/MyEMS/Tenant/TenantEnergyItem.js b/web/src/components/MyEMS/Tenant/TenantEnergyItem.js index f7a0c7bb..73d927a2 100644 --- a/web/src/components/MyEMS/Tenant/TenantEnergyItem.js +++ b/web/src/components/MyEMS/Tenant/TenantEnergyItem.js @@ -444,7 +444,11 @@ const TenantEnergyItem = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }) }); diff --git a/web/src/components/MyEMS/Tenant/TenantSaving.js b/web/src/components/MyEMS/Tenant/TenantSaving.js index 93ebbb3b..d81a4e95 100644 --- a/web/src/components/MyEMS/Tenant/TenantSaving.js +++ b/web/src/components/MyEMS/Tenant/TenantSaving.js @@ -447,7 +447,11 @@ const TenantSaving = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }) }); diff --git a/web/src/components/MyEMS/Tenant/TenantStatistics.js b/web/src/components/MyEMS/Tenant/TenantStatistics.js index f304ccc0..fd07ad3a 100644 --- a/web/src/components/MyEMS/Tenant/TenantStatistics.js +++ b/web/src/components/MyEMS/Tenant/TenantStatistics.js @@ -422,7 +422,11 @@ const TenantStatistics = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }) }); diff --git a/web/src/components/MyEMS/dashboard/Dashboard.js b/web/src/components/MyEMS/dashboard/Dashboard.js index aac71bb5..4821fea4 100644 --- a/web/src/components/MyEMS/dashboard/Dashboard.js +++ b/web/src/components/MyEMS/dashboard/Dashboard.js @@ -343,7 +343,11 @@ const Dashboard = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }); }); @@ -354,7 +358,11 @@ const Dashboard = ({ setRedirect, setRedirectUrl, t }) => { text: currentValue + ' (' + unit + ')', sort: true, formatter: function (decimalValue) { - return decimalValue.toFixed(2); + if (decimalValue !== null) { + return decimalValue.toFixed(2); + } else { + return null; + } } }); });