Changeset 1183d5a in OpenWorkouts-current for ow/views/user.py

Timestamp:

Jan 31, 2019, 3:25:08 PM (5 years ago)

Author:

Borja Lopez <borja@…>

Branches:

current, feature/docs, master

Children:

3357e47

Parents:

ed7e9d7 (diff), dbfab70 (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.

Message:

Merged patches from darcs

File:

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

ow/views/user.py

@@ -166 +166 @@
     """
     now = datetime.now(timezone.utc)
-    return {
-        'current_month': now.strftime('%Y-%m')
+    year = int(request.GET.get('year', now.year))
+    month = int(request.GET.get('month', now.month))
+    return {
+        'workouts': context.workouts(year, month),
+        'current_month': '{year}-{month}'.format(
+            year=str(year), month=str(month).zfill(2))
     }
 
@@ -280 +284 @@
             'distance': int(round(stats[month]['distance'])),
             'elevation': int(stats[month]['elevation']),
-            'workouts': stats[month]['workouts']
+            'workouts': stats[month]['workouts'],
+            'url': request.resource_url(
+                context, 'profile',
+                query={'year': str(month[0]), 'month': str(month[1])},
+                anchor='workouts')
         }
         json_stats.append(month_stats)