Changeset 6edc367 in OpenWorkouts-current for ow/views

Timestamp:

Feb 8, 2019, 5:20:26 PM (5 years ago)

Author:

Segundo Fdez <segun.2@…>

Branches:

current, feature/docs, master

Children:

4226ce0

Parents:

2a71053 (diff), 55470f9 (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:

Merge branch 'feature/ui' of ​ssh://openworkouts/home/repos/git/OpenWorkouts-current into feature/ui

Location:

ow/views

Files:

• user.py (modified) (1 diff)
• workout.py (modified) (1 diff)

ow/views/user.py

@@ -178 +178 @@
 
     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))
+        totals['distance'] += (
+            getattr(workout, 'distance', Decimal(0)) or Decimal(0))
+        totals['time'] += (
+            getattr(workout, 'duration', timedelta(0)) or timedelta(0))
+        totals['elevation'] += (
+            getattr(workout, 'uphill', Decimal(0)) or Decimal(0))
 
     return {

ow/views/workout.py

@@ -128 +128 @@
         return HTTPFound(location=request.resource_url(context))
 
+    # round some values before rendering
+    if form.data['distance']:
+        form.data['distance'] = round(form.data['distance'], 2)
+
     return {
         'form': FormRenderer(form)