Merge branch 'master' into v0.2

fittrackee_client/src/actions/activities.js

@@ -2,7 +2,7 @@ import { parse } from 'date-fns'
 
 import FitTrackeeGenericApi from '../fitTrackeeApi'
 import { history } from '../index'
-import { formatChartData } from '../utils/stats'
+import { formatChartData } from '../utils/activities'
 import { setError, setLoading } from './index'
 import { loadProfile } from './user'
 

fittrackee_client/src/utils/activities.js

@@ -1,4 +1,4 @@
-import { format } from 'date-fns'
+import { format, subHours } from 'date-fns'
 import togeojson from '@mapbox/togeojson'
 
 import { getDateWithTZ } from './index'
@@ -46,6 +46,20 @@ export const formatActivityDate = (
   }
 }
 
+export const formatActivityDuration = seconds => {
+  let newDate = new Date(0)
+  newDate = subHours(newDate.setSeconds(seconds), 1)
+  return newDate.getTime()
+}
+
+export const formatChartData = chartData => {
+  for (let i = 0; i < chartData.length; i++) {
+    chartData[i].time = new Date(chartData[i].time).getTime()
+    chartData[i].duration = formatActivityDuration(chartData[i].duration)
+  }
+  return chartData
+}
+
 export const formatRecord = (record, tz) => {
   let value
   switch (record.record_type) {

fittrackee_client/src/utils/stats.js

@@ -41,14 +41,6 @@ export const formatValue = (displayedData, value) => value === 0
         ? formatDuration(value)
         : value
 
-export const formatChartData = chartData => {
-  for (let i = 0; i < chartData.length; i++) {
-    chartData[i].time = new Date(chartData[i].time).getTime()
-    chartData[i].duration = formatDuration(chartData[i].duration)
-  }
-  return chartData
-}
-
 const dateIncrement = (duration, day) => {
   switch (duration) {
     case 'week':