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

Added total elevation to dashboard

Browse Source
This commit is contained in:
Fmstrat 2022-03-22 13:29:53 -04:00
parent eec1ef2efd
commit 8fa5d685cf
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fittrackee/users/models.py
View File

@ -120,7 +120,7 @@ class User(BaseModel):
) )
total = ( total = (
db.session.query( db.session.query(
func.sum(Workout.distance), func.sum(Workout.duration) func.sum(Workout.distance), func.sum(Workout.duration), func.sum(Workout.ascent)
) )
.filter(Workout.user_id == self.id) .filter(Workout.user_id == self.id)
.first() .first()
@ -147,6 +147,7 @@ class User(BaseModel):
], ],
'total_distance': float(total[0]), 'total_distance': float(total[0]),
'total_duration': str(total[1]), 'total_duration': str(total[1]),
'total_ascent': str(total[2]),
'imperial_units': self.imperial_units, 'imperial_units': self.imperial_units,
} }

24
fittrackee_client/src/components/Dashboard/UserStatsCards/index.vue
View File

@ -8,7 +8,12 @@
<StatCard <StatCard
icon="road" icon="road"
:value="totalDistance" :value="totalDistance"
:text="unitTo === 'mi' ? 'miles' : unitTo" :text="distanceUnitTo === 'mi' ? 'miles' : distanceUnitTo"
/>
<StatCard
icon="arrow-circle-up"
:value="totalAscent"
:text="ascentUnitTo === 'ft' ? 'feet' : ascentUnitTo"
/> />
<StatCard <StatCard
icon="clock-o" icon="clock-o"
@ -43,13 +48,20 @@
() => props.user.total_duration () => props.user.total_duration
) )
const totalDuration = computed(() => get_duration(userTotalDuration)) const totalDuration = computed(() => get_duration(userTotalDuration))
const defaultUnitFrom: TUnit = 'km' const distanceUnitFrom: TUnit = 'km'
const unitTo: TUnit = user.value.imperial_units const distanceUnitTo: TUnit = user.value.imperial_units
? units[defaultUnitFrom].defaultTarget ? units[distanceUnitFrom].defaultTarget
: defaultUnitFrom : distanceUnitFrom
const totalDistance = user.value.imperial_units const totalDistance = user.value.imperial_units
? convertDistance(user.value.total_distance, defaultUnitFrom, unitTo, 2) ? convertDistance(user.value.total_distance, distanceUnitFrom, distanceUnitTo, 2)
: parseFloat(user.value.total_distance.toFixed(2)) : parseFloat(user.value.total_distance.toFixed(2))
const ascentUnitFrom: TUnit = 'm'
const ascentUnitTo: TUnit = user.value.imperial_units
? units[ascentUnitFrom].defaultTarget
: ascentUnitFrom
const totalAscent = user.value.imperial_units
? convertDistance(user.value.total_ascent, ascentUnitFrom, ascentUnitTo, 2)
: parseFloat(user.value.total_ascent.toFixed(2))
function get_duration(total_duration: ComputedRef<string>) { function get_duration(total_duration: ComputedRef<string>) {
const duration = total_duration.value.match(/day/g) const duration = total_duration.value.match(/day/g)