peterstockings/workout
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only display column for exercise if the person has completed a topset with said exercise

Browse Source
This commit is contained in:
Peter Stockings
2022-11-27 14:06:31 +11:00
parent f264596fcf
commit b270c86576
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app.py
View File

@@ -4,7 +4,7 @@ from flask import Flask, render_template, redirect, request, url_for
import jinja_partials
from decorators import validate_person, validate_topset, validate_workout
from db import DataBase
from utils import get_people_and_exercise_rep_maxes, convert_str_to_date, get_earliest_and_latest_workout_date, filter_workout_topsets
from utils import get_people_and_exercise_rep_maxes, convert_str_to_date, get_earliest_and_latest_workout_date, filter_workout_topsets, get_exercise_ids_from_workouts
from flask_htmx import HTMX
app = Flask(__name__)
@@ -49,21 +49,16 @@ def get_person(person_id):
person['Workouts'] = [filter_workout_topsets(workout, selected_exercise_ids) for workout in person['Workouts'] if
workout['StartDate'] <= max_date and workout['StartDate'] >= min_date]
if selected_exercise_ids:
active_exercise_ids = get_exercise_ids_from_workouts(person['Workouts'])
filtered_exercises = filter(
lambda e: e['ExerciseId'] in selected_exercise_ids, person['Exercises'])
lambda e: e['ExerciseId'] in active_exercise_ids, person['Exercises'])
person['FilteredExercises'] = list(filtered_exercises)
if htmx:
return render_template('partials/page/person.html',
person=person, is_filtered=True, selected_exercise_ids=selected_exercise_ids, max_date=max_date, min_date=min_date), 200, {"HX-Trigger": "updatedPeople"}
person=person, is_filtered=True, selected_exercise_ids=active_exercise_ids, max_date=max_date, min_date=min_date), 200, {"HX-Trigger": "updatedPeople"}
return render_template('person.html', person=person, is_filtered=True, selected_exercise_ids=selected_exercise_ids, max_date=max_date, min_date=min_date)
if htmx:
return render_template('partials/page/person.html',
person=person, is_filtered=False, max_date=max_date, min_date=min_date), 200, {"HX-Trigger": "updatedPeople"}
return render_template('person.html', person=person, max_date=max_date, min_date=min_date)
return render_template('person.html', person=person, is_filtered=True, selected_exercise_ids=active_exercise_ids, max_date=max_date, min_date=min_date)
@ app.route("/person/<int:person_id>/workout", methods=['POST'])

9
utils.py
View File

@@ -138,3 +138,12 @@ def filter_workout_topsets(workout, selected_exercise_ids):
workout['TopSets'] = [topset for topset in workout['TopSets']
if topset['ExerciseId'] in selected_exercise_ids]
return workout
def get_exercise_ids_from_workouts(workouts):
return list(set(flatten_list(list(map(lambda x: list(
map(lambda y: y['ExerciseId'], x['TopSets'])), workouts)))))
def flatten_list(list_of_lists):
return [item for sublist in list_of_lists for item in sublist]