1 files changed, 34 insertions, 30 deletions
diff --git a/modern/src/reports/EventReportPage.js b/modern/src/reports/EventReportPage.js
index a14fc930..6d80860c 100644
--- a/modern/src/reports/EventReportPage.js
+++ b/modern/src/reports/EventReportPage.js
@@ -1,12 +1,13 @@
 import React, { useState } from 'react';
 import { DataGrid } from '@material-ui/data-grid';
-import { FormControl, InputLabel, Select, MenuItem } from '@material-ui/core';
-import t from '../common/localization';
+import { Grid, FormControl, InputLabel, Select, MenuItem } from '@material-ui/core';
+import { useTheme } from "@material-ui/core/styles";
+import { useSelector } from 'react-redux';
 import { formatDate } from '../common/formatter';
 import ReportFilter from './ReportFilter';
 import ReportLayoutPage from './ReportLayoutPage';
 import { prefixString } from '../common/stringUtils';
-import { useSelector } from 'react-redux';
+import t from '../common/localization';
 
 const Filter = ({ setItems }) => {
 
@@ -30,35 +31,38 @@ const Filter = ({ setItems }) => {
 
   return (
     <ReportFilter handleSubmit={handleSubmit}>
-      <FormControl variant="filled" margin="normal" fullWidth>
-        <InputLabel>{t('reportEventTypes')}</InputLabel>
-        <Select value={eventTypes} onChange={e => setEventTypes(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>
+      <Grid item xs={12} sm={6}>
+        <FormControl variant="filled" fullWidth>
+          <InputLabel>{t('reportEventTypes')}</InputLabel>
+          <Select value={eventTypes} onChange={e => setEventTypes(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>
+      </Grid>
     </ReportFilter>
   );
 }
 
 const EventReportPage = () => {
 
+  const theme = useTheme();
   const geofences = useSelector(state => state.geofences.items);
   const [items, setItems] = useState([]);
 
@@ -74,24 +78,24 @@ const EventReportPage = () => {
     headerName: t('positionFixTime'),
     field: 'serverTime',
     type: 'dateTime',
-    flex: 1,
+    width: theme.dimensions.columnWidthDate,
     valueFormatter: ({ value }) => formatDate(value),
   }, {
     headerName: t('sharedType'),
     field: 'type',
     type: 'string',
-    flex:1,
+    width: theme.dimensions.columnWidthString,
     valueFormatter: ({ value }) => t(prefixString('event', value)),
   }, {
     headerName: t('sharedGeofence'),
     field: 'geofenceId',
-    flex: 1,
+    width: theme.dimensions.columnWidthString,
     valueFormatter: ({ value }) => formatGeofence(value),
   }, {
     headerName: t('sharedMaintenance'),
     field: 'maintenanceId',
     type: 'number',
-    flex: 1
+    width: theme.dimensions.columnWidthString,
   }];
 
   return (