Convert edit topset form to htmx driven

app.py

@@ -110,20 +110,37 @@ def get_workout_start_date(person_id, workout_id):
     """
 
 
-@ app.route("/person/<int:person_id>/workout/<int:workout_id>/topset/<int:topset_id>", methods=['GET', 'POST'])
+@ app.route("/person/<int:person_id>/workout/<int:workout_id>/topset/<int:topset_id>", methods=['GET'])
 @ validate_topset
 def get_topset(person_id, workout_id, topset_id):
-    if request.method == 'POST':
-        exercise_id = request.form.get("exercise_id")
-        repetitions = request.form.get("repetitions")
-        weight = request.form.get("weight")
-
-        db.update_topset(exercise_id, repetitions, weight, topset_id)
-
-        return redirect(url_for('get_workout', person_id=person_id, workout_id=workout_id))
-
     topset = db.get_topset(person_id, workout_id, topset_id)
-    return render_template('topset.html', topset=topset)
+    return f"""
+    <tr class="text-gray-500">
+                    <th class="border-t-0 px-4 align-middle text-l font-normal whitespace-nowrap p-4 text-left">
+                        { topset['ExerciseName'] }</th>
+                    </th>
+                    <td class="border-t-0 px-4 align-middle text-l font-medium text-gray-900 whitespace-nowrap p-4">
+                        { topset['Repetitions'] } x { topset['Weight'] }kg</td>
+                    <td class="border-t-0 px-4 align-middle text-xs whitespace-nowrap p-4">
+                        <a hx-get="{ url_for('get_topset_edit_form',person_id=person_id, workout_id=workout_id, topset_id=topset_id) }"
+                            class="text-sm font-medium text-cyan-600 hover:bg-gray-100 rounded-lg inline-flex items-center p-2">
+                            Edit
+                        </a>
+                        <a hx-delete="{ url_for('delete_topset', person_id=person_id, workout_id=workout_id, topset_id=topset_id) }"
+                            class="text-sm font-medium text-cyan-600 hover:bg-gray-100 rounded-lg inline-flex items-center p-2">
+                            Delete
+                        </a>
+                    </td>
+                </tr>
+    """
+
+
+@ app.route("/person/<int:person_id>/workout/<int:workout_id>/topset/<int:topset_id>/edit_form", methods=['GET'])
+@ validate_topset
+def get_topset_edit_form(person_id, workout_id, topset_id):
+    exercises = db.get_exercises()
+    topset = db.get_topset(person_id, workout_id, topset_id)
+    return render_template('partials/topset.html', topset=topset, exercises=exercises)
 
 
 @ app.route("/person/<int:person_id>/workout/<int:workout_id>/topset", methods=['POST'])
@@ -145,7 +162,7 @@ def create_topset(person_id, workout_id):
         <td class="border-t-0 px-4 align-middle text-l font-medium text-gray-900 whitespace-nowrap p-4">
             {repetitions} x {weight}kg</td>
         <td class="border-t-0 px-4 align-middle text-xs whitespace-nowrap p-4">
-                        <a href="{ url_for('get_topset', person_id=person_id, workout_id=workout_id, topset_id=new_top_set_id) }"
+                        <a href="{ url_for('get_topset_edit_form', person_id=person_id, workout_id=workout_id, topset_id=new_top_set_id) }"
                             class="text-sm font-medium text-cyan-600 hover:bg-gray-100 rounded-lg inline-flex items-center p-2">
                             Edit
                         </a>
@@ -158,6 +175,38 @@ def create_topset(person_id, workout_id):
     """
 
 
+@ app.route("/person/<int:person_id>/workout/<int:workout_id>/topset/<int:topset_id>", methods=['PUT'])
+@ validate_workout
+def update_topset(person_id, workout_id, topset_id):
+    exercise_id = request.form.get("exercise_id")
+    repetitions = request.form.get("repetitions")
+    weight = request.form.get("weight")
+
+    new_top_set_id = db.update_topset(
+        workout_id, exercise_id, repetitions, weight)
+    exercise = db.get_exercise(exercise_id)
+
+    return f"""
+    <tr class="text-gray-500">
+        <th class="border-t-0 px-4 align-middle text-l font-normal whitespace-nowrap p-4 text-left">
+            { exercise['Name'] }</th>
+        </th>
+        <td class="border-t-0 px-4 align-middle text-l font-medium text-gray-900 whitespace-nowrap p-4">
+            {repetitions} x {weight}kg</td>
+        <td class="border-t-0 px-4 align-middle text-xs whitespace-nowrap p-4">
+                        <a hx-get="{ url_for('get_topset_edit_form', person_id=person_id, workout_id=workout_id, topset_id=topset_id) }"
+                            class="text-sm font-medium text-cyan-600 hover:bg-gray-100 rounded-lg inline-flex items-center p-2">
+                            Edit
+                        </a>
+                        <a hx-delete="{ url_for('delete_topset', person_id=person_id, workout_id=workout_id, topset_id=topset_id)}"
+                            class="text-sm font-medium text-cyan-600 hover:bg-gray-100 rounded-lg inline-flex items-center p-2">
+                            Delete
+                        </a>
+                    </td>
+    </tr>
+    """
+
+
 @ app.route("/person/<int:person_id>/workout/<int:workout_id>/topset/<int:topset_id>/delete", methods=['DELETE'])
 @ validate_topset
 def delete_topset(person_id, workout_id, topset_id):

templates/partials/topset.html

@@ -0,0 +1,33 @@
+<tr class="text-gray-500">
+    <th class="border-t-0 px-4 align-middle text-l font-normal whitespace-nowrap p-4 text-left">
+        <select
+            class="block appearance-none w-full bg-gray-200 border border-gray-200 text-gray-700 py-3 px-4 pr-8 rounded leading-tight focus:outline-none focus:bg-white focus:border-gray-500"
+            id="grid-state" name="exercise_id">
+            {% for exercise in exercises %}
+            <option value="{{ exercise['ExerciseId'] }}" {% if topset['ExerciseId']==exercise['ExerciseId'] %} selected
+                {% endif %}>{{
+                exercise['Name']}}</option>
+            {% endfor %}
+        </select>
+    </th>
+    <td class="border-t-0 px-4 align-middle text-l font-medium text-gray-900 whitespace-nowrap p-4">
+        <div class="flex items-center">
+            <input type="number"
+                class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full pl-10 p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500 w-full md:w-1/4"
+                name="repetitions" value="{{ topset['Repetitions'] }}"> x <input type="number"
+                class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full pl-10 p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500 w-full md:w-1/4"
+                name="weight" value="{{ topset['Weight'] }}">kg
+        </div>
+    </td>
+    <td class="border-t-0 px-4 align-middle text-xs whitespace-nowrap p-4">
+        <a hx-put="{{ url_for('update_topset', person_id=topset['PersonId'], workout_id=topset['WorkoutId'], topset_id=topset['TopSetId']) }}"
+            hx-include="[name='exercise_id'], [name='repetitions'], [name='weight']"
+            class="text-sm font-medium text-cyan-600 hover:bg-gray-100 rounded-lg inline-flex items-center p-2">
+            Update
+        </a>
+        <a hx-get="{{ url_for('get_topset', person_id=topset['PersonId'], workout_id=topset['WorkoutId'], topset_id=topset['TopSetId']) }}"
+            class="text-sm font-medium text-cyan-600 hover:bg-gray-100 rounded-lg inline-flex items-center p-2">
+            Cancel
+        </a>
+    </td>
+</tr>

templates/topset.html

@@ -1,75 +0,0 @@
-{% extends 'base.html' %}
-
-{% block content %}
-
-<div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8 ">
-
-    <div class="mb-4 flex items-center justify-between">
-        <div>
-            <h3 class="text-xl font-bold text-gray-900 mb-2">{{ topset['PersonName'] }}</h3>
-            <span class="text-base font-normal text-gray-500">{{ topset['StartDate'] }}</span>
-        </div>
-        <a href="{{ url_for('delete_topset', person_id=topset['PersonId'], workout_id=topset['WorkoutId'], topset_id=topset['TopSetId'])}}"
-            class="text-sm font-medium text-cyan-600 hover:bg-gray-100 rounded-lg inline-flex items-center p-2">
-            Delete topset
-        </a>
-    </div>
-
-</div>
-
-<div class="bg-white shadow rounded-lg p-4 sm:p-6 xl:p-8  2xl:col-span-2 mt-4">
-    <div class=" ">
-        <form class="w-full max-w-lg" action="" method="post">
-
-            <div class="flex flex-wrap -mx-3 mb-2">
-                <div class="w-full md:w-1/3 px-3 mb-6 md:mb-0">
-                    <label class="block uppercase tracking-wide text-gray-700 text-xs font-bold mb-2" for="grid-state">
-                        Exercise
-                    </label>
-                    <div class="relative">
-                        <select
-                            class="block appearance-none w-full bg-gray-200 border border-gray-200 text-gray-700 py-3 px-4 pr-8 rounded leading-tight focus:outline-none focus:bg-white focus:border-gray-500"
-                            id="grid-state" name="exercise_id">
-                            {% for e in topset['Exercises'] %}
-                            <option value="{{ e['ExerciseId'] }}" {% if topset['ExerciseId']==e['ExerciseId'] %}
-                                selected {% endif %}>{{
-                                e['Name']}}</option>
-                            {% endfor %}
-                        </select>
-                        <div
-                            class="pointer-events-none absolute inset-y-0 right-0 flex items-center px-2 text-gray-700">
-                            <svg class="fill-current h-4 w-4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
-                                <path d="M9.293 12.95l.707.707L15.657 8l-1.414-1.414L10 10.828 5.757 6.586 4.343 8z" />
-                            </svg>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="w-full md:w-1/3 px-3 mb-6 md:mb-0">
-                    <label class="block uppercase tracking-wide text-gray-700 text-xs font-bold mb-2" for="grid-city">
-                        Reps
-                    </label>
-                    <input
-                        class="appearance-none block w-full bg-gray-200 text-gray-700 border border-gray-200 rounded py-3 px-4 leading-tight focus:outline-none focus:bg-white focus:border-gray-500"
-                        id="grid-city" type="number" value="{{ topset['Repetitions']}}" name="repetitions">
-                </div>
-
-                <div class="w-full md:w-1/3 px-3 mb-6 md:mb-0">
-                    <label class="block uppercase tracking-wide text-gray-700 text-xs font-bold mb-2" for="grid-zip">
-                        Weight
-                    </label>
-                    <input
-                        class="appearance-none block w-full bg-gray-200 text-gray-700 border border-gray-200 rounded py-3 px-4 leading-tight focus:outline-none focus:bg-white focus:border-gray-500"
-                        id="grid-zip" type="number" value="{{ topset['Weight']}}" name="weight">
-                </div>
-            </div>
-            <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"
-                type="submit">
-                Save top set
-            </button>
-        </form>
-    </div>
-</div>
-
-{% endblock %}

templates/workout.html

@@ -59,7 +59,7 @@
                     <td class="border-t-0 px-4 align-middle text-l font-medium text-gray-900 whitespace-nowrap p-4">
                         {{ t['Repetitions'] }} x {{ t['Weight'] }}kg</td>
                     <td class="border-t-0 px-4 align-middle text-xs whitespace-nowrap p-4">
-                        <a href="{{ url_for('get_topset', person_id=workout['PersonId'], workout_id=workout['WorkoutId'], topset_id=t['TopSetId']) }}"
+                        <a hx-get="{{ url_for('get_topset_edit_form', person_id=workout['PersonId'], workout_id=workout['WorkoutId'], topset_id=t['TopSetId']) }}"
                             class="text-sm font-medium text-cyan-600 hover:bg-gray-100 rounded-lg inline-flex items-center p-2">
                             Edit
                         </a>