2 files changed, 9 insertions, 5 deletions
diff --git a/modern/src/reports/ReplayPage.js b/modern/src/reports/ReplayPage.js
index 5d2b803..afb7d04 100644
--- a/modern/src/reports/ReplayPage.js
+++ b/modern/src/reports/ReplayPage.js
@@ -1,4 +1,5 @@
 import React, { useState } from 'react';
+import { useParams } from 'react-router-dom';
 import {
   Accordion, AccordionDetails, AccordionSummary, Container, makeStyles, Paper, Slider, Tooltip, Typography, IconButton, Box
 } from '@material-ui/core';
@@ -11,7 +12,7 @@ import MainToolbar from '../MainToolbar';
 import Map from '../map/Map';
 import ReplayPathMap from '../map/ReplayPathMap';
 import PositionsMap from '../map/PositionsMap';
-import { formatPosition, formatDate } from '../common/formatter';
+import { formatPosition } from '../common/formatter';
 import ReportFilter from './ReportFilter';
 import { useTranslation } from '../LocalizationProvider';
 
@@ -45,6 +46,7 @@ const TimeLabel = ({ children, open, value }) => (
 
 const ReplayPage = () => {
   const classes = useStyles();
+  const { id } = useParams();
   const t = useTranslation();
 
   const [expanded, setExpanded] = useState(true);
@@ -74,12 +76,14 @@ const ReplayPage = () => {
           && (
             <Paper className={classes.controlContent}>
                 <Box maxWidth="sm" display="flex">
+                    {/* Previous position button */}
                     <IconButton color="primary" disabled={index === 0} onClick={() => setIndex(index - 1)}>
                         <SkipPreviousIcon />
                     </IconButton>
                     <Box flexGrow={1} textAlign="center">
-                        <Typography variant="button">{formatDate(positions[index].deviceTime)}</Typography>
+                        <Typography variant="button">{formatPosition(positions[index], 'fixTime', t)}</Typography>
                     </Box>
+                    {/* Next position button*/}
                     <IconButton color="primary" disabled={index === positions.length - 1} onClick={() => setIndex(index + 1)}>
                         <SkipNextIcon />
                     </IconButton>
@@ -104,7 +108,7 @@ const ReplayPage = () => {
               </Typography>
             </AccordionSummary>
             <AccordionDetails className={classes.configForm}>
-              <ReportFilter handleSubmit={handleSubmit} showOnly />
+              <ReportFilter handleSubmit={handleSubmit} showOnly defaultSelected={id} />
             </AccordionDetails>
           </Accordion>
         </div>
diff --git a/modern/src/reports/ReportFilter.js b/modern/src/reports/ReportFilter.js
index 1f3a3f0..25b0af7 100644
--- a/modern/src/reports/ReportFilter.js
+++ b/modern/src/reports/ReportFilter.js
@@ -6,11 +6,11 @@ import { useSelector } from 'react-redux';
 import moment from 'moment';
 import { useTranslation } from '../LocalizationProvider';
 
-const ReportFilter = ({ children, handleSubmit, showOnly }) => {
+const ReportFilter = ({ children, handleSubmit, showOnly, defaultSelected }) => {
   const t = useTranslation();
 
   const devices = useSelector((state) => Object.values(state.devices.items));
-  const [deviceId, setDeviceId] = useState();
+  const [deviceId, setDeviceId] = useState(defaultSelected);
   const [period, setPeriod] = useState('today');
   const [from, setFrom] = useState(moment().subtract(1, 'hour'));
   const [to, setTo] = useState(moment());