From b217a08d311a7c21e88594894c01651c31cbf18e Mon Sep 17 00:00:00 2001
From: Ashutosh Bishnoi <mail2bishnoi@gmail.com>
Date: Thu, 5 Nov 2020 17:04:13 +0530
Subject: adding custome field to Report Filter on the basis of report type

---
 modern/src/reports/RouteReportPage.js | 105 ++++------------------------------
 1 file changed, 12 insertions(+), 93 deletions(-)

(limited to 'modern/src/reports/RouteReportPage.js')

diff --git a/modern/src/reports/RouteReportPage.js b/modern/src/reports/RouteReportPage.js
index 5e57783..7d34c17 100644
--- a/modern/src/reports/RouteReportPage.js
+++ b/modern/src/reports/RouteReportPage.js
@@ -2,9 +2,8 @@ import React, { useState } from 'react';
 import MainToolbar from '../MainToolbar';
 import { Grid, TableContainer, Table, TableRow, TableCell, TableHead, TableBody, Paper, makeStyles, FormControl, InputLabel, Select, MenuItem, Button, TextField } from '@material-ui/core';
 import t from '../common/localization';
-import { useSelector } from 'react-redux';
-import moment from 'moment';
 import { formatPosition } from '../common/formatter';
+import ReportFilter from './ReportFilter';
 
 const useStyles = makeStyles(theme => ({
   root: {
@@ -24,57 +23,21 @@ const useStyles = makeStyles(theme => ({
 
 const RouteReportPage = () => {
   const classes = useStyles();
-  const devices = useSelector(state => Object.values(state.devices.items));
-  const [deviceId, setDeviceId] = useState();
-  const [period, setPeriod] = useState('today');
-  const [from, setFrom] = useState(moment().subtract(1, 'hour'));
-  const [to, setTo] = useState(moment());
   const [data, setData] = useState([]);
 
-  const handleShow = () => {
-    let selectedFrom;
-    let selectedTo;
-    switch (period) {
-      case 'today':
-        selectedFrom = moment().startOf('day');
-        selectedTo = moment().endOf('day');
-        break;
-      case 'yesterday':
-        selectedFrom = moment().subtract(1, 'day').startOf('day');
-        selectedTo = moment().subtract(1, 'day').endOf('day');
-        break;
-      case 'thisWeek':
-        selectedFrom = moment().startOf('week');
-        selectedTo = moment().endOf('week');
-        break;
-      case 'previousWeek':
-        selectedFrom = moment().subtract(1, 'week').startOf('week');
-        selectedTo = moment().subtract(1, 'week').endOf('week');
-        break;
-      case 'thisMonth':
-        selectedFrom = moment().startOf('month');
-        selectedTo = moment().endOf('month');
-        break;
-      case 'previousMonth':
-        selectedFrom = moment().subtract(1, 'month').startOf('month');
-        selectedTo = moment().subtract(1, 'month').endOf('month');
-        break;
-      default:
-        selectedFrom = from;
-        selectedTo = to;
-        break;
-    }
+  const handleSubmit = async (deviceId, from, to) => {
     const query = new URLSearchParams({
       deviceId,
-      from: selectedFrom.toISOString(),
-      to: selectedTo.toISOString(),
+      from: from.toISOString(),
+      to: to.toISOString(),
     });
-    fetch(`/api/reports/route?${query.toString()}`, { headers: { 'Accept': 'application/json' } })
-      .then(response => {
-        if (response.ok) {
-          response.json().then(setData);
-        }
-      });
+
+    const response = await fetch(`/api/reports/route?${query.toString()}`, { headers: { Accept: 'application/json' } })
+    
+    if(response.ok) {
+      const data = await response.json();
+      setData(data);
+    }
   }
 
   return (
@@ -84,51 +47,7 @@ const RouteReportPage = () => {
         <Grid container spacing={2}>
           <Grid item xs={12} md={3} lg={2}>
             <Paper className={classes.form}>
-              <FormControl variant='filled' margin='normal' fullWidth>
-                <InputLabel>{t('reportDevice')}</InputLabel>
-                <Select value={deviceId} onChange={e => setDeviceId(e.target.value)}>
-                  {devices.map((device) => (
-                    <MenuItem value={device.id}>{device.name}</MenuItem>
-                  ))}
-                </Select>
-              </FormControl>
-              <FormControl variant='filled' margin='normal' fullWidth>
-                <InputLabel>{t('reportPeriod')}</InputLabel>
-                <Select value={period} onChange={e => setPeriod(e.target.value)}>
-                  <MenuItem value='today'>{t('reportToday')}</MenuItem>
-                  <MenuItem value='yesterday'>{t('reportYesterday')}</MenuItem>
-                  <MenuItem value='thisWeek'>{t('reportThisWeek')}</MenuItem>
-                  <MenuItem value='previousWeek'>{t('reportPreviousWeek')}</MenuItem>
-                  <MenuItem value='thisMonth'>{t('reportThisMonth')}</MenuItem>
-                  <MenuItem value='previousMonth'>{t('reportPreviousMonth')}</MenuItem>
-                  <MenuItem value='custom'>{t('reportCustom')}</MenuItem>
-                </Select>
-              </FormControl>
-              {period === 'custom' &&
-                <TextField
-                  margin='normal'
-                  variant='filled'
-                  label={t('reportFrom')}
-                  type='datetime-local'
-                  value={from.format(moment.HTML5_FMT.DATETIME_LOCAL)}
-                  onChange={e => setFrom(moment(e.target.value, moment.HTML5_FMT.DATETIME_LOCAL))}
-                  fullWidth />
-              }
-              {period === 'custom' &&
-                <TextField
-                  margin='normal'
-                  variant='filled'
-                  label={t('reportTo')}
-                  type='datetime-local'
-                  value={to.format(moment.HTML5_FMT.DATETIME_LOCAL)}
-                  onChange={(e) => setTo(moment(e.target.value, moment.HTML5_FMT.DATETIME_LOCAL))}
-                  fullWidth />
-              }
-              <FormControl margin='normal' fullWidth>
-                <Button type='button' color='primary' variant='contained' disabled={!deviceId} onClick={handleShow}>
-                  {t('reportShow')}
-                </Button>
-              </FormControl>
+              <ReportFilter handleSubmit={handleSubmit} />
             </Paper>
           </Grid>
           <Grid item xs={12} md={9} lg={10}>
-- 
cgit v1.2.3


From 449e5e3190d22704a2cb4d7c5ce3e90eaaf16153 Mon Sep 17 00:00:00 2001
From: Ashutosh Bishnoi <mail2bishnoi@gmail.com>
Date: Sun, 8 Nov 2020 12:15:17 +0530
Subject: Report Layout Unification with seperate report layout component

---
 modern/src/reports/EventReportPage.js | 171 +++++++++++++++-------------------
 modern/src/reports/ReportFilter.js    |   3 +-
 modern/src/reports/ReportView.js      |  47 ++++++++++
 modern/src/reports/RouteReportPage.js | 116 +++++++++--------------
 4 files changed, 167 insertions(+), 170 deletions(-)
 create mode 100644 modern/src/reports/ReportView.js

(limited to 'modern/src/reports/RouteReportPage.js')

diff --git a/modern/src/reports/EventReportPage.js b/modern/src/reports/EventReportPage.js
index fb03759..cb3a06a 100644
--- a/modern/src/reports/EventReportPage.js
+++ b/modern/src/reports/EventReportPage.js
@@ -1,111 +1,88 @@
 import React, { useState } from 'react';
-import MainToolbar from '../MainToolbar';
-import { Grid, TableContainer, Table, TableRow, TableCell, TableHead, TableBody, Paper, makeStyles } from '@material-ui/core';
+import { TableContainer, Table, TableRow, TableCell, TableHead, TableBody, Paper } 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';
-
-const useStyles = makeStyles(theme => ({
-  root: {
-    height: '100%',
-    display: 'flex',
-    flexDirection: 'column',
-  },
-  content: {
-    flex: 1,
-    overflow: 'auto',
-    padding: theme.spacing(2),
-  },
-  form: {
-    padding: theme.spacing(1, 2, 2),
-  },
-}));
+import ReportView from './ReportView';
 
 const EventReportPage = () => {
-  const classes = useStyles();
-  const [data, setData] = useState([]);
-  const [eventType, setEventType] = useState(['allEvents']);
 
-  const handleSubmit = async (deviceId, from, to) => {
-    const query = new URLSearchParams({
-      deviceId,
-      from: from.toISOString(),
-      to: to.toISOString(),
-    });
-    eventType.map(t=>query.append('type',t));
-    const response = await fetch(`/api/reports/events?${query.toString()}`, { headers: { Accept: 'application/json' } })
+  const ReportFilterForm = ({ onResult }) => {
+    const [eventType, setEventType] = useState(['allEvents']);
+
+    const handleSubmit = async (deviceId, from, to) => {
+      const query = new URLSearchParams({
+        deviceId,
+        from: from.toISOString(),
+        to: to.toISOString(),
+      });
+      eventType.map(t=>query.append('type',t));
+      const response = await fetch(`/api/reports/events?${query.toString()}`, { headers: { Accept: 'application/json' } });
+      if(response.ok) {
+        onResult(await response.json());
+      }
+    }    
+    return (
+      <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>
+    );
+  }
+
+  const ReportListView = ({items}) => {
     
-    if(response.ok) {
-      const data = await response.json();
-      setData(data);
-    }
+    return (
+      <TableContainer component={Paper}>
+        <Table>
+          <TableHead>
+            <TableRow>
+              <TableCell>{t('positionFixTime')}</TableCell>
+              <TableCell>{t('sharedType')}</TableCell>
+              <TableCell>{t('sharedGeofence')}</TableCell>
+              <TableCell>{t('sharedMaintenance')}</TableCell>
+            </TableRow>
+          </TableHead>
+          <TableBody>
+            {items.map((item) => (
+              <TableRow key={item.id}>
+                <TableCell>
+                  {formatPosition(item, 'serverTime')}
+                </TableCell>
+                <TableCell>{item.type}</TableCell>
+                <TableCell>{}</TableCell>
+                <TableCell>{}</TableCell>
+              </TableRow>
+            ))}
+          </TableBody>
+        </Table>
+      </TableContainer>
+    );
   }
 
-  return (
-    <div className={classes.root}>
-      <MainToolbar />
-      <div className={classes.content}>
-        <Grid container spacing={2}>
-          <Grid item xs={12} md={3} lg={2}>
-            <Paper className={classes.form}>
-              <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}>
-            <TableContainer component={Paper}>
-              <Table>
-                <TableHead>
-                  <TableRow>
-                    <TableCell>{t('positionFixTime')}</TableCell>
-                    <TableCell>{t('sharedType')}</TableCell>
-                    <TableCell>{t('sharedGeofence')}</TableCell>
-                    <TableCell>{t('sharedMaintenance')}</TableCell>
-                  </TableRow>
-                </TableHead>
-                <TableBody>
-                  {data.map((item) => (
-                    <TableRow key={item.id}>
-                      <TableCell>
-                        {formatPosition(item, 'serverTime')}
-                      </TableCell>
-                      <TableCell>{item.type}</TableCell>
-                      <TableCell>{}</TableCell>
-                      <TableCell>{}</TableCell>
-                    </TableRow>
-                  ))}
-                </TableBody>
-              </Table>
-            </TableContainer>
-          </Grid>
-        </Grid>
-      </div>
-    </div>
-  );
+  return <ReportView reportFilterForm={ReportFilterForm} reportListView={ReportListView} />;
 }
 
 export default EventReportPage;
diff --git a/modern/src/reports/ReportFilter.js b/modern/src/reports/ReportFilter.js
index 6fe6a52..0d3223f 100644
--- a/modern/src/reports/ReportFilter.js
+++ b/modern/src/reports/ReportFilter.js
@@ -5,7 +5,6 @@ import { useSelector } from 'react-redux';
 import moment from 'moment';
 
 const ReportFilter = (props) => {
-  const { reportType } = props;
   const devices = useSelector((state) => Object.values(state.devices.items));
   const [deviceId, setDeviceId] = useState();
   const [period, setPeriod] = useState('today');
@@ -61,7 +60,7 @@ const ReportFilter = (props) => {
       </FormControl>
 
       {props.children}
-      
+
       <FormControl variant="filled" margin="normal" fullWidth>
         <InputLabel>{t('reportPeriod')}</InputLabel>
         <Select value={period} onChange={(e) => setPeriod(e.target.value)}>
diff --git a/modern/src/reports/ReportView.js b/modern/src/reports/ReportView.js
new file mode 100644
index 0000000..249ef72
--- /dev/null
+++ b/modern/src/reports/ReportView.js
@@ -0,0 +1,47 @@
+import React, { useState } from 'react';
+import { Grid, Paper, makeStyles } from '@material-ui/core';
+import MainToolbar from '../MainToolbar';
+
+const useStyles = makeStyles(theme => ({
+  root: {
+    height: '100%',
+    display: 'flex',
+    flexDirection: 'column',
+  },
+  content: {
+    flex: 1,
+    overflow: 'auto',
+    padding: theme.spacing(2),
+  },
+  form: {
+    padding: theme.spacing(1, 2, 2),
+  },
+}));
+
+const ReportView= ({ reportFilterForm:ReportFilterForm, reportListView:ReportListView }) => {
+  const classes = useStyles();
+  const [data, setData] = useState([]);
+  
+  const onResult = (data) => {
+    setData(data);
+  }
+  return (
+    <div className={classes.root}>
+      <MainToolbar />
+      <div className={classes.content}>
+        <Grid container spacing={2}>
+          <Grid item xs={12} md={3} lg={2}>
+            <Paper className={classes.form}>
+              <ReportFilterForm onResult={ onResult } />
+            </Paper>
+          </Grid>
+          <Grid item xs={12} md={9} lg={10}>
+            <ReportListView items={ data } />
+          </Grid>
+        </Grid>
+      </div>
+    </div>
+  );
+}
+
+export default ReportView;
diff --git a/modern/src/reports/RouteReportPage.js b/modern/src/reports/RouteReportPage.js
index 7d34c17..30272c4 100644
--- a/modern/src/reports/RouteReportPage.js
+++ b/modern/src/reports/RouteReportPage.js
@@ -1,85 +1,59 @@
 import React, { useState } from 'react';
-import MainToolbar from '../MainToolbar';
-import { Grid, TableContainer, Table, TableRow, TableCell, TableHead, TableBody, Paper, makeStyles, FormControl, InputLabel, Select, MenuItem, Button, TextField } from '@material-ui/core';
+import { TableContainer, Table, TableRow, TableCell, TableHead, TableBody, Paper } from '@material-ui/core';
 import t from '../common/localization';
 import { formatPosition } from '../common/formatter';
 import ReportFilter from './ReportFilter';
-
-const useStyles = makeStyles(theme => ({
-  root: {
-    height: '100%',
-    display: 'flex',
-    flexDirection: 'column',
-  },
-  content: {
-    flex: 1,
-    overflow: 'auto',
-    padding: theme.spacing(2),
-  },
-  form: {
-    padding: theme.spacing(1, 2, 2),
-  },
-}));
+import ReportView from './ReportView';
 
 const RouteReportPage = () => {
-  const classes = useStyles();
-  const [data, setData] = useState([]);
 
-  const handleSubmit = async (deviceId, from, to) => {
-    const query = new URLSearchParams({
-      deviceId,
-      from: from.toISOString(),
-      to: to.toISOString(),
-    });
+  const ReportFilterForm = ({ onResult }) => {
 
-    const response = await fetch(`/api/reports/route?${query.toString()}`, { headers: { Accept: 'application/json' } })
-    
-    if(response.ok) {
-      const data = await response.json();
-      setData(data);
+    const handleSubmit = async (deviceId, from, to) => {
+      const query = new URLSearchParams({
+        deviceId,
+        from: from.toISOString(),
+        to: to.toISOString(),
+      });
+      const response = await fetch(`/api/reports/route?${query.toString()}`, { headers: { Accept: 'application/json' } });
+      if(response.ok) {
+        onResult(await response.json());
+      }
     }
+    return <ReportFilter handleSubmit={handleSubmit} />;
+  }
+
+  const ReportListView = ({items}) => {
+    
+    return (
+      <TableContainer component={Paper}>
+        <Table>
+          <TableHead>
+            <TableRow>
+              <TableCell>{t('positionFixTime')}</TableCell>
+              <TableCell>{t('positionLatitude')}</TableCell>
+              <TableCell>{t('positionLongitude')}</TableCell>
+              <TableCell>{t('positionSpeed')}</TableCell>
+              <TableCell>{t('positionAddress')}</TableCell>
+            </TableRow>
+          </TableHead>
+          <TableBody>
+            {items.map((item) => (
+              <TableRow key={item.id}>
+                <TableCell>{formatPosition(item, 'fixTime')}</TableCell>
+                <TableCell>{formatPosition(item, 'latitude')}</TableCell>
+                <TableCell>{formatPosition(item, 'longitude')}</TableCell>
+                <TableCell>{formatPosition(item, 'speed')}</TableCell>
+                <TableCell>{formatPosition(item, 'address')}</TableCell>
+              </TableRow>
+            ))}
+          </TableBody>
+        </Table>
+      </TableContainer>
+    );
   }
 
-  return (
-    <div className={classes.root}>
-      <MainToolbar />
-      <div className={classes.content}>
-        <Grid container spacing={2}>
-          <Grid item xs={12} md={3} lg={2}>
-            <Paper className={classes.form}>
-              <ReportFilter handleSubmit={handleSubmit} />
-            </Paper>
-          </Grid>
-          <Grid item xs={12} md={9} lg={10}>
-            <TableContainer component={Paper}>
-              <Table>
-                <TableHead>
-                  <TableRow>
-                    <TableCell>{t('positionFixTime')}</TableCell>
-                    <TableCell>{t('positionLatitude')}</TableCell>
-                    <TableCell>{t('positionLongitude')}</TableCell>
-                    <TableCell>{t('positionSpeed')}</TableCell>
-                    <TableCell>{t('positionAddress')}</TableCell>
-                  </TableRow>
-                </TableHead>
-                <TableBody>
-                  {data.map((item) => (
-                    <TableRow key={item.id}>
-                      <TableCell>{formatPosition(item, 'fixTime')}</TableCell>
-                      <TableCell>{formatPosition(item, 'latitude')}</TableCell>
-                      <TableCell>{formatPosition(item, 'longitude')}</TableCell>
-                      <TableCell>{formatPosition(item, 'speed')}</TableCell>
-                      <TableCell>{formatPosition(item, 'address')}</TableCell>
-                    </TableRow>
-                  ))}
-                </TableBody>
-              </Table>
-            </TableContainer>
-          </Grid>
-        </Grid>
-      </div>
-    </div>
-  );
+  return <ReportView reportFilterForm={ReportFilterForm} reportListView={ReportListView} />;
 }
 
 export default RouteReportPage;
-- 
cgit v1.2.3


From b0e3a32b65d7485b43befb1feec173f2a575fcd0 Mon Sep 17 00:00:00 2001
From: Ashutosh Bishnoi <mail2bishnoi@gmail.com>
Date: Mon, 9 Nov 2020 12:30:41 +0530
Subject: Minor Report Layout Modifications

---
 modern/src/reports/EventReportPage.js  | 100 ++++++++++++++++-----------------
 modern/src/reports/ReportLayoutPage.js |  46 +++++++++++++++
 modern/src/reports/ReportView.js       |  47 ----------------
 modern/src/reports/RouteReportPage.js  |  41 +++++++-------
 4 files changed, 114 insertions(+), 120 deletions(-)
 create mode 100644 modern/src/reports/ReportLayoutPage.js
 delete mode 100644 modern/src/reports/ReportView.js

(limited to 'modern/src/reports/RouteReportPage.js')

diff --git a/modern/src/reports/EventReportPage.js b/modern/src/reports/EventReportPage.js
index cb3a06a..e9bca4e 100644
--- a/modern/src/reports/EventReportPage.js
+++ b/modern/src/reports/EventReportPage.js
@@ -4,57 +4,57 @@ import { FormControl, InputLabel, Select, MenuItem } from '@material-ui/core';
 import t from '../common/localization';
 import { formatPosition } from '../common/formatter';
 import ReportFilter from './ReportFilter';
-import ReportView from './ReportView';
+import ReportLayoutPage from './ReportLayoutPage';
 
-const EventReportPage = () => {
+const ReportFilterForm = ({ onResult }) => {
+  const [eventType, setEventType] = useState(['allEvents']);
 
-  const ReportFilterForm = ({ onResult }) => {
-    const [eventType, setEventType] = useState(['allEvents']);
+  const handleSubmit = async (deviceId, from, to) => {
+    const query = new URLSearchParams({
+      deviceId,
+      from: from.toISOString(),
+      to: to.toISOString(),
+    });
+    eventType.map(t=>query.append('type',t));
+    const response = await fetch(`/api/reports/events?${query.toString()}`, { headers: { Accept: 'application/json' } });
+    if(response.ok) {
+      onResult(await response.json());
+    }
+  }    
+  return (
+    <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>
+  );
+}
 
-    const handleSubmit = async (deviceId, from, to) => {
-      const query = new URLSearchParams({
-        deviceId,
-        from: from.toISOString(),
-        to: to.toISOString(),
-      });
-      eventType.map(t=>query.append('type',t));
-      const response = await fetch(`/api/reports/events?${query.toString()}`, { headers: { Accept: 'application/json' } });
-      if(response.ok) {
-        onResult(await response.json());
-      }
-    }    
-    return (
-      <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>
-    );
-  }
+const EventReportPage = () => {
+  const [items, setItems] = useState([]);
 
-  const ReportListView = ({items}) => {
-    
-    return (
+  return (
+    <ReportLayoutPage reportFilterForm={ReportFilterForm} setItems={setItems}>
       <TableContainer component={Paper}>
         <Table>
           <TableHead>
@@ -79,10 +79,8 @@ const EventReportPage = () => {
           </TableBody>
         </Table>
       </TableContainer>
-    );
-  }
-
-  return <ReportView reportFilterForm={ReportFilterForm} reportListView={ReportListView} />;
+    </ReportLayoutPage>
+  );
 }
 
 export default EventReportPage;
diff --git a/modern/src/reports/ReportLayoutPage.js b/modern/src/reports/ReportLayoutPage.js
new file mode 100644
index 0000000..57a2cef
--- /dev/null
+++ b/modern/src/reports/ReportLayoutPage.js
@@ -0,0 +1,46 @@
+import React, { useState } from 'react';
+import { Grid, Paper, makeStyles } from '@material-ui/core';
+import MainToolbar from '../MainToolbar';
+
+const useStyles = makeStyles(theme => ({
+  root: {
+    height: '100%',
+    display: 'flex',
+    flexDirection: 'column',
+  },
+  content: {
+    flex: 1,
+    overflow: 'auto',
+    padding: theme.spacing(2),
+  },
+  form: {
+    padding: theme.spacing(1, 2, 2),
+  },
+}));
+
+const ReportLayoutPage = ({ reportFilterForm:ReportFilterForm, setItems, ...rest }) => {
+  const classes = useStyles();
+
+  const onResult = (data) => {
+    setItems(data);
+  }
+  return (
+    <div className={classes.root}>
+      <MainToolbar />
+      <div className={classes.content}>
+        <Grid container spacing={2}>
+          <Grid item xs={12} md={3} lg={2}>
+            <Paper className={classes.form}>
+              <ReportFilterForm onResult={ onResult } />
+            </Paper>
+          </Grid>
+          <Grid item xs={12} md={9} lg={10}>
+            {rest.children}
+          </Grid>
+        </Grid>
+      </div>
+    </div>
+  );
+}
+
+export default ReportLayoutPage;
diff --git a/modern/src/reports/ReportView.js b/modern/src/reports/ReportView.js
deleted file mode 100644
index 249ef72..0000000
--- a/modern/src/reports/ReportView.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import React, { useState } from 'react';
-import { Grid, Paper, makeStyles } from '@material-ui/core';
-import MainToolbar from '../MainToolbar';
-
-const useStyles = makeStyles(theme => ({
-  root: {
-    height: '100%',
-    display: 'flex',
-    flexDirection: 'column',
-  },
-  content: {
-    flex: 1,
-    overflow: 'auto',
-    padding: theme.spacing(2),
-  },
-  form: {
-    padding: theme.spacing(1, 2, 2),
-  },
-}));
-
-const ReportView= ({ reportFilterForm:ReportFilterForm, reportListView:ReportListView }) => {
-  const classes = useStyles();
-  const [data, setData] = useState([]);
-  
-  const onResult = (data) => {
-    setData(data);
-  }
-  return (
-    <div className={classes.root}>
-      <MainToolbar />
-      <div className={classes.content}>
-        <Grid container spacing={2}>
-          <Grid item xs={12} md={3} lg={2}>
-            <Paper className={classes.form}>
-              <ReportFilterForm onResult={ onResult } />
-            </Paper>
-          </Grid>
-          <Grid item xs={12} md={9} lg={10}>
-            <ReportListView items={ data } />
-          </Grid>
-        </Grid>
-      </div>
-    </div>
-  );
-}
-
-export default ReportView;
diff --git a/modern/src/reports/RouteReportPage.js b/modern/src/reports/RouteReportPage.js
index 30272c4..0f8d98a 100644
--- a/modern/src/reports/RouteReportPage.js
+++ b/modern/src/reports/RouteReportPage.js
@@ -3,29 +3,28 @@ import { TableContainer, Table, TableRow, TableCell, TableHead, TableBody, Paper
 import t from '../common/localization';
 import { formatPosition } from '../common/formatter';
 import ReportFilter from './ReportFilter';
-import ReportView from './ReportView';
+import ReportLayoutPage from './ReportLayoutPage';
 
-const RouteReportPage = () => {
-
-  const ReportFilterForm = ({ onResult }) => {
+const ReportFilterForm = ({ onResult }) => {
 
-    const handleSubmit = async (deviceId, from, to) => {
-      const query = new URLSearchParams({
-        deviceId,
-        from: from.toISOString(),
-        to: to.toISOString(),
-      });
-      const response = await fetch(`/api/reports/route?${query.toString()}`, { headers: { Accept: 'application/json' } });
-      if(response.ok) {
-        onResult(await response.json());
-      }
+  const handleSubmit = async (deviceId, from, to) => {
+    const query = new URLSearchParams({
+      deviceId,
+      from: from.toISOString(),
+      to: to.toISOString(),
+    });
+    const response = await fetch(`/api/reports/route?${query.toString()}`, { headers: { Accept: 'application/json' } });
+    if(response.ok) {
+      onResult(await response.json());
     }
-    return <ReportFilter handleSubmit={handleSubmit} />;
   }
+  return <ReportFilter handleSubmit={handleSubmit} />;
+}
 
-  const ReportListView = ({items}) => {
-    
-    return (
+const RouteReportPage = () => {
+  const [items, setItems] = useState([]);
+  return (
+    <ReportLayoutPage reportFilterForm={ReportFilterForm} setItems={setItems}>
       <TableContainer component={Paper}>
         <Table>
           <TableHead>
@@ -50,10 +49,8 @@ const RouteReportPage = () => {
           </TableBody>
         </Table>
       </TableContainer>
-    );
-  }
-
-  return <ReportView reportFilterForm={ReportFilterForm} reportListView={ReportListView} />;
+    </ReportLayoutPage>
+  );
 }
 
 export default RouteReportPage;
-- 
cgit v1.2.3