Correcly assign scores to allcorrect questions

Author: franfill1

packages/quizms-mdx/src/components/client/answers.tsx

@@ -12,6 +12,7 @@ import {
   useState,
 } from "react";
 
+import { decodeAllCorrectAnswer, encodeAllCorrectAnswer } from "@olinfo/quizms/models";
 import { useStudent } from "@olinfo/quizms/student";
 import clsx from "clsx";
 import { Trash2 } from "lucide-react";
@@ -122,20 +123,24 @@ export function AllCorrectAnswerClient({ correct, children }: AnswerProps) {
   const { registerCorrectOption } = use(MultipleChoiceContext);
 
   const answer = student.answers?.[problemId!];
-  const currentlyChecked = useMemo(
-    () => typeof answer === "string" && answer.indexOf(id) !== -1,
-    [answer, id],
+  const parsedAnswer = useMemo<string[]>(() => decodeAllCorrectAnswer(answer), [answer]);
+  const currentlyChecked = useMemo(() => parsedAnswer.indexOf(id) !== -1, [parsedAnswer, id]);
+  const setAnswer = useCallback(
+    async (value: string, checked: boolean) => {
+      const newAnswer = parsedAnswer;
+      const index = parsedAnswer.indexOf(value);
+      if (checked && index === -1) {
+        newAnswer.push(value);
+      } else if (!checked && index !== -1) {
+        newAnswer.splice(index, 1);
+      }
+      await setStudent({
+        ...student,
+        answers: { ...student.answers, [problemId!]: encodeAllCorrectAnswer(newAnswer) },
+      });
+    },
+    [parsedAnswer, student, problemId, setStudent],
   );
-  const setAnswer = async (value: string, checked: boolean) => {
-    const currentAnswer = typeof answer !== "string" ? "" : answer;
-    let newAnswer = currentAnswer;
-    if (checked && !currentlyChecked) {
-      newAnswer = currentAnswer.split("").concat(value).sort().join("");
-    } else if (!checked && currentlyChecked) {
-      newAnswer = currentAnswer.replace(value, "");
-    }
-    await setStudent({ ...student, answers: { ...student.answers, [problemId!]: newAnswer } });
-  };
 
   const answerId = useId();
 

packages/quizms/src/models/variant.ts

@@ -59,6 +59,21 @@ export type Schema = Variant["schema"];
 export type ClientVariant = z.infer<typeof clientVariantSchema>;
 export type ClientSchema = ClientVariant["schema"];
 
+export function decodeAllCorrectAnswer(answer?: Answer): string[] {
+  if (typeof answer !== "string") {
+    return [];
+  }
+  try {
+    return JSON.parse(answer);
+  } catch {
+    return [];
+  }
+}
+
+export function encodeAllCorrectAnswer(value: string[]): Answer {
+  return JSON.stringify(value);
+}
+
 export function parseAnswer(answer: string, schema: Schema[string]): Answer {
   let value: Answer = answer.trim().toUpperCase();
   if (!value) return null;
@@ -68,10 +83,30 @@ export function parseAnswer(answer: string, schema: Schema[string]): Answer {
       value = Number(value);
     }
   }
+
+  if (schema.kind === "allCorrect") {
+    value = encodeAllCorrectAnswer(answer.split(""));
+  }
+
   isValidAnswer(value, schema);
   return value;
 }
 
+export function displayAnswer(answer: Answer, kind: Schema[string]["kind"]): string {
+  switch (kind) {
+    case "allCorrect": {
+      const values = decodeAllCorrectAnswer(answer);
+      return values.join("");
+    }
+    default: {
+      if (answer === null) {
+        return "";
+      }
+      return `${answer}`;
+    }
+  }
+}
+
 export function isValidAnswer(answer: Answer, schema: Schema[string]) {
   if (answer == null) return;
   if (schema.type === "number" && !Number.isInteger(answer)) {
@@ -86,6 +121,16 @@ export function isValidAnswer(answer: Answer, schema: Schema[string]) {
       break;
     }
     case "allCorrect": {
+      const values = decodeAllCorrectAnswer(answer);
+      const wrong = values.filter(
+        (value) => !schema.options.some((option) => option.value === value),
+      );
+      if (wrong.length >= 1) {
+        throw new Error(`Opzioni non valide: ${wrong.join("")}`);
+      }
+      if (new Set(values).size !== values.length) {
+        throw new Error(`Opzioni ripetute: ${values.join("")}`);
+      }
       break;
     }
     default: {
@@ -114,6 +159,20 @@ export function calcScore(student: Student, schema?: Schema) {
 }
 
 export function calcProblemPoints(problem: Schema[string], answer?: Answer) {
+  if (problem.kind === "allCorrect") {
+    const values = decodeAllCorrectAnswer(answer);
+    if (values.length === 0) {
+      return 1; // TODO: save points in schema
+    }
+    const correctOptions = problem.options.filter((option) => option.points === 5);
+    if (
+      correctOptions.length !== values.length &&
+      correctOptions.some((option) => !values.some((value) => option.value === value))
+    ) {
+      return 0;
+    }
+    return 5;
+  }
   for (const option of problem.options ?? []) {
     if (option.value === (answer ?? null)) {
       return option.points;

packages/quizms/src/web/teacher/table/index.tsx

@@ -15,6 +15,7 @@ import { Download, FileCheck, Trash2, TriangleAlert, Upload, UserCheck } from "l
 import {
   type Contest,
   calcScore,
+  displayAnswer,
   formatUserData,
   parseAnswer,
   parseUserData,
@@ -299,7 +300,9 @@ function columnDefinition(
         valueGetter: ({ data }) => {
           if (data.absent || data.disabled) return "";
           if (!(id in (data.answers ?? {}))) return "";
-          return data.answers[id] ?? "";
+          return (
+            displayAnswer(data.answers[id], variants[data.variant as string].schema[id].kind) ?? ""
+          );
         },
         tooltipValueGetter: ({ data }) => data.answers?.[id],
         editable: ({ data }) => contest.allowAnswerEdit && !data.absent && !data.disabled,