diff --git a/web/src/components/MyEMS/Meter/MeterCost.js b/web/src/components/MyEMS/Meter/MeterCost.js index 4b4f007a..61d91a3b 100644 --- a/web/src/components/MyEMS/Meter/MeterCost.js +++ b/web/src/components/MyEMS/Meter/MeterCost.js @@ -216,6 +216,15 @@ const MeterCost = ({ setRedirect, setRedirectUrl, t }) => { meter => meter.label.toLowerCase().includes(keyword) ); setFilteredMeterList(keyword.length ? filteredResult : meterList); + if (filteredResult.length > 0) { + setSelectedMeter(filteredResult[0].value); + // enable submit button + setSubmitButtonDisabled(false); + } else { + setSelectedMeter(undefined); + // disable submit button + setSubmitButtonDisabled(true); + }; }; let onComparisonTypeChange = ({ target }) => { diff --git a/web/src/components/MyEMS/Meter/MeterEnergy.js b/web/src/components/MyEMS/Meter/MeterEnergy.js index bcd4afde..1b4fcd9e 100644 --- a/web/src/components/MyEMS/Meter/MeterEnergy.js +++ b/web/src/components/MyEMS/Meter/MeterEnergy.js @@ -243,6 +243,15 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => { meter => meter.label.toLowerCase().includes(keyword) ); setFilteredMeterList(keyword.length ? filteredResult : meterList); + if (filteredResult.length > 0) { + setSelectedMeter(filteredResult[0].value); + // enable submit button + setSubmitButtonDisabled(false); + } else { + setSelectedMeter(undefined); + // disable submit button + setSubmitButtonDisabled(true); + }; }; let onBasePeriodBeginsDatetimeChange = (newDateTime) => { diff --git a/web/src/components/MyEMS/Meter/MeterSubmetersBalance.js b/web/src/components/MyEMS/Meter/MeterSubmetersBalance.js index e76f1d1f..fd79dc7e 100644 --- a/web/src/components/MyEMS/Meter/MeterSubmetersBalance.js +++ b/web/src/components/MyEMS/Meter/MeterSubmetersBalance.js @@ -212,6 +212,15 @@ const MeterSubmetersBalance = ({ setRedirect, setRedirectUrl, t }) => { meter => meter.label.toLowerCase().includes(keyword) ); setFilteredMeterList(keyword.length ? filteredResult : meterList); + if (filteredResult.length > 0) { + setSelectedMeter(filteredResult[0].value); + // enable submit button + setSubmitButtonDisabled(false); + } else { + setSelectedMeter(undefined); + // disable submit button + setSubmitButtonDisabled(true); + }; }; let onReportingPeriodBeginsDatetimeChange = (newDateTime) => { diff --git a/web/src/components/MyEMS/Meter/MeterTrend.js b/web/src/components/MyEMS/Meter/MeterTrend.js index 40837194..092435b7 100644 --- a/web/src/components/MyEMS/Meter/MeterTrend.js +++ b/web/src/components/MyEMS/Meter/MeterTrend.js @@ -201,6 +201,15 @@ const MeterTrend = ({ setRedirect, setRedirectUrl, t }) => { meter => meter.label.toLowerCase().includes(keyword) ); setFilteredMeterList(keyword.length ? filteredResult : meterList); + if (filteredResult.length > 0) { + setSelectedMeter(filteredResult[0].value); + // enable submit button + setSubmitButtonDisabled(false); + } else { + setSelectedMeter(undefined); + // disable submit button + setSubmitButtonDisabled(true); + }; }; let onReportingPeriodBeginsDatetimeChange = (newDateTime) => {