Changeset a3c3baa in OpenWorkouts-current

Timestamp:

Feb 6, 2019, 1:25:07 PM (5 years ago)

Author:

Borja Lopez <borja@…>

Branches:

current, feature/docs, master

Children:

978575d

Parents:

40ee398

Message:

Show the totals in the user profile, for the selected month/week
(number of workouts, time, distance and elevation)

Location:

ow

Files:

• templates/profile.pt (modified) (1 diff)
• views/user.py (modified) (2 diffs)

ow/templates/profile.pt

@@ -51 +51 @@
         <div class="workout-list">
           <div class="total-workouts">
-            <tal:w tal:replace="context.num_workouts"></tal:w>
-            <tal:t i18n:translate="">workouts</tal:t>
+            <span>
+              <tal:w tal:replace="len(workouts)"></tal:w>
+              <tal:t i18n:translate="">workouts</tal:t>
+            </span>
+            <span>
+              <tal:hms tal:define="hms timedelta_to_hms(totals['time'])">
+                <tal:h tal:content="str(hms[0]).zfill(2)"></tal:h>
+                <tal:t i18n:translate="">hours</tal:t>,
+                <tal:h tal:content="str(hms[1]).zfill(2)"></tal:h>
+                <tal:t i18n:translate="">min.</tal:t>
+              </tal:hms>
+            </span>
+            <span>
+              <tal:w tal:replace="round(totals['distance'])"></tal:w>
+              <tal:t i18n:translate="">km</tal:t>
+            </span>
+            <span>
+              <tal:w tal:replace="round(totals['elevation'])"></tal:w>
+              <tal:t i18n:translate="">m</tal:t>
+            </span>
           </div>
 

ow/views/user.py

@@ -1 +1 @@
 import json
 from calendar import month_name
-from datetime import datetime, timezone
+from datetime import datetime, timezone, timedelta
+from decimal import Decimal
 
 from pyramid.httpexceptions import HTTPFound
@@ -169 +170 @@
     month = int(request.GET.get('month', now.month))
     week = request.GET.get('week', None)
+    workouts = context.workouts(year, month, week)
+    totals = {
+        'distance': Decimal(0),
+        'time': timedelta(0),
+        'elevation': Decimal(0)
+    }
+
+    for workout in workouts:
+        totals['distance'] += getattr(workout, 'distance', Decimal(0))
+        totals['time'] += getattr(workout, 'duration', timedelta(0))
+        totals['elevation'] += getattr(workout, 'uphill', Decimal(0))
+
     return {
-        'workouts': context.workouts(year, month, week),
+        'workouts': workouts,
         'current_month': '{year}-{month}'.format(
             year=str(year), month=str(month).zfill(2)),
-        'current_week': week
+        'current_week': week,
+        'totals': totals
     }