diff --git a/app.py b/app.py index fca160b..bab1f93 100644 --- a/app.py +++ b/app.py @@ -200,13 +200,12 @@ def delete_workout(user_id, workout_id): # Delete the workout and its associated cadence readings CadenceReading.query.filter_by(workout_id=workout_id).delete() HeartRateReading.query.filter_by(workout_id=workout_id).delete() - db.session.delete(workout) + Workout.query.filter_by(user_id=user_id, id=workout_id).delete() db.session.commit() - workouts_data = get_workouts_for_user(user_id) - return render_template('workouts_list.html', workouts=workouts_data) + return render_users_and_workouts() -@app.route('/user//workouts', methods=['GET', 'DELETE']) +@app.route('/user//workouts', methods=['GET']) def workouts_for_user(user_id): workouts_data = get_workouts_for_user(user_id) return render_template('workouts_list.html', workouts=workouts_data) @@ -293,6 +292,7 @@ def render_users_and_workouts(): def get_workouts_for_user(user_id): + user = User.query.get(user_id) workouts_data = [] workouts = Workout.query.filter_by(user_id=user_id).order_by( Workout.created_at.desc()).all() @@ -325,6 +325,7 @@ def get_workouts_for_user(user_id): workouts_data.append({ 'id': workout.id, 'user_id': user_id, + 'user_name': user.name, 'start_time': format_date_with_ordinal(start_time, '%#H:%M %B %dth %Y'), 'start_time_date': start_time, 'duration': format_duration(duration),