From 56ceb878674a140c25ed734266cdec64fd0adc2e Mon Sep 17 00:00:00 2001
From: Peter Stockings <pstockings@jadeworld.com>
Date: Wed, 23 Nov 2022 22:48:03 +1100
Subject: [PATCH] Fix for filter not working after selecting a single exercise

---
 templates/dashboard.html            |   2 +-
 templates/partials/page/person.html | 190 ++++++++++++++--------------
 2 files changed, 95 insertions(+), 97 deletions(-)

diff --git a/templates/dashboard.html b/templates/dashboard.html
index 9c9e5a1..6890643 100644
--- a/templates/dashboard.html
+++ b/templates/dashboard.html
@@ -3,6 +3,6 @@
 {% block content %}
 
 {{ render_partial('partials/page/dashboard.html',
-people=people, exercises=exercises) }}
+model=model) }}
 
 {% endblock %}
\ No newline at end of file
diff --git a/templates/partials/page/person.html b/templates/partials/page/person.html
index fc9b2ca..e8a44ad 100644
--- a/templates/partials/page/person.html
+++ b/templates/partials/page/person.html
@@ -1,116 +1,114 @@
-<div>
-    <div class="flex justify-center">
-        <div class="bg-white shadow rounded-lg p-4 sm:w-full xl:p-8 md:w-full lg:w-10/12 xl:w-8/12 2xl:w-6/12">
+<div class="flex justify-center">
+    <div class="bg-white shadow rounded-lg p-4 sm:w-full xl:p-8 md:w-full lg:w-10/12 xl:w-8/12 2xl:w-6/12">
 
-            <div class="mb-4 flex items-center justify-between">
-                <div>
-                    <h3 class="text-xl font-bold text-gray-900 mb-2">{{ person['PersonName'] }}</h3>
-                    <span class="text-base font-normal text-gray-500">List of workouts</span>
-                </div>
-                <div>
-                    <form action="{{ url_for('create_workout', person_id=person['PersonId']) }}" method="post">
-                        <button
-                            class="sm:inline-flex text-white bg-cyan-600 hover:bg-cyan-700 focus:ring-4 focus:ring-cyan-200 font-medium rounded-lg text-sm px-5 py-2.5 text-center items-center mt-6">New
-                            workout</button>
-                    </form>
-                </div>
+        <div class="mb-4 flex items-center justify-between">
+            <div>
+                <h3 class="text-xl font-bold text-gray-900 mb-2">{{ person['PersonName'] }}</h3>
+                <span class="text-base font-normal text-gray-500">List of workouts</span>
             </div>
-
-            <div class="flex">
-                {% set exercise_list = person['FilteredExercises'] if is_filtered else person['Exercises'] %}
-
-                {% for e in person['Exercises'] %}
-                <div class="flex items-center mr-4"
-                    hx-post="{{ url_for('filter_exercises_for_person', person_id=person['PersonId']) }}"
-                    hx-include="[name='exercise_id']" hx-target="#container" hx-swap="outerHTML">
-                    <input {{ is_checked(e['ExerciseId'], selected_exercise_ids) }} type="checkbox" name="exercise_id"
-                        value="{{ e['ExerciseId'] }}"
-                        class="w-4 h-4 text-blue-600 bg-gray-100 rounded border-gray-300 focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600">
-                    <label for="inline-checked-checkbox"
-                        class="ml-2 text-sm font-medium text-gray-900 dark:text-gray-300">{{ e['ExerciseName']
-                        }}</label>
-                </div>
-                {% endfor %}
+            <div>
+                <form action="{{ url_for('create_workout', person_id=person['PersonId']) }}" method="post">
+                    <button
+                        class="sm:inline-flex text-white bg-cyan-600 hover:bg-cyan-700 focus:ring-4 focus:ring-cyan-200 font-medium rounded-lg text-sm px-5 py-2.5 text-center items-center mt-6">New
+                        workout</button>
+                </form>
             </div>
+        </div>
 
-            <div class="flex flex-col mt-8">
-                <div class="overflow-x-auto rounded-lg">
-                    <div class="align-middle inline-block min-w-full">
-                        <div class="shadow overflow-hidden sm:rounded-lg">
+        <div class="flex">
+            {% set exercise_list = person['FilteredExercises'] if is_filtered else person['Exercises'] %}
 
-                            {% if person['Workouts']|length > 0 %}
-                            <table class="min-w-full divide-y divide-gray-200">
-                                <thead class="bg-gray-50">
-                                    <tr>
-                                        <th scope="col"
-                                            class="p-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
-                                            Date
-                                        </th>
-                                        {% for e in exercise_list %}
-                                        <th scope="col"
-                                            class="p-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
-                                            {{ e['ExerciseName'] }}
-                                        </th>
-                                        {% endfor %}
-                                        <th scope="col"
-                                            class="p-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider w-8">
-                                        </th>
-                                    </tr>
-                                </thead>
-                                <tbody class="bg-white">
+            {% for e in person['Exercises'] %}
+            <div class="flex items-center mr-4"
+                hx-post="{{ url_for('filter_exercises_for_person', person_id=person['PersonId']) }}"
+                hx-include="[name='exercise_id']" hx-target="#container">
+                <input {{ is_checked(e['ExerciseId'], selected_exercise_ids) }} type="checkbox" name="exercise_id"
+                    value="{{ e['ExerciseId'] }}"
+                    class="w-4 h-4 text-blue-600 bg-gray-100 rounded border-gray-300 focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600">
+                <label for="inline-checked-checkbox"
+                    class="ml-2 text-sm font-medium text-gray-900 dark:text-gray-300">{{ e['ExerciseName']
+                    }}</label>
+            </div>
+            {% endfor %}
+        </div>
 
-                                    {% for w in person['Workouts'] %}
-                                    <tr>
-                                        <td class="p-4 whitespace-nowrap text-sm font-normal text-gray-500">
-                                            {{ w['StartDate'] }}
-                                        </td>
+        <div class="flex flex-col mt-8">
+            <div class="overflow-x-auto rounded-lg">
+                <div class="align-middle inline-block min-w-full">
+                    <div class="shadow overflow-hidden sm:rounded-lg">
 
-                                        {% for e in exercise_list %}
-                                        <td class="p-4 whitespace-nowrap text-sm font-semibold text-gray-900">
-                                            {% set topset_exercise =
-                                            get_first_element_from_list_with_matching_attribute(w['TopSets'],
-                                            'ExerciseId',
-                                            e['ExerciseId']) %}
-                                            {% if topset_exercise %}
-                                            {{ topset_exercise['Repetitions'] }} x {{ topset_exercise['Weight'] }}kg
-                                            {% endif %}
-                                        </td>
-                                        {% endfor %}
+                        {% if person['Workouts']|length > 0 %}
+                        <table class="min-w-full divide-y divide-gray-200">
+                            <thead class="bg-gray-50">
+                                <tr>
+                                    <th scope="col"
+                                        class="p-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
+                                        Date
+                                    </th>
+                                    {% for e in exercise_list %}
+                                    <th scope="col"
+                                        class="p-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
+                                        {{ e['ExerciseName'] }}
+                                    </th>
+                                    {% endfor %}
+                                    <th scope="col"
+                                        class="p-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider w-8">
+                                    </th>
+                                </tr>
+                            </thead>
+                            <tbody class="bg-white">
 
-                                        <td class="p-4 whitespace-nowrap text-sm font-semibold text-gray-900">
-                                            <a href="{{ url_for('get_workout' ,person_id=person['PersonId'], workout_id=w['WorkoutId']) }}"
-                                                class="text-sm font-medium text-cyan-600 hover:bg-gray-100 rounded-lg inline-flex items-center p-2 cursor-pointer">
-                                                Edit
-                                            </a>
+                                {% for w in person['Workouts'] %}
+                                <tr>
+                                    <td class="p-4 whitespace-nowrap text-sm font-normal text-gray-500">
+                                        {{ w['StartDate'] }}
+                                    </td>
 
-                                            <form
-                                                action="{{ url_for('delete_workout', person_id=person['PersonId'], workout_id=w['WorkoutId']) }}"
-                                                method="delete" class="inline">
-                                                <button
-                                                    class="text-sm font-medium text-cyan-600 hover:bg-gray-100 rounded-lg inline-flex items-center p-2 cursor-pointer"
-                                                    type="submit">Delete</button>
-                                            </form>
-                                        </td>
-                                    </tr>
+                                    {% for e in exercise_list %}
+                                    <td class="p-4 whitespace-nowrap text-sm font-semibold text-gray-900">
+                                        {% set topset_exercise =
+                                        get_first_element_from_list_with_matching_attribute(w['TopSets'],
+                                        'ExerciseId',
+                                        e['ExerciseId']) %}
+                                        {% if topset_exercise %}
+                                        {{ topset_exercise['Repetitions'] }} x {{ topset_exercise['Weight'] }}kg
+                                        {% endif %}
+                                    </td>
                                     {% endfor %}
 
-                                </tbody>
-                            </table>
-                            {% endif %}
+                                    <td class="p-4 whitespace-nowrap text-sm font-semibold text-gray-900">
+                                        <a href="{{ url_for('get_workout' ,person_id=person['PersonId'], workout_id=w['WorkoutId']) }}"
+                                            class="text-sm font-medium text-cyan-600 hover:bg-gray-100 rounded-lg inline-flex items-center p-2 cursor-pointer">
+                                            Edit
+                                        </a>
 
-                            {% if person['Workouts']|length == 0 %}
-                            <div class="bg-purple-100 rounded-lg py-5 px-6 mb-4 text-base text-purple-700 mb-3"
-                                role="alert">
-                                No workouts found.
-                            </div>
-                            {% endif %}
+                                        <form
+                                            action="{{ url_for('delete_workout', person_id=person['PersonId'], workout_id=w['WorkoutId']) }}"
+                                            method="delete" class="inline">
+                                            <button
+                                                class="text-sm font-medium text-cyan-600 hover:bg-gray-100 rounded-lg inline-flex items-center p-2 cursor-pointer"
+                                                type="submit">Delete</button>
+                                        </form>
+                                    </td>
+                                </tr>
+                                {% endfor %}
 
+                            </tbody>
+                        </table>
+                        {% endif %}
+
+                        {% if person['Workouts']|length == 0 %}
+                        <div class="bg-purple-100 rounded-lg py-5 px-6 mb-4 text-base text-purple-700 mb-3"
+                            role="alert">
+                            No workouts found.
                         </div>
+                        {% endif %}
+
                     </div>
                 </div>
             </div>
         </div>
     </div>
+</div>
 
-    {{ render_partial('partials/stats.html', stats=person['Stats']) }}
-</div>
\ No newline at end of file
+{{ render_partial('partials/stats.html', stats=person['Stats']) }}
\ No newline at end of file