diff --git a/backend/alembic/versions/b2c3d4e5f6a7_plan_origin.py b/backend/alembic/versions/b2c3d4e5f6a7_plan_origin.py
new file mode 100644
index 0000000..1468446
--- /dev/null
+++ b/backend/alembic/versions/b2c3d4e5f6a7_plan_origin.py
@@ -0,0 +1,47 @@
+"""Mark study-plan source quizzes with origin='plan'
+
+Board Review I–XII exist twice over: once as a study plan the learner works
+through block by block, and once as the bulk quiz the plan was built from. The
+session list showed both, so the same twelve titles appeared under "Sessions"
+and again under "Library" with nothing to tell them apart.
+
+Tagging the bulk quizzes keeps them intact — the questions still hang off them
+via `source_quiz_id` — while taking them out of the list of things a learner
+picks from. A quiz already sat stays in the history regardless; that filtering
+lives in the endpoint, not here.
+
+Revision ID: b2c3d4e5f6a7
+Revises: a1b2c3d4e5f6
+"""
+import sqlalchemy as sa
+from alembic import op
+
+revision = "b2c3d4e5f6a7"
+down_revision = "a1b2c3d4e5f6"
+branch_labels = None
+depends_on = None
+
+
+def _has(table: str) -> bool:
+ return table in sa.inspect(op.get_bind()).get_table_names()
+
+
+def upgrade() -> None:
+ # Guarded because create_all() may have built these tables on a fresh
+ # deploy before Alembic ran.
+ if not (_has("quizzes") and _has("study_plans")):
+ return
+ # Matched on the trimmed title: one of the imports carries a trailing
+ # space ("Board Review VII ").
+ op.execute(sa.text("""
+ UPDATE quizzes SET origin = 'plan'
+ WHERE course_id IS NULL
+ AND origin <> 'plan'
+ AND btrim(title) IN (SELECT btrim(name) FROM study_plans)
+ """))
+
+
+def downgrade() -> None:
+ if not _has("quizzes"):
+ return
+ op.execute(sa.text("UPDATE quizzes SET origin = 'bank' WHERE origin = 'plan'"))
diff --git a/backend/app/models/quiz.py b/backend/app/models/quiz.py
index d191c0c..d027bf8 100644
--- a/backend/app/models/quiz.py
+++ b/backend/app/models/quiz.py
@@ -7,6 +7,11 @@ from app.database import Base
from app.models.quiz_category import QuizCategory # noqa — ensures mapper resolves "QuizCategory"
from app.models.quiz_question_link import QuizQuestionLink # noqa
+#: `Quiz.origin` for a quiz that backs a study-plan block rather than standing
+#: on its own. Kept here because both the study-plan builder that sets it and
+#: the session list that filters on it need the same spelling.
+PLAN_ORIGIN = "plan"
+
class Quiz(Base):
__tablename__ = "quizzes"
@@ -29,7 +34,10 @@ class Quiz(Base):
questions_per_attempt = Column(Integer, nullable=True) # null = all; set = random subset from pool
allow_review = Column(Integer, default=1) # 1 = students can review answers after submit, 0 = no review
share_token = Column(String(64), unique=True, nullable=True) # public /share/{token} link when set
- origin = Column(String(20), default="bank") # bank | upload | ai
+ # bank | upload | ai | sample | plan.
+ # "plan" marks a quiz that exists to back a study-plan block. It is still a
+ # real quiz — it just is not something the learner picks off a list.
+ origin = Column(String(20), default="bank")
section = relationship("Section", back_populates="quizzes")
user = relationship("User", back_populates="quizzes")
diff --git a/backend/app/routers/quizzes.py b/backend/app/routers/quizzes.py
index 602c96d..eae2cd1 100644
--- a/backend/app/routers/quizzes.py
+++ b/backend/app/routers/quizzes.py
@@ -8,7 +8,7 @@ from sqlalchemy.orm import Session
from app.utils.upload_access import validate_image_attachments
from app.utils.quiz_questions import validate_option_explanations
from app.database import get_db
-from app.models.quiz import Quiz
+from app.models.quiz import PLAN_ORIGIN, Quiz
from app.models.quiz_category import QuizCategory
from app.models.question import Question as QuestionModel
from app.models.section import Section
@@ -333,6 +333,12 @@ def list_quiz_sessions(
for quiz in quizzes:
live = active.get(quiz.id)
done = finished.get(quiz.id, [])
+ # Material belonging to a study plan is not a session of its own. It is
+ # listed, and started, on the plan — showing it here as well put the
+ # same twelve titles under two headings with no way to tell them apart.
+ # Once the learner has actually sat it, it is history and belongs here.
+ if quiz.origin == PLAN_ORIGIN and not live and not done:
+ continue
last = done[-1] if done else None
per_attempt = quiz.questions_per_attempt or quiz.questions_count or 0
diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx
index 128ddd7..8cb2fed 100644
--- a/frontend/src/App.jsx
+++ b/frontend/src/App.jsx
@@ -13,7 +13,6 @@ const UploadPage = lazy(() => import('./pages/UploadPage'))
const DocumentDetailPage = lazy(() => import('./pages/DocumentDetailPage'))
const QuizPage = lazy(() => import('./pages/QuizPage'))
const CustomQuizPage = lazy(() => import('./pages/CustomQuizPage'))
-const QuizzesPage = lazy(() => import('./pages/QuizzesPage'))
const ResultsPage = lazy(() => import('./pages/ResultsPage'))
const AdminPage = lazy(() => import('./pages/AdminPage'))
const AccountPage = lazy(() => import('./pages/AccountPage'))
@@ -79,6 +78,17 @@ function RequireAuth({ moderator = false }) {
return
}
+/**
+ * Sends an old /quizzes URL to its /sessions equivalent, keeping whatever
+ * follows and any query string. `replace` so the browser's Back button skips
+ * the dead address rather than bouncing the learner straight back to it.
+ */
+function LegacyQuizRedirect() {
+ const { pathname, search, hash } = useLocation()
+ const rest = pathname.replace(/^\/quizzes/, '')
+ return
+}
+
function AppRoutes() {
const { user, loading } = useAuth()
if (loading) return
@@ -100,10 +110,9 @@ function AppRoutes() {
}>
}>
} />
- } />
} />
- } />
- } />
+ } />
+ } />
} />
} />
} />
@@ -135,7 +144,7 @@ function AppRoutes() {
}>
}>
} />
- } />
+ } />
} />
} />
} />
@@ -145,6 +154,11 @@ function AppRoutes() {
+ {/* The word "quiz" is gone from the interface, but links to it are in
+ bookmarks, in shared messages, and in anything already open in a
+ second tab. These keep working rather than landing on Not Found. */}
+ } />
+
{/* Catch-all */}
: } />
diff --git a/frontend/src/components/CategoryPerformance.jsx b/frontend/src/components/CategoryPerformance.jsx
index 1155320..d964531 100644
--- a/frontend/src/components/CategoryPerformance.jsx
+++ b/frontend/src/components/CategoryPerformance.jsx
@@ -56,10 +56,10 @@ export default function CategoryPerformance() {
+ onClick={() => navigate(`/sessions/create?adaptive=1&count=${adaptiveCount}`)}>Start adaptive session
{main.length > 0 && (
)}
diff --git a/frontend/src/components/ContinueStudy.jsx b/frontend/src/components/ContinueStudy.jsx
index a92625d..2a832b8 100644
--- a/frontend/src/components/ContinueStudy.jsx
+++ b/frontend/src/components/ContinueStudy.jsx
@@ -44,7 +44,7 @@ export default function ContinueStudy() {
- {/* Expanding a list in place answers a smaller question than
- the one being asked. The history page has the filters. */}
-
- Full session history ({visibleRows.length}) →
-
-
- {pct >= 90 ? "Excellent — you've mastered this material." :
- pct >= 75 ? 'Good work! Review any missed questions below.' :
- pct >= 50 ? 'Getting there — study the explanations and retake.' :
- 'Review all explanations carefully before retaking.'}
-
+ {/* The score, the bands and "what next" are the analysis page's job.
+ Repeating them here gave the learner two different-looking verdicts on
+ the same attempt. This page is the answer-by-answer review, so it
+ opens with the way back to the analysis and nothing else.
- {/* Score bar */}
-
-
-
= 75 ? '#22c55e' : pct >= 50 ? '#f59e0b' : '#ef4444',
- }} />
+ A course quiz has no analysis page — there the score card stays. */}
+ {isCourseQuiz ? (
+
diff --git a/frontend/src/pages/SessionsPage.css b/frontend/src/pages/SessionsPage.css
index 84bdefe..50df917 100644
--- a/frontend/src/pages/SessionsPage.css
+++ b/frontend/src/pages/SessionsPage.css
@@ -75,3 +75,5 @@
.sx-actions { width: 100%; }
.sx-actions .btn { flex: 1; }
}
+
+.sx-header-actions { display: flex; gap: 8px; flex-wrap: wrap; }
diff --git a/frontend/src/pages/SessionsPage.jsx b/frontend/src/pages/SessionsPage.jsx
index e428799..e92e475 100644
--- a/frontend/src/pages/SessionsPage.jsx
+++ b/frontend/src/pages/SessionsPage.jsx
@@ -33,10 +33,10 @@ const SORTS = [
/**
* Every session, in full, with the sidebar doing the narrowing.
*
- * The quizzes page shows a handful and stops. That is right for a landing
- * point and wrong for the question "what have I actually done" — which is what
- * this page answers, so nothing here is truncated and nothing needs a
- * "show all".
+ * This is the only list of sessions there is. It replaced a page that showed
+ * the same rows twice — once as "Sessions" and again as "Library" — which gave
+ * two names to one thing and no way to tell them apart. Material a learner has
+ * not started is not a session: it is a study plan, and it is listed there.
*/
export default function SessionsPage() {
const [rows, setRows] = useState([])
@@ -93,10 +93,16 @@ export default function SessionsPage() {
-
Session history
+
Sessions
Every test you have started or finished.
- Quizzes
+ {/* Where a new one comes from. The course material itself lives in the
+ study plans — this page is the record of working through it, not a
+ second copy of the catalogue. */}
+
+ Study plans
+ Create custom test
+
@@ -175,7 +181,7 @@ export default function SessionsPage() {
once it has been sat, the session itself otherwise.
It used to launch the test on click. */}
+ ? `/analysis/session/${row.last_attempt_id}` : `/sessions/${row.quiz_id}`}>
{row.title}
@@ -202,13 +208,13 @@ export default function SessionsPage() {
{row.state === 'in_progress' && (
- Resume
+ Resume
)}
{row.last_attempt_id && (
Review
)}
{row.state === 'not_started' && (
- Start
+ Start
)}
diff --git a/frontend/src/pages/StudyPlanPage.jsx b/frontend/src/pages/StudyPlanPage.jsx
index f946303..8e66ad5 100644
--- a/frontend/src/pages/StudyPlanPage.jsx
+++ b/frontend/src/pages/StudyPlanPage.jsx
@@ -56,7 +56,7 @@ export default function StudyPlanPage() {
setBusy(true); setError('')
try {
const res = await api.post(`/study-plans/blocks/${block.id}/start`, null, { params: { mode } })
- navigate(`/quizzes/${res.data.id}`)
+ navigate(`/sessions/${res.data.id}`)
} catch (err) { setError(apiError(err, 'Could not start this block')) }
finally { setBusy(false) }
}
@@ -300,7 +300,7 @@ export default function StudyPlanPage() {
Sessions
{block.quiz_id ? (
-
+
{block.completed ? 'Review this block' : 'Continue this block'}
) : block.question_count === 0 ? (
diff --git a/frontend/src/pages/StudyPlanPage.test.jsx b/frontend/src/pages/StudyPlanPage.test.jsx
index c68d91a..41d31f4 100644
--- a/frontend/src/pages/StudyPlanPage.test.jsx
+++ b/frontend/src/pages/StudyPlanPage.test.jsx
@@ -86,7 +86,7 @@ describe('study plans', () => {
it('offers both modes on a fresh block and continues one already started', async () => {
mountPlan()
const started = (await screen.findByText('Block 1')).closest('.block')
- expect(within(started).getByRole('link', { name: 'Review this block' })).toHaveAttribute('href', '/quizzes/77')
+ expect(within(started).getByRole('link', { name: 'Review this block' })).toHaveAttribute('href', '/sessions/77')
const fresh = screen.getByText('Block 2').closest('.block')
api.post.mockResolvedValue({ data: { id: 91 } })
e.target.style.display = 'none'} />
- 
e.currentTarget.style.display = 'none'} />
-