diff --git a/app.py b/app.py index 503d05b..155add0 100644 --- a/app.py +++ b/app.py @@ -232,12 +232,14 @@ def get_workouts_for_user(user_id): duration = end_time - start_time average_rpm = sum( reading.rpm for reading in cadence_readings) / len(cadence_readings) + calories = cadence_readings[-1].calories workouts_data.append({ 'id': workout.id, 'user_id': user_id, 'start_time': format_date_with_ordinal(start_time, '%#H:%M %B %dth %Y'), 'duration': format_duration(duration), - 'average_rpm': int(average_rpm) + 'average_rpm': int(average_rpm), + 'calories': calories, }) return workouts_data diff --git a/templates/workouts_list.html b/templates/workouts_list.html index 007c4d9..627a24e 100644 --- a/templates/workouts_list.html +++ b/templates/workouts_list.html @@ -6,7 +6,8 @@ type="button">

{{ w.start_time }}

-

Duration: {{ w.duration }} | Average RPM: {{ w.average_rpm }}

+

Duration: {{ w.duration }} | Average RPM: {{ w.average_rpm }} | + Calories: {{ w.calories }}