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>
55 lines
1.9 KiB
HTML
55 lines
1.9 KiB
HTML
<article>
|
|
<header>
|
|
<hgroup>
|
|
<h3>{{ exercise.name }}</h3>
|
|
<p>{{ exercise.muscle_group }} | {{ exercise.sets }} sets | Tempo: {{ exercise.tempo }}</p>
|
|
</hgroup>
|
|
</header>
|
|
|
|
{% if program %}
|
|
<div class="grid">
|
|
<div>
|
|
<small>Week 1</small>
|
|
<p>{{ program.wk1_reps }} reps @ {{ program.wk1_weight }}</p>
|
|
</div>
|
|
<div>
|
|
<small>Week 4</small>
|
|
<p>{{ program.wk4_reps }} reps @ {{ program.wk4_weight }}</p>
|
|
</div>
|
|
</div>
|
|
{% endif %}
|
|
|
|
{% if suggestions and suggestions[exercise.id] %}
|
|
{% set suggestion = suggestions[exercise.id] %}
|
|
{% include "partials/progression_badge.html" %}
|
|
{% endif %}
|
|
|
|
<details>
|
|
<summary>Form Cues</summary>
|
|
<p>{{ exercise.form_cues }}</p>
|
|
</details>
|
|
|
|
<!-- 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 %}
|
|
{% set next_set = logs|length + 1 %}
|
|
{% include "partials/log_entry.html" %}
|
|
{% else %}
|
|
{% set exercise_id = exercise.id %}
|
|
{% set next_set = 1 %}
|
|
{% include "partials/log_form.html" %}
|
|
{% endif %}
|
|
</div>
|
|
{% endif %}
|
|
</article>
|