Changes in ow/views/user.py [5cf5787:6dc1846] in OpenWorkouts-current

File:

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

ow/views/user.py

@@ -166 +166 @@
     """
     now = datetime.now(timezone.utc)
-    year = int(request.GET.get('year', now.year))
-    month = int(request.GET.get('month', now.month))
-    week = request.GET.get('week', None)
-    return {
-        'workouts': context.workouts(year, month, week),
-        'current_month': '{year}-{month}'.format(
-            year=str(year), month=str(month).zfill(2)),
-        'current_week': week
+    return {
+        'current_month': now.strftime('%Y-%m')
     }
 
@@ -264 +258 @@
     context=User,
     permission='view',
-    name='monthly')
+    name='yearly')
 def last_months_stats(context, request):
     """
@@ -286 +280 @@
             'distance': int(round(stats[month]['distance'])),
             'elevation': int(stats[month]['elevation']),
-            'workouts': stats[month]['workouts'],
-            'url': request.resource_url(
-                context, 'profile',
-                query={'year': str(month[0]), 'month': str(month[1])},
-                anchor='workouts')
+            'workouts': stats[month]['workouts']
         }
         json_stats.append(month_stats)
@@ -296 +286 @@
                     charset='utf-8',
                     body=json.dumps(json_stats))
-
-
-@view_config(
-    context=User,
-    permission='view',
-    name='weekly')
-def last_weeks_stats(context, request):
-    """
-    Return a json-encoded stream with statistics for the last 12-months, but
-    in a per-week basis
-    """
-    stats = context.weekly_year_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 week in stats:
-        hms = timedelta_to_hms(stats[week]['time'])
-        name = month_name[week[1]][:3]
-        if week[1] == repeated_month:
-            name += ' ' + str(week[0])
-        week_stats = {
-            'id': '-'.join(
-                [str(week[0]), str(week[1]).zfill(2), str(week[2])]),
-            'week': str(week[3]),  # the number of week in the current month
-            'name': name,
-            'time': str(hms[0]).zfill(2),
-            'distance': int(round(stats[week]['distance'])),
-            'elevation': int(stats[week]['elevation']),
-            'workouts': stats[week]['workouts'],
-            'url': request.resource_url(
-                context, 'profile',
-                query={'year': str(week[0]),
-                       'month': str(week[1]),
-                       'week': str(week[2])},
-                anchor='workouts')
-        }
-        json_stats.append(week_stats)
-    return Response(content_type='application/json',
-                    charset='utf-8',
-                    body=json.dumps(json_stats))