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

Timestamp:

Jan 29, 2019, 12:41:01 PM (5 years ago)

Author:

Borja Lopez <borja@…>

Branches:

current, feature/docs, master

Children:

1183d5a, 22eb5de

Parents:

26220ba (diff), bd8eeb4 (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) (4 diffs)

ow/views/user.py

@@ -1 +1 @@
 import json
 from calendar import month_name
-from datetime import datetime
+from datetime import datetime, timezone
 
 from pyramid.httpexceptions import HTTPFound
@@ -146 +146 @@
 
     return {
-        'current_year': datetime.now().year,
-        'current_day_name': datetime.now().strftime('%a'),
+        'current_year': datetime.now(timezone.utc).year,
+        'current_day_name': datetime.now(timezone.utc).strftime('%a'),
         'month_name': month_name,
         'viewing_year': viewing_year,
@@ -165 +165 @@
     basic info, stats, etc
     """
-    return {}
+    now = datetime.now(timezone.utc)
+    return {
+        'current_month': now.strftime('%Y-%m')
+    }
 
 
@@ -250 +253 @@
                     charset='utf-8',
                     body=json.dumps(json_stats))
+
+
+@view_config(
+    context=User,
+    permission='view',
+    name='yearly')
+def last_months_stats(context, request):
+    """
+    Return a json-encoded stream with statistics for the last 12 months
+    """
+    stats = context.yearly_stats
+    # this sets which month is 2 times in the stats, once this year, once
+    # the previous year. We will show it a bit different in the UI (showing
+    # the year too to prevent confusion)
+    repeated_month = datetime.now(timezone.utc).date().month
+    json_stats = []
+    for month in stats:
+        hms = timedelta_to_hms(stats[month]['time'])
+        name = month_name[month[1]][:3]
+        if month[1] == repeated_month:
+            name += ' ' + str(month[0])
+        month_stats = {
+            'id': str(month[0]) + '-' + str(month[1]).zfill(2),
+            'name': name,
+            'time': str(hms[0]).zfill(2),
+            'distance': int(round(stats[month]['distance'])),
+            'elevation': int(stats[month]['elevation']),
+            'workouts': stats[month]['workouts']
+        }
+        json_stats.append(month_stats)
+    return Response(content_type='application/json',
+                    charset='utf-8',
+                    body=json.dumps(json_stats))