Enable combined report

3 files changed, 10 insertions, 1 deletions

diff --git a/modern/src/Navigation.js b/modern/src/Navigation.js
index c2aaa69f..9a45b4dc 100644
--- a/modern/src/Navigation.js
+++ b/modern/src/Navigation.js
@@ -5,6 +5,7 @@ import {
 import { useDispatch } from 'react-redux';
 import { LinearProgress } from '@mui/material';
 import MainPage from './main/MainPage';
+import CombinedReportPage from './reports/CombinedReportPage';
 import RouteReportPage from './reports/RouteReportPage';
 import ServerPage from './settings/ServerPage';
 import UsersPage from './settings/UsersPage';
@@ -145,6 +146,7 @@ const Navigation = () => {
         </Route>
 
         <Route path="reports">
+          <Route path="combined" element={<CombinedReportPage />} />
           <Route path="chart" element={<ChartReportPage />} />
           <Route path="event" element={<EventReportPage />} />
           <Route path="route" element={<RouteReportPage />} />
diff --git a/modern/src/common/components/BottomMenu.js b/modern/src/common/components/BottomMenu.js
index e2b75959..cb9e34e1 100644
--- a/modern/src/common/components/BottomMenu.js
+++ b/modern/src/common/components/BottomMenu.js
@@ -82,7 +82,7 @@ const BottomMenu = () => {
         navigate('/');
         break;
       case 'reports':
-        navigate('/reports/route');
+        navigate('/reports/combined');
         break;
       case 'settings':
         navigate('/settings/preferences');
diff --git a/modern/src/reports/components/ReportsMenu.js b/modern/src/reports/components/ReportsMenu.js
index a31c3afe..a6c38578 100644
--- a/modern/src/reports/components/ReportsMenu.js
+++ b/modern/src/reports/components/ReportsMenu.js
@@ -2,6 +2,7 @@ import React from 'react';
 import {
   Divider, List, ListItemButton, ListItemIcon, ListItemText,
 } from '@mui/material';
+import StarIcon from '@mui/icons-material/Star';
 import TimelineIcon from '@mui/icons-material/Timeline';
 import PauseCircleFilledIcon from '@mui/icons-material/PauseCircleFilled';
 import PlayCircleFilledIcon from '@mui/icons-material/PlayCircleFilled';
@@ -35,6 +36,12 @@ const ReportsMenu = () => {
     <>
       <List>
         <MenuItem
+          title={t('reportCombined')}
+          link="/reports/combined"
+          icon={<StarIcon />}
+          selected={location.pathname === '/reports/combined'}
+        />
+        <MenuItem
           title={t('reportRoute')}
           link="/reports/route"
           icon={<TimelineIcon />}