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

Refactor get workout call

Browse Source
This commit is contained in:
Peter Stockings
2023-12-09 17:00:45 +11:00
parent 1ff616f4e0
commit c702a2ba3d
3 changed files with 41 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
templates/partials/workout_modal.html
View File

@@ -19,10 +19,10 @@
<div class="flex flex-col w-full">
<div class="flex items-center justify-between">
<div class="w-full">
<h3 class="text-xl font-bold text-gray-900">{{ workout['PersonName'] }}</h3>
<h3 class="text-xl font-bold text-gray-900">{{ person_name }}</h3>
{{ render_partial('partials/workout_tags.html', person_id=workout['PersonId'],
workout_id=workout['WorkoutId'],
{{ render_partial('partials/workout_tags.html', person_id=person_id,
workout_id=workout_id,
person_tags=person_tags, workout_tags=workout_tags,
selected_workout_tag_ids=selected_workout_tag_ids) }}
@@ -30,14 +30,14 @@
</div>
<div class="grid grid-cols-1 lg:grid-cols-2">
{{ render_partial('partials/start_date.html', person_id=workout['PersonId'],
workout_id=workout['WorkoutId'],
start_date=workout['StartDate']) }}
{{ render_partial('partials/start_date.html', person_id=person_id,
workout_id=workout_id,
start_date=start_date) }}
{{ render_partial('partials/workout_note.html', person_id=workout['PersonId'],
workout_id=workout['WorkoutId'],
note=workout['Note']) }}
{{ render_partial('partials/workout_note.html', person_id=person_id,
workout_id=workout_id,
note=note) }}
</div>
@@ -76,17 +76,17 @@
</thead>
<tbody class="divide-y divide-gray-100" id="new-workout" hx-target="closest tr"
hx-swap="outerHTML swap:0.5s">
{% for t in workout['TopSets'] %}
{{ render_partial('partials/topset.html', person_id=workout['PersonId'],
workout_id=workout['WorkoutId'],
topset_id=t['TopSetId'], exercise_id=t['ExerciseId'] ,exercise_name=t['ExerciseName'],
repetitions=t['Repetitions'],
weight=t['Weight']) }}
{% for topset in top_sets %}
{{ render_partial('partials/topset.html', person_id=person_id,
workout_id=workout_id,
topset_id=topset.topset_id, exercise_id=topset.exercise_id, exercise_name=topset.exercise_name,
repetitions=topset.repetitions,
weight=topset.weight) }}
{% endfor %}
</tbody>
</table>
{% if workout['TopSets']|length == 0 %}
{% if top_sets|length == 0 %}
<div class="bg-purple-100 rounded-lg py-5 px-6 mb-4 text-base text-purple-700 mb-3" role="alert"
id="no-workouts">
No topsets found.
@@ -95,12 +95,12 @@
</div>
<!-- Modal footer -->
<div class="flex items-center p-3 md:p-6 space-x-2 border-t border-gray-200 rounded-b dark:border-gray-600">
{{ render_partial('partials/new_set_form.html', person_id=workout['PersonId'],
workout_id=workout['WorkoutId'],
{{ render_partial('partials/new_set_form.html', person_id=person_id,
workout_id=workout_id,
exercises=exercises,
has_value=False) }}
</div>
<div id="exercise-progress-{{ workout['PersonId'] }}" class="mx-0 md:mx-5">
<div id="exercise-progress-{{ person_id }}" class="mx-0 md:mx-5">
</div>
</div>