Revert logic for lazy loading workout list, instead just load it all when requested

This commit is contained in:
Peter Stockings
2023-10-13 19:05:58 +11:00
parent b23e6064d7
commit 9b43d7a8f4
2 changed files with 5 additions and 12 deletions

13
app.py
View File

@@ -289,9 +289,7 @@ def calendar_view(user_id):
@ app.route("/user/<int:user_id>/workout/list", methods=['GET'])
def workout_list(user_id):
max_date = request.args.get(
'min_date', default=datetime.now().date(), type=toDate)
workouts = get_workouts_for_user(user_id, max_date=max_date)
workouts = get_workouts_for_user(user_id)
return render_template('partials/workouts_list_fragment.html', workouts=workouts, user_id=user_id)
@@ -367,13 +365,8 @@ def render_users_and_workouts():
def get_workouts_for_user(user_id, max_date=None):
user = User.query.get(user_id)
workouts_data = []
workouts = []
if max_date:
workouts = Workout.query.filter_by(user_id=user_id).filter(
Workout.started_at < max_date).order_by(Workout.created_at.desc()).all()
else:
workouts = Workout.query.filter_by(user_id=user_id).order_by(
Workout.created_at.desc()).all()
workouts = Workout.query.filter_by(user_id=user_id).order_by(
Workout.created_at.desc()).all()
for workout in workouts:

View File

@@ -57,8 +57,8 @@
<div class="flex justify-center">
<button type="button"
class="py-2.5 px-5 mr-2 mb-2 text-sm font-medium text-gray-900 focus:outline-none bg-white rounded-lg border border-gray-200 hover:bg-gray-100 hover:text-blue-700 focus:z-10 focus:ring-4 focus:ring-gray-200 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700"
hx-get="{{ url_for('workout_list', user_id=user_id) }}" hx-vals='{"min_date": "{{ w.start_time_date }}"}'
hx-target="#workout-list-{{ user_id }}" hx-swap="outerHTML" id="workout-list-{{ user_id }}">
hx-get="{{ url_for('workout_list', user_id=user_id) }}" hx-target="#workout-list-{{ user_id }}"
hx-swap="outerHTML" id="workout-list-{{ user_id }}">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
stroke="currentColor" class="w-6 h-6">
<path stroke-linecap="round" stroke-linejoin="round"