Changeset 6edc367 in OpenWorkouts-current for ow/views/user.py
- Timestamp:
- Feb 8, 2019, 5:20:26 PM (5 years ago)
- Branches:
- current, feature/docs, master
- Children:
- 4226ce0
- Parents:
- 2a71053 (diff), 55470f9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
ow/views/user.py
r2a71053 r6edc367 178 178 179 179 for workout in workouts: 180 totals['distance'] += getattr(workout, 'distance', Decimal(0)) 181 totals['time'] += getattr(workout, 'duration', timedelta(0)) 182 totals['elevation'] += getattr(workout, 'uphill', Decimal(0)) 180 totals['distance'] += ( 181 getattr(workout, 'distance', Decimal(0)) or Decimal(0)) 182 totals['time'] += ( 183 getattr(workout, 'duration', timedelta(0)) or timedelta(0)) 184 totals['elevation'] += ( 185 getattr(workout, 'uphill', Decimal(0)) or Decimal(0)) 183 186 184 187 return {
Note: See TracChangeset
for help on using the changeset viewer.