답 입력 완료시 정답/오답 내용 출력
This commit is contained in:
@@ -290,7 +290,7 @@ export default function PlayClient({ problemCount }: PlayClientProps) {
|
|||||||
{currentResult ? (
|
{currentResult ? (
|
||||||
<FeedbackPanel
|
<FeedbackPanel
|
||||||
result={currentResult}
|
result={currentResult}
|
||||||
answerLatex={currentProblem.latexAfter}
|
problem={currentProblem}
|
||||||
isLastProblem={isLastProblem}
|
isLastProblem={isLastProblem}
|
||||||
onNext={handleNextProblem}
|
onNext={handleNextProblem}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -3,22 +3,38 @@
|
|||||||
import { useEffect, useRef } from "react";
|
import { useEffect, useRef } from "react";
|
||||||
|
|
||||||
import KatexRenderer from "@/components/math/KatexRenderer";
|
import KatexRenderer from "@/components/math/KatexRenderer";
|
||||||
import type { GradeResult } from "@/lib/engine/types";
|
import type { GradeResult, ParenthesisSignProblem } from "@/lib/engine/types";
|
||||||
|
|
||||||
interface FeedbackPanelProps {
|
interface FeedbackPanelProps {
|
||||||
result: GradeResult;
|
result: GradeResult;
|
||||||
answerLatex: string;
|
problem: ParenthesisSignProblem;
|
||||||
isLastProblem: boolean;
|
isLastProblem: boolean;
|
||||||
onNext: () => void;
|
onNext: () => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function formatSignedNumber(value: number) {
|
||||||
|
return value < 0 ? `(${value})` : `${value}`;
|
||||||
|
}
|
||||||
|
|
||||||
export default function FeedbackPanel({
|
export default function FeedbackPanel({
|
||||||
result,
|
result,
|
||||||
answerLatex,
|
problem,
|
||||||
isLastProblem,
|
isLastProblem,
|
||||||
onNext,
|
onNext,
|
||||||
}: FeedbackPanelProps) {
|
}: FeedbackPanelProps) {
|
||||||
const nextButtonRef = useRef<HTMLButtonElement>(null);
|
const nextButtonRef = useRef<HTMLButtonElement>(null);
|
||||||
|
const signedTerms = [
|
||||||
|
problem.a,
|
||||||
|
problem.operator === "-" ? -problem.b : problem.b,
|
||||||
|
] as const;
|
||||||
|
const feedbackItems = signedTerms.map((term, index) => ({
|
||||||
|
formulaLatex: `${formatSignedNumber(
|
||||||
|
problem.multiplier,
|
||||||
|
)}\\times ${formatSignedNumber(term)}`,
|
||||||
|
userAnswer: result.userAnswer[index],
|
||||||
|
correctAnswer: result.correctAnswer[index],
|
||||||
|
correct: result.userAnswer[index] === result.correctAnswer[index],
|
||||||
|
}));
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
nextButtonRef.current?.focus();
|
nextButtonRef.current?.focus();
|
||||||
@@ -35,9 +51,53 @@ export default function FeedbackPanel({
|
|||||||
<p className="text-lg font-bold">
|
<p className="text-lg font-bold">
|
||||||
{result.correct ? "정답입니다." : "오답입니다."}
|
{result.correct ? "정답입니다." : "오답입니다."}
|
||||||
</p>
|
</p>
|
||||||
<div className="mt-3 text-xl font-semibold">
|
<ul className="mt-5 space-y-3">
|
||||||
<KatexRenderer latex={answerLatex} />
|
{feedbackItems.map((item, index) => (
|
||||||
</div>
|
<li
|
||||||
|
key={index}
|
||||||
|
className={`flex flex-wrap items-center gap-x-2 gap-y-1 rounded-md px-4 py-3 text-lg font-semibold ring-1 ring-inset ${
|
||||||
|
item.correct
|
||||||
|
? "bg-emerald-100 text-emerald-950 ring-emerald-200"
|
||||||
|
: "bg-red-100 text-red-950 ring-red-200"
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
<KatexRenderer latex={item.formulaLatex} output="mathml" />
|
||||||
|
<span aria-hidden="true">=</span>
|
||||||
|
<span className={item.correct ? undefined : "text-red-700"}>
|
||||||
|
<KatexRenderer latex={`${item.userAnswer}`} output="mathml" />
|
||||||
|
</span>
|
||||||
|
{item.correct ? (
|
||||||
|
<span
|
||||||
|
aria-label="정답"
|
||||||
|
role="img"
|
||||||
|
className="inline-flex h-7 items-center text-2xl leading-none text-emerald-700"
|
||||||
|
>
|
||||||
|
○
|
||||||
|
</span>
|
||||||
|
) : (
|
||||||
|
<>
|
||||||
|
<span
|
||||||
|
aria-label="오답"
|
||||||
|
role="img"
|
||||||
|
className="mr-2 inline-flex h-7 items-center text-2xl leading-none text-red-700"
|
||||||
|
>
|
||||||
|
×
|
||||||
|
</span>
|
||||||
|
<span className="text-slate-700">
|
||||||
|
(
|
||||||
|
<span className="font-bold">
|
||||||
|
<KatexRenderer
|
||||||
|
latex={`${item.correctAnswer}`}
|
||||||
|
output="mathml"
|
||||||
|
/>
|
||||||
|
</span>
|
||||||
|
)
|
||||||
|
</span>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</li>
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
<button
|
<button
|
||||||
ref={nextButtonRef}
|
ref={nextButtonRef}
|
||||||
type="button"
|
type="button"
|
||||||
|
|||||||
@@ -5,14 +5,17 @@ import { renderToString } from "katex";
|
|||||||
interface KatexRendererProps {
|
interface KatexRendererProps {
|
||||||
latex: string;
|
latex: string;
|
||||||
displayMode?: boolean;
|
displayMode?: boolean;
|
||||||
|
output?: "htmlAndMathml" | "mathml";
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function KatexRenderer({
|
export default function KatexRenderer({
|
||||||
latex,
|
latex,
|
||||||
displayMode = false,
|
displayMode = false,
|
||||||
|
output = "htmlAndMathml",
|
||||||
}: KatexRendererProps) {
|
}: KatexRendererProps) {
|
||||||
const html = renderToString(latex, {
|
const html = renderToString(latex, {
|
||||||
displayMode,
|
displayMode,
|
||||||
|
output,
|
||||||
throwOnError: false,
|
throwOnError: false,
|
||||||
});
|
});
|
||||||
const Tag = displayMode ? "div" : "span";
|
const Tag = displayMode ? "div" : "span";
|
||||||
|
|||||||
@@ -36,12 +36,16 @@ describe("parenthesis sign problem engine", () => {
|
|||||||
it("grades correct and incorrect answers", () => {
|
it("grades correct and incorrect answers", () => {
|
||||||
const problem = generateProblem();
|
const problem = generateProblem();
|
||||||
|
|
||||||
expect(
|
const correctResult = gradeAnswer(problem, {
|
||||||
gradeAnswer(problem, {
|
a: problem.distributedA,
|
||||||
a: problem.distributedA,
|
b: problem.distributedB,
|
||||||
b: problem.distributedB,
|
});
|
||||||
}).correct,
|
|
||||||
).toBe(true);
|
expect(correctResult.correct).toBe(true);
|
||||||
|
expect(correctResult.userAnswer).toEqual([
|
||||||
|
problem.distributedA,
|
||||||
|
problem.distributedB,
|
||||||
|
]);
|
||||||
|
|
||||||
expect(
|
expect(
|
||||||
gradeAnswer(problem, {
|
gradeAnswer(problem, {
|
||||||
|
|||||||
@@ -120,6 +120,7 @@ export function gradeAnswer(
|
|||||||
return {
|
return {
|
||||||
correct:
|
correct:
|
||||||
answer.a === problem.distributedA && answer.b === problem.distributedB,
|
answer.a === problem.distributedA && answer.b === problem.distributedB,
|
||||||
|
userAnswer: [answer.a, answer.b],
|
||||||
correctAnswer: [problem.distributedA, problem.distributedB],
|
correctAnswer: [problem.distributedA, problem.distributedB],
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,5 +18,6 @@ export interface UserAnswer {
|
|||||||
|
|
||||||
export interface GradeResult {
|
export interface GradeResult {
|
||||||
correct: boolean;
|
correct: boolean;
|
||||||
|
userAnswer: [number, number];
|
||||||
correctAnswer: [number, number];
|
correctAnswer: [number, number];
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user