Skip to content

[EAM-2836] Fix meter reading fields #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Amfgcp wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[EAM-2836] Fix meter reading fields #195

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions src/ui/pages/meter/MeterReadingSearch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React from 'react';
import EISPanel from 'eam-components/dist/ui/components/panel';
import EAMAutocomplete from 'eam-components/dist/ui/components/inputs-ng/EAMAutocomplete';
import WSMeters from "../../../tools/WSMeters";
import { createOnChangeHandler } from 'eam-components/dist/ui/components/inputs-ng/tools/input-tools';

class MeterReadingSearch extends React.Component {

Expand All @@ -17,24 +18,30 @@ class MeterReadingSearch extends React.Component {
<EAMAutocomplete
label={"Meter Code"}
value={searchCriteria.meterCode}
updateProperty={parentProps.updateSearchProperty}
valueKey="meterCode"
autocompleteHandler={WSMeters.autocompleteMeterCode}
onChange={parentProps.onChangeMeterCode}
onChange={createOnChangeHandler(
'meterCode',
'meterDesc',
null,
parentProps.updateSearchProperty,
parentProps.onChangeMeterCode
)}
desc={searchCriteria.meterDesc}
descKey="meterDesc"
barcodeScanner
id={`${idPrefix}METERCODE`}
/>
<EAMAutocomplete
label={"Equipment Code"}
value={searchCriteria.equipmentCode}
updateProperty={parentProps.updateSearchProperty}
valueKey="equipmentCode"
autocompleteHandler={WSMeters.autocompleteMeterEquipment}
onChange={parentProps.onChangeEquipmentCode}
onChange={createOnChangeHandler(
'equipmentCode',
'equipmentDesc',
null,
parentProps.updateSearchProperty,
parentProps.onChangeEquipmentCode
)}
desc={searchCriteria.equipmentDesc}
descKey="equipmentDesc"
barcodeScanner
id={`${idPrefix}EQUIPMENTCODE`}
/>
Expand Down