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

On dashboard display list of sets in descending order (start_date) with E1RM

Browse Source
This commit is contained in:
Peter Stockings
2023-12-09 20:19:24 +11:00
parent fd6ca240ee
commit f9b3854544
3 changed files with 25 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
templates/dashboard.html
View File

@@ -127,11 +127,11 @@
{% endif %}
{% for e in p['Exercises'] %}
{% if e['Topsets']|length > 1 %}
<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">
{% if e['RepMaxes']|length > 1 %}
<div class="w-full mt-2 pb-2 aspect-video">
<div class="hidden"
hx-get="{{ url_for('get_exercise_progress_for_user', person_id=p['PersonId'], exercise_id=e['ExerciseId'], min_date=min_date, max_date=max_date) }}"
@@ -139,7 +139,6 @@
</div>
</div>
{% endif %}
<table class="min-w-full divide-y divide-gray-200">
<thead class="bg-gray-50">
<tr>
@@ -149,13 +148,17 @@
</th>
<th scope="col"
class="p-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
Rep Max
Set
</th>
<th scope="col"
class="p-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
E1RM
</th>
</tr>
</thead>
<tbody class="bg-white">
{% for rm in e['RepMaxes'] %}
{% for rm in e['Topsets'] %}
<tr>
<td class="p-4 whitespace-nowrap text-sm font-normal text-gray-500">
{{ rm['StartDate'] }}
@@ -163,15 +166,20 @@
<td class="p-4 whitespace-nowrap text-sm font-semibold text-gray-900">
{{ rm['Repetitions'] }} x {{ rm['Weight'] }}kg
</td>
<td class="p-4 whitespace-nowrap text-sm font-semibold text-gray-900">
{{ rm['Estimated1RM'] }}kg
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
</div>
{% endif %}
{% endfor %}
</div>
{% endfor %}