Revert "Merge pull request #1249 from jcardus/speed-based-color"

This reverts commit f18c48d, reversing changes made to fe058f5.
traccar · Jun 28, 2024 · 942723e · 942723e
1 parent f18c48d
commit 942723e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 23 deletions.
diff --git a/src/reports/ChartReportPage.jsx b/src/reports/ChartReportPage.jsx
@@ -33,7 +33,6 @@ const ChartReportPage = () => {
   const [items, setItems] = useState([]);
   const [types, setTypes] = useState(['speed']);
   const [type, setType] = useState('speed');
-  const [timeType, setTimeType] = useState('fixTime');
 
   const values = items.map((it) => it[type]);
   const minValue = Math.min(...values);
@@ -53,8 +52,6 @@ const ChartReportPage = () => {
         const data = { ...position, ...position.attributes };
         const formatted = {};
         formatted.fixTime = dayjs(position.fixTime).valueOf();
-        formatted.deviceTime = dayjs(position.deviceTime).valueOf();
-        formatted.serverTime = dayjs(position.serverTime).valueOf();
         Object.keys(data).filter((key) => !['id', 'deviceId'].includes(key)).forEach((key) => {
           const value = data[key];
           if (typeof value === 'number') {
@@ -115,21 +112,6 @@ const ChartReportPage = () => {
             </Select>
           </FormControl>
         </div>
-        <div className={classes.filterItem}>
-          <FormControl fullWidth>
-            <InputLabel>{t('reportTimeType')}</InputLabel>
-            <Select
-              label={t('reportTimeType')}
-              value={timeType}
-              onChange={(e) => setTimeType(e.target.value)}
-              disabled={!items.length}
-            >
-              <MenuItem value="fixTime">{t('positionFixTime')}</MenuItem>
-              <MenuItem value="deviceTime">{t('positionDeviceTime')}</MenuItem>
-              <MenuItem value="serverTime">{t('positionServerTime')}</MenuItem>
-            </Select>
-          </FormControl>
-        </div>
       </ReportFilter>
       {items.length > 0 && (
         <div className={classes.chart}>
@@ -141,7 +123,7 @@ const ChartReportPage = () => {
               }}
             >
               <XAxis
-                dataKey={timeType}
+                dataKey="fixTime"
                 type="number"
                 tickFormatter={(value) => formatTime(value, 'time')}
                 domain={['dataMin', 'dataMax']}

diff --git a/src/reports/components/ReportFilter.jsx b/src/reports/components/ReportFilter.jsx
@@ -11,9 +11,7 @@ import SplitButton from '../../common/components/SplitButton';
 import SelectField from '../../common/components/SelectField';
 import { useRestriction } from '../../common/util/permissions';
 
-const ReportFilter = ({
-  children, handleSubmit, handleSchedule, showOnly, ignoreDevice, multiDevice, includeGroups, loading,
-}) => {
+const ReportFilter = ({ children, handleSubmit, handleSchedule, showOnly, ignoreDevice, multiDevice, includeGroups, loading }) => {
   const classes = useReportStyles();
   const dispatch = useDispatch();
   const t = useTranslation();

diff --git a/src/resources/l10n/en.json b/src/resources/l10n/en.json
@@ -575,7 +575,6 @@
     "reportSpentFuel": "Spent Fuel",
     "reportStartOdometer": "Odometer Start",
     "reportEndOdometer": "Odometer End",
-    "reportTimeType": "Time",
     "statisticsTitle": "Statistics",
     "statisticsCaptureTime": "Capture Time",
     "statisticsActiveUsers": "Active Users",