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

Timestamp:

Jan 16, 2019, 11:52:22 AM (5 years ago)

Author:

Borja Lopez <borja@…>

Branches:

current, feature/docs, master

Children:

816820d, c6219ed

Parents:

7388b68 (diff), ad5759b (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 changes from darcs

File:

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

ow/views/user.py

@@ +1 @@
+from calendar import month_name
+
 from pyramid.httpexceptions import HTTPFound
 from pyramid.view import view_config
@@ -99 +101 @@
     name='forgot-password',
     renderer='ow:templates/forgot_password.pt')
-def recover_password(context, request):
+def recover_password(context, request):  # pragma: no cover
     # WIP
     Form(request)
@@ -112 +114 @@
     Render a dashboard for the current user
     """
-    # Add here some logic
-    return {}
+    # Look at the year we are viewing, if none is passed in the request,
+    # pick up the latest/newer available with activity
+    viewing_year = request.GET.get('year', None)
+    if viewing_year is None:
+        available_years = context.activity_years
+        if available_years:
+            viewing_year = available_years[0]
+    else:
+        # ensure this is an integer
+        viewing_year = int(viewing_year)
+
+    # Same for the month, if there is a year set
+    viewing_month = None
+    if viewing_year:
+        viewing_month = request.GET.get('month', None)
+        if viewing_month is None:
+            available_months = context.activity_months(viewing_year)
+            if available_months:
+                # we pick up the latest month available for the year,
+                # which means the current month in the current year
+                viewing_month = available_months[-1]
+        else:
+            # ensure this is an integer
+            viewing_month = int(viewing_month)
+
+    # pick up the workouts to be shown in the dashboard
+    workouts = context.workouts(viewing_year, viewing_month)
+
+    return {
+        'month_name': month_name,
+        'viewing_year': viewing_year,
+        'viewing_month': viewing_month,
+        'workouts': workouts
+    }