sneakygeek/SneakySwole
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: resolve stash conflict and update roadmap to v2

Browse Source 
Resolved merge conflict in exercise_card.html (kept suggested
reps/weight pre-population logic) and updated roadmap.md with
the new v2 improvement plan.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Phillip Tarrant
2026-03-13 12:50:34 -05:00
parent 758034b25a
commit 5b26f36f5d
2 changed files with 121 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/templates/partials/exercise_card.html
View File

@@ -32,6 +32,13 @@
<!-- Inline logging (Phase 4) -->
{% if active_profile %}
<div id="logs-exercise-{{ exercise.id }}">
{% if existing_logs and existing_logs[exercise.id] %}
{% set suggested_reps = existing_logs[exercise.id][-1].reps_completed %}
{% set suggested_weight = existing_logs[exercise.id][-1].weight_used %}
{% elif suggestions and suggestions[exercise.id] %}
{% set suggested_reps = suggestions[exercise.id].suggested_reps %}
{% set suggested_weight = suggestions[exercise.id].suggested_weight %}
{% endif %}
{% if existing_logs and existing_logs[exercise.id] %}
{% set logs = existing_logs[exercise.id] %}
{% set exercise_id = exercise.id %}