feat: add smart "Workout Now" recommendation to workout picker

Auto-recommends the next workout in the 4-day cycle based on the
user's last completed session (one with logged sets). Redesigns
the /workouts page with highlighted recommendation card and
renames the back button to "Change Workout".

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
2026-03-13 13:05:39 -05:00
parent 931e452205
commit 4b117c6fa7
4 changed files with 60 additions and 5 deletions

View File

@@ -14,6 +14,7 @@ from sqlmodel import Session, select
from app.database import get_db_session
from app.models.user import User
from app.models.user_exercise_program import UserExerciseProgram
from app.models.workout_day import WorkoutDay
from app.services.exercise_service import ExerciseService
from app.services.log_service import LogService
from app.services.progression_service import ProgressionService
@@ -31,14 +32,40 @@ async def workout_days_list(
session: Session = Depends(get_db_session),
profile: User = Depends(require_active_profile),
):
"""List all workout days as clickable cards."""
"""List all workout days with a recommendation for what to do next."""
exercise_service = ExerciseService(session)
days = exercise_service.list_workout_days()
ws_service = WorkoutSessionService(session)
last_session = ws_service.get_last_completed_session(profile.id)
recommended_day_id = None
last_workout_name = None
last_workout_date = None
if last_session:
last_day = session.get(WorkoutDay, last_session.workout_day_id)
if last_day:
last_workout_name = last_day.name
last_workout_date = last_session.date
next_day_number = (last_day.day_number % 4) + 1
for d in days:
if d.day_number == next_day_number:
recommended_day_id = d.id
break
else:
for d in days:
if d.day_number == 1:
recommended_day_id = d.id
break
templates = request.app.state.templates
return templates.TemplateResponse("pages/workout_days.html", {
"request": request,
"days": days,
"recommended_day_id": recommended_day_id,
"last_workout_name": last_workout_name,
"last_workout_date": last_workout_date,
})

View File

@@ -10,6 +10,7 @@ from typing import Optional
import structlog
from sqlmodel import Session, select
from app.models.workout_log import WorkoutLog
from app.models.workout_session import WorkoutSession
logger = structlog.get_logger(__name__)
@@ -71,6 +72,17 @@ class WorkoutSessionService:
)
return ws
def get_last_completed_session(self, user_id: int) -> Optional[WorkoutSession]:
"""Get the most recent session that has at least one logged set."""
statement = (
select(WorkoutSession)
.join(WorkoutLog, WorkoutLog.session_id == WorkoutSession.id)
.where(WorkoutSession.user_id == user_id)
.order_by(WorkoutSession.date.desc())
.limit(1)
)
return self._session.exec(statement).first()
def list_sessions(
self,
user_id: int,

View File

@@ -27,5 +27,5 @@
{% endfor %}
</section>
<a href="/workouts" role="button" class="outline">Back to All Days</a>
<a href="/workouts" role="button" class="outline">Change Workout</a>
{% endblock %}

View File

@@ -1,20 +1,36 @@
{% extends "base.html" %}
{% block title %}Workout Days — SneakySwole{% endblock %}
{% block title %}Workout Now — SneakySwole{% endblock %}
{% block content %}
<h1>Workout Days</h1>
<h1>Workout Now</h1>
<p>
{% if last_workout_name %}
Last workout: <strong>{{ last_workout_name }}</strong> on {{ last_workout_date.strftime('%b %-d') }}
{% else %}
No workouts yet — start with Push!
{% endif %}
</p>
<div class="grid">
{% for day in days %}
<article>
<header>
<h3>Day {{ day.day_number }}: {{ day.name }}</h3>
{% if day.id == recommended_day_id %}
<mark>Recommended Next</mark>
{% endif %}
</header>
<p>{{ day.description }}</p>
<footer>
{% if day.id == recommended_day_id %}
<a href="/workouts/{{ day.name|lower|replace(' ', '-') }}"
role="button">View Workout</a>
role="button">Start Workout</a>
{% else %}
<a href="/workouts/{{ day.name|lower|replace(' ', '-') }}"
role="button" class="outline">Start Workout</a>
{% endif %}
</footer>
</article>
{% endfor %}