Changes EcventReportPage and ReportFilter to include custom fields

2 files changed, 33 insertions, 33 deletions

diff --git a/modern/src/reports/EventReportPage.js b/modern/src/reports/EventReportPage.js
index 6aaf4c55..fb037597 100644
--- a/modern/src/reports/EventReportPage.js
+++ b/modern/src/reports/EventReportPage.js
@@ -1,6 +1,7 @@
 import React, { useState } from 'react';
 import MainToolbar from '../MainToolbar';
 import { Grid, TableContainer, Table, TableRow, TableCell, TableHead, TableBody, Paper, makeStyles } from '@material-ui/core';
+import { FormControl, InputLabel, Select, MenuItem } from '@material-ui/core';
 import t from '../common/localization';
 import { formatPosition } from '../common/formatter';
 import ReportFilter from './ReportFilter';
@@ -24,14 +25,15 @@ const useStyles = makeStyles(theme => ({
 const EventReportPage = () => {
   const classes = useStyles();
   const [data, setData] = useState([]);
+  const [eventType, setEventType] = useState(['allEvents']);
 
-  const handleSubmit = async (deviceId, from, to, type) => {
+  const handleSubmit = async (deviceId, from, to) => {
     const query = new URLSearchParams({
       deviceId,
       from: from.toISOString(),
       to: to.toISOString(),
     });
-    type.map(t=>query.append('type',t));
+    eventType.map(t=>query.append('type',t));
     const response = await fetch(`/api/reports/events?${query.toString()}`, { headers: { Accept: 'application/json' } })
     
     if(response.ok) {
@@ -47,7 +49,31 @@ const EventReportPage = () => {
         <Grid container spacing={2}>
           <Grid item xs={12} md={3} lg={2}>
             <Paper className={classes.form}>
-              <ReportFilter reportType='event' handleSubmit={handleSubmit} />
+              <ReportFilter handleSubmit={handleSubmit}>
+                <FormControl variant="filled" margin="normal" fullWidth>
+                  <InputLabel>{t('reportEventTypes')}</InputLabel>
+                  <Select value={eventType} onChange={(e) => setEventType(e.target.value)} multiple>
+                    <MenuItem value="allEvents">{t('eventAll')}</MenuItem>
+                    <MenuItem value="deviceOnline">{t('eventDeviceOnline')}</MenuItem>
+                    <MenuItem value="deviceUnknown">{t('eventDeviceUnknown')}</MenuItem>
+                    <MenuItem value="deviceOffline">{t('eventDeviceOffline')}</MenuItem>
+                    <MenuItem value="deviceInactive">{t('eventDeviceInactive')}</MenuItem>
+                    <MenuItem value="deviceMoving">{t('eventDeviceMoving')}</MenuItem>
+                    <MenuItem value="deviceStopped">{t('eventDeviceStopped')}</MenuItem>
+                    <MenuItem value="deviceOverspeed">{t('eventDeviceOverspeed')}</MenuItem>
+                    <MenuItem value="deviceFuelDrop">{t('eventDeviceFuelDrop')}</MenuItem>
+                    <MenuItem value="commandResult">{t('eventCommandResult')}</MenuItem>
+                    <MenuItem value="geofenceEnter">{t('eventGeofenceEnter')}</MenuItem>
+                    <MenuItem value="geofenceExit">{t('eventGeofenceExit')}</MenuItem>
+                    <MenuItem value="alarm">{t('eventAlarm')}</MenuItem>
+                    <MenuItem value="ignitionOn">{t('eventIgnitionOn')}</MenuItem>
+                    <MenuItem value="ignitionOff">{t('eventIgnitionOff')}</MenuItem>
+                    <MenuItem value="maintenance">{t('eventMaintenance')}</MenuItem>
+                    <MenuItem value="textMessage">{t('eventTextMessage')}</MenuItem>
+                    <MenuItem value="driverChanged">{t('eventDriverChanged')}</MenuItem>
+                  </Select>
+                </FormControl>
+              </ReportFilter>
             </Paper>
           </Grid>
           <Grid item xs={12} md={9} lg={10}>
diff --git a/modern/src/reports/ReportFilter.js b/modern/src/reports/ReportFilter.js
index 032b1976..6fe6a529 100644
--- a/modern/src/reports/ReportFilter.js
+++ b/modern/src/reports/ReportFilter.js
@@ -11,7 +11,6 @@ const ReportFilter = (props) => {
   const [period, setPeriod] = useState('today');
   const [from, setFrom] = useState(moment().subtract(1, 'hour'));
   const [to, setTo] = useState(moment());
-  const [eventType, setEventType] = useState(['allEvents']);
 
   const handleShow = () => {
     let selectedFrom;
@@ -47,10 +46,7 @@ const ReportFilter = (props) => {
         break;
     }
 
-    if(reportType && reportType === 'event')
-      props.handleSubmit(deviceId, selectedFrom, selectedTo, eventType);
-    else
-      props.handleSubmit(deviceId, selectedFrom, selectedTo);
+    props.handleSubmit(deviceId, selectedFrom, selectedTo);
   }
 
   return (
@@ -63,31 +59,9 @@ const ReportFilter = (props) => {
           ))}
         </Select>
       </FormControl>
-      {reportType && reportType === 'event' && (
-        <FormControl variant="filled" margin="normal" fullWidth>
-          <InputLabel>{t('reportEventTypes')}</InputLabel>
-          <Select value={eventType} onChange={(e) => setEventType(e.target.value)} multiple>
-            <MenuItem value="allEvents">{t('eventAll')}</MenuItem>
-            <MenuItem value="deviceOnline">{t('eventDeviceOnline')}</MenuItem>
-            <MenuItem value="deviceUnknown">{t('eventDeviceUnknown')}</MenuItem>
-            <MenuItem value="deviceOffline">{t('eventDeviceOffline')}</MenuItem>
-            <MenuItem value="deviceInactive">{t('eventDeviceInactive')}</MenuItem>
-            <MenuItem value="deviceMoving">{t('eventDeviceMoving')}</MenuItem>
-            <MenuItem value="deviceStopped">{t('eventDeviceStopped')}</MenuItem>
-            <MenuItem value="deviceOverspeed">{t('eventDeviceOverspeed')}</MenuItem>
-            <MenuItem value="deviceFuelDrop">{t('eventDeviceFuelDrop')}</MenuItem>
-            <MenuItem value="commandResult">{t('eventCommandResult')}</MenuItem>
-            <MenuItem value="geofenceEnter">{t('eventGeofenceEnter')}</MenuItem>
-            <MenuItem value="geofenceExit">{t('eventGeofenceExit')}</MenuItem>
-            <MenuItem value="alarm">{t('eventAlarm')}</MenuItem>
-            <MenuItem value="ignitionOn">{t('eventIgnitionOn')}</MenuItem>
-            <MenuItem value="ignitionOff">{t('eventIgnitionOff')}</MenuItem>
-            <MenuItem value="maintenance">{t('eventMaintenance')}</MenuItem>
-            <MenuItem value="textMessage">{t('eventTextMessage')}</MenuItem>
-            <MenuItem value="driverChanged">{t('eventDriverChanged')}</MenuItem>
-          </Select>
-        </FormControl>
-      )}
+
+      {props.children}
+      
       <FormControl variant="filled" margin="normal" fullWidth>
         <InputLabel>{t('reportPeriod')}</InputLabel>
         <Select value={period} onChange={(e) => setPeriod(e.target.value)}>