smiuser/hpos-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix error for hemocube device in select

Browse Source
This commit is contained in:
Pritimay Sarkar
2023-09-07 11:21:52 +05:30
parent cb0063e286
commit f269b12da1
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/Devices.js
View File

@@ -24,7 +24,7 @@ const Devices = () => {
setTestDate(null);
setCurTest(null);
setDays([...new Set(allTests
.filter((x) => x.deviceSerialNumber === value)
.filter((x) => x.deviceSerialNumber === value || x.deviceId === value)
.map(x => moment(x.testTime).format("YYYY-MM-DD")))]
.sort()
.reverse());
@@ -36,7 +36,7 @@ const Devices = () => {
setCurTestData(null);
setShowGraph(false);
setTests(allTests
.filter((x) => x.deviceSerialNumber === device && moment(x.testTime).isBetween(moment(value).startOf('day'), moment(value).endOf('day')))
.filter((x) => (x.deviceSerialNumber === device || x.deviceId === device) && moment(x.testTime).isBetween(moment(value).startOf('day'), moment(value).endOf('day')))
.map(x => x._id)
.sort());
}
@@ -70,8 +70,13 @@ const Devices = () => {
querySnapshot.forEach((document) => {
const hposTestData = document.data();
hposTests.push(hposTestData);
const { deviceSerialNumber } = hposTestData;
testDevices.add(deviceSerialNumber);
const { deviceType, deviceId, deviceSerialNumber } = hposTestData;
if (deviceType === 'HEMOCUBE' && deviceId) {
testDevices.add(deviceId);
}
if (deviceType !== 'HEMOCUBE' && deviceSerialNumber) {
testDevices.add(deviceSerialNumber);
}
});
const groups = [...testDevices];
setDevices(groups);