Alexander/FitTrackee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into stats

Browse Source
This commit is contained in:
Sam
2018-12-31 15:10:51 +01:00
parent 10c0f57111 7d98e7342b
commit 0e6b9030f8
6 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fittrackee_client/src/components/Dashboard/Statistics.jsx
View File

@ -91,7 +91,7 @@ class Statistics extends React.Component {
tickFormatter={value => displayedData === 'distance'
? `${value} km`
: displayedData === 'duration'
? format(formatDuration(value), 'HH:mm')
? formatDuration(value)
: value
}
/>

3
fittrackee_client/src/components/Others/CustomTooltip.jsx
View File

@ -1,10 +1,9 @@
import React from 'react'
import { format } from 'date-fns'
import { formatDuration } from '../../utils'
const formatValue = (displayedData, value) => displayedData === 'duration'
? format(formatDuration(value), 'HH:mm')
? formatDuration(value, true)
: displayedData === 'distance'
? value.toFixed(3)
: value

2
fittrackee_client/src/components/Statistics/index.jsx
View File

@ -92,7 +92,7 @@ class Statistics extends React.Component {
tickFormatter={value => displayedData === 'distance'
? `${value} km`
: displayedData === 'duration'
? format(formatDuration(value), 'HH:mm')
? formatDuration(value)
: value
}
/>