Changeset 04c882d in OpenWorkouts-current for ow/models/user.py

Timestamp:

Mar 6, 2019, 11:25:01 AM (5 years ago)

Author:

Borja Lopez <borja@…>

Branches:

current

Children:

8d726ec

Parents:

aa6dcaf

Message:

(#7) Improvements on the workout totals/stats in the user profile page:

• Fixed styles for the sport/year dropdowns

• Added "per workout records" for each year (and all time totals), including maximum distance, time and elevation in a single workout.

File:

• ow/models/user.py (modified) (2 diffs)

ow/models/user.py

@@ -405 +405 @@
             'distance': Decimal(0),
             'elevation': Decimal(0),
+            'max_time': timedelta(0),
+            'max_time_wid': None,
+            'max_distance': Decimal(0),
+            'max_distance_wid': None,
+            'max_elevation': Decimal(0),
+            'max_elevation_wid': None
         }
+
         if self.activity_sports:
             sport = sport or self.favorite_sport
@@ -411 +418 @@
                 if workout.sport == sport:
                     if year is None or workout.start.year == year:
+                        wid = str(workout.workout_id)
+                        time = workout.duration or timedelta(0)
+                        distance = workout.distance or Decimal(0)
+                        elevation = workout.uphill or Decimal(0)
                         totals['workouts'] += 1
-                        totals['time'] += workout.duration or timedelta(0)
-                        totals['distance'] += workout.distance or Decimal(0)
-                        totals['elevation'] += workout.uphill or Decimal(0)
+                        totals['time'] += time
+                        totals['distance'] += distance
+                        totals['elevation'] += elevation
+                        if time > totals['max_time']:
+                            totals['max_time'] = time
+                            totals['max_time_wid'] = wid
+                        if distance > totals['max_distance']:
+                            totals['max_distance'] = distance
+                            totals['max_distance_wid'] = wid
+                        if elevation > totals['max_elevation']:
+                            totals['max_elevation'] = elevation
+                            totals['max_elevation_wid'] = wid
+
         return totals