From ab26340ead6eba063734286a374101951d08688b Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 28 May 2022 06:58:47 -0700 Subject: Unify report styles --- modern/src/reports/EventReportPage.js | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'modern/src/reports/EventReportPage.js') diff --git a/modern/src/reports/EventReportPage.js b/modern/src/reports/EventReportPage.js index 504534a2..447adaef 100644 --- a/modern/src/reports/EventReportPage.js +++ b/modern/src/reports/EventReportPage.js @@ -3,9 +3,8 @@ import { FormControl, InputLabel, Select, MenuItem, Table, TableHead, TableRow, TableCell, TableBody, } from '@mui/material'; import { useSelector } from 'react-redux'; -import { makeStyles } from '@mui/styles'; import { formatDate } from '../common/util/formatter'; -import ReportFilter, { useFilterStyles } from './components/ReportFilter'; +import ReportFilter from './components/ReportFilter'; import { prefixString } from '../common/util/stringUtils'; import { useTranslation } from '../common/components/LocalizationProvider'; import PageLayout from '../common/components/PageLayout'; @@ -13,6 +12,7 @@ import ReportsMenu from './components/ReportsMenu'; import usePersistedState from '../common/util/usePersistedState'; import ColumnSelect from './components/ColumnSelect'; import { useCatch } from '../reactHelper'; +import useReportStyles from './common/useReportStyles'; const typesArray = [ ['allEvents', 'eventAll'], @@ -44,19 +44,8 @@ const columnsArray = [ ]; const columnsMap = new Map(columnsArray); -const useStyles = makeStyles(() => ({ - header: { - position: 'sticky', - left: 0, - display: 'flex', - flexDirection: 'column', - alignItems: 'stretch', - }, -})); - const EventReportPage = () => { - const classes = useStyles(); - const filterClasses = useFilterStyles(); + const classes = useReportStyles(); const t = useTranslation(); const geofences = useSelector((state) => state.geofences.items); @@ -110,7 +99,7 @@ const EventReportPage = () => { } breadcrumbs={['reportTitle', 'reportEvents']}>
-
+
{t('reportEventTypes')}