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

Client - replace 'Activity' with 'Workout' - fix #58

Browse Source
This commit is contained in:
Sam
2021-01-10 11:39:48 +01:00
parent 3a80e01cc2
commit 5c04db6c08
75 changed files with 986 additions and 1006 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fittrackee_client/src/utils/index.js
View File

@ -24,7 +24,7 @@ export const apiUrl =
: `${process.env.REACT_APP_API_URL}/api/`
export const userFilters = [
{ key: 'activities_count', label: 'activities count' },
{ key: 'workouts_count', label: 'workouts count' },
{ key: 'admin', label: 'admin rights' },
{ key: 'created_at', label: 'registration date' },
{ key: 'username', label: 'user name' },

10
fittrackee_client/src/utils/stats.js
View File

@ -66,7 +66,7 @@ const startDate = (duration, day, weekm) => {
}
export const formatStats = (stats, sports, params, displayedSports, weekm) => {
const nbActivitiesStats = []
const nbWorkoutsStats = []
const distanceStats = []
const durationStats = []
@ -80,7 +80,7 @@ export const formatStats = (stats, sports, params, displayedSports, weekm) => {
)
const date = format(day, xAxisFormat.dateFormat)
const xAxis = format(day, xAxisFormat.xAxis)
const dataNbActivities = { date: xAxis }
const dataNbWorkouts = { date: xAxis }
const dataDistance = { date: xAxis }
const dataDuration = { date: xAxis }
@ -91,19 +91,19 @@ export const formatStats = (stats, sports, params, displayedSports, weekm) => {
)
.map(sportId => {
const sportLabel = sports.filter(s => s.id === +sportId)[0].label
dataNbActivities[sportLabel] = stats[date][sportId].nb_activities
dataNbWorkouts[sportLabel] = stats[date][sportId].nb_workouts
dataDistance[sportLabel] = stats[date][sportId].total_distance
dataDuration[sportLabel] = stats[date][sportId].total_duration
return null
})
}
nbActivitiesStats.push(dataNbActivities)
nbWorkoutsStats.push(dataNbWorkouts)
distanceStats.push(dataDistance)
durationStats.push(dataDuration)
}
return {
activities: nbActivitiesStats,
workouts: nbWorkoutsStats,
distance: distanceStats,
duration: durationStats,
}

18
fittrackee_client/src/utils/activities.js → fittrackee_client/src/utils/workouts.js
View File

@ -3,7 +3,7 @@ import togeojson from '@mapbox/togeojson'
import { getDateWithTZ } from './index'
export const activityColors = [
export const workoutColors = [
'#55a8a3',
'#98C3A9',
'#D0838A',
@ -29,7 +29,7 @@ export const getGeoJson = gpxContent => {
return { jsonData }
}
export const formatActivityDate = (
export const formatWorkoutDate = (
dateTime,
dateFormat = null,
timeFormat = null
@ -41,12 +41,12 @@ export const formatActivityDate = (
timeFormat = 'HH:mm'
}
return {
activity_date: dateTime ? format(dateTime, dateFormat) : null,
activity_time: dateTime ? format(dateTime, timeFormat) : null,
workout_date: dateTime ? format(dateTime, dateFormat) : null,
workout_time: dateTime ? format(dateTime, timeFormat) : null,
}
}
export const formatActivityDuration = seconds => {
export const formatWorkoutDuration = seconds => {
let newDate = new Date(0)
newDate = subHours(newDate.setSeconds(seconds), 1)
return newDate.getTime()
@ -55,7 +55,7 @@ export const formatActivityDuration = seconds => {
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)
chartData[i].duration = formatWorkoutDuration(chartData[i].duration)
}
return chartData
}
@ -78,9 +78,9 @@ export const formatRecord = (record, tz) => {
r => r.record_type === record.record_type
)
return {
activity_date: formatActivityDate(getDateWithTZ(record.activity_date, tz))
.activity_date,
activity_id: record.activity_id,
workout_date: formatWorkoutDate(getDateWithTZ(record.workout_date, tz))
.workout_date,
workout_id: record.workout_id,
id: record.id,
record_type: recordType.label,
value: value,