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

Move forecast map into exercise history

Browse Source
This commit is contained in:
Peter Stockings
2026-09-06 14:38:30 +10:00
parent 7af0202c30
commit d26da9a066
3 changed files with 99 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
templates/partials/exercise_history.html
+47 -7
View File
@@ -12,7 +12,7 @@
<button
class="inline-flex justify-center p-1 text-gray-500 rounded cursor-pointer hover:text-gray-900 hover:bg-gray-100"
title="Show Progress Graph"
hx-get="{{ url_for('get_exercise_progress_for_user', person_id=person_id, exercise_id=exercise_id) }}"
hx-get="{{ url_for('get_exercise_progress_for_user', person_id=person_id, exercise_id=exercise_id, epoch='All', forecast='true' if forecast_enabled else 'false', forecast_weeks=forecast_weeks, forecast_reps=forecast_target_reps) }}"
hx-target="#exercise-history-container" hx-swap="outerHTML">
<svg class="w-5 h-5 border border-gray-300 rounded p-0.5" fill="none" stroke="currentColor"
viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
@@ -27,10 +27,50 @@
<h2 class="text-xs font-semibold text-blue-200 mb-4 text-center">
{{ best_fit_formula.kg_per_week }} kg/week, {{ best_fit_formula.kg_per_month }} kg/month
</h2>
{% else %}
<div class="mb-4"></div>
{% endif %}
<table class="w-full text-left text-sm text-gray-500">
{% else %}
<div class="mb-4"></div>
{% endif %}
{% if forecast_enabled and forecast.available %}
<div class="mb-4 rounded-lg border border-emerald-100 bg-emerald-50/70 p-3 text-left">
<div class="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-2">
<div>
<div class="text-xs font-semibold uppercase tracking-wide text-emerald-800">Projected rep-to-weight map</div>
<div class="text-sm text-gray-700">In {{ forecast.horizon_weeks }} weeks · projected E1RM {{ forecast.projected_value }}kg</div>
</div>
<div class="text-xs text-gray-500 sm:text-right">
Based on {{ forecast.observed_rep_min }}–{{ forecast.observed_rep_max }} reps in view<br>
expanded by ±{{ forecast.rep_buffer }} reps
</div>
</div>
<div class="mt-3 overflow-x-auto rounded border border-emerald-100 bg-white">
<table class="w-full text-left text-xs text-gray-600">
<thead class="bg-gray-50 text-gray-500">
<tr>
<th class="px-3 py-2 font-medium">Reps</th>
<th class="px-3 py-2 font-medium">Est. load</th>
<th class="px-3 py-2 font-medium">Model range</th>
<th class="px-3 py-2 font-medium text-right">Proj. E1RM</th>
</tr>
</thead>
<tbody class="divide-y divide-gray-100">
{% for top_set in forecast.top_sets %}
<tr class="cursor-pointer {% if forecast.selected_reps == top_set.repetitions %}bg-emerald-50 text-emerald-800 font-semibold{% else %}hover:bg-gray-50{% endif %}"
title="View {{ top_set.repetitions }} reps on the graph"
hx-get="{{ url_for('get_exercise_progress_for_user', person_id=person_id, exercise_id=exercise_id, epoch='All', forecast='true', forecast_weeks=forecast_weeks, forecast_reps=top_set.repetitions) }}"
hx-target="#exercise-history-container" hx-swap="outerHTML">
<td class="px-3 py-2">{{ top_set.repetitions }}</td>
<td class="px-3 py-2">{{ top_set.weight_display }}kg</td>
<td class="px-3 py-2">{{ top_set.lower_weight_display }}–{{ top_set.upper_weight_display }}kg</td>
<td class="px-3 py-2 text-right">{{ top_set.e1rm_display }}kg</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
<div class="mt-2 text-[11px] text-gray-400">Click a row to return to the graph with that rep target selected. Loads rounded to {{ forecast.target_weight_increment_display }}kg increments.</div>
</div>
{% endif %}
<table class="w-full text-left text-sm text-gray-500">
<thead class="text-xs text-gray-700 uppercase bg-gray-100">
<tr>
<th scope="col" class="px-3 py-2">Date</th>
@@ -63,7 +103,7 @@
<td colspan="2" class="px-3 py-3 text-center">
<button
class="text-sm text-blue-600 hover:underline font-medium px-4 py-2 border border-blue-600 rounded"
hx-get="{{ url_for('workout.get_exercise_history', person_id=person_id, exercise_id=exercise_id, limit=limit, offset=offset + limit, source_topset_id=source_topset_id) }}"
hx-get="{{ url_for('workout.get_exercise_history', person_id=person_id, exercise_id=exercise_id, limit=limit, offset=offset + limit, source_topset_id=source_topset_id, forecast='true' if forecast_enabled else 'false', forecast_weeks=forecast_weeks, forecast_reps=forecast_target_reps) }}"
hx-target="#history-load-more-{{ source_topset_id }}-{{ offset + limit }}" hx-swap="outerHTML">
Load More
</button>
@@ -81,4 +121,4 @@
</tbody>
</table>
</div>
{% endif %}
{% endif %}