analytica-frontend-lib 1.1.9 → 1.1.11

package/dist/Quiz/index.d.mts

@@ -21,16 +21,15 @@ declare const QuizContent: react.ForwardRefExoticComponent<{
     paddingBottom?: string;
 } & react.RefAttributes<HTMLDivElement>>;
 interface QuizVariantInterface {
-    variant?: 'result' | 'default';
     paddingBottom?: string;
 }
-declare const QuizAlternative: ({ variant, paddingBottom, }: QuizVariantInterface) => react_jsx_runtime.JSX.Element;
-declare const QuizMultipleChoice: ({ variant, paddingBottom, }: QuizVariantInterface) => react_jsx_runtime.JSX.Element;
-declare const QuizDissertative: ({ variant, paddingBottom, }: QuizVariantInterface) => react_jsx_runtime.JSX.Element;
-declare const QuizTrueOrFalse: ({ variant, paddingBottom, }: QuizVariantInterface) => react_jsx_runtime.JSX.Element;
-declare const QuizConnectDots: ({ variant, paddingBottom, }: QuizVariantInterface) => react_jsx_runtime.JSX.Element;
-declare const QuizFill: ({ variant, paddingBottom, }: QuizVariantInterface) => react_jsx_runtime.JSX.Element;
-declare const QuizImageQuestion: ({ variant, paddingBottom, }: QuizVariantInterface) => react_jsx_runtime.JSX.Element;
+declare const QuizAlternative: ({ paddingBottom }: QuizVariantInterface) => react_jsx_runtime.JSX.Element;
+declare const QuizMultipleChoice: ({ paddingBottom }: QuizVariantInterface) => react_jsx_runtime.JSX.Element;
+declare const QuizDissertative: ({ paddingBottom }: QuizVariantInterface) => react_jsx_runtime.JSX.Element;
+declare const QuizTrueOrFalse: ({ paddingBottom }: QuizVariantInterface) => react_jsx_runtime.JSX.Element;
+declare const QuizConnectDots: ({ paddingBottom }: QuizVariantInterface) => react_jsx_runtime.JSX.Element;
+declare const QuizFill: ({ paddingBottom }: QuizVariantInterface) => react_jsx_runtime.JSX.Element;
+declare const QuizImageQuestion: ({ paddingBottom }: QuizVariantInterface) => react_jsx_runtime.JSX.Element;
 declare const QuizQuestionList: ({ filterType, onQuestionClick, }?: {
     filterType?: string;
     onQuestionClick?: () => void;

package/dist/Quiz/index.d.ts

@@ -21,16 +21,15 @@ declare const QuizContent: react.ForwardRefExoticComponent<{
     paddingBottom?: string;
 } & react.RefAttributes<HTMLDivElement>>;
 interface QuizVariantInterface {
-    variant?: 'result' | 'default';
     paddingBottom?: string;
 }
-declare const QuizAlternative: ({ variant, paddingBottom, }: QuizVariantInterface) => react_jsx_runtime.JSX.Element;
-declare const QuizMultipleChoice: ({ variant, paddingBottom, }: QuizVariantInterface) => react_jsx_runtime.JSX.Element;
-declare const QuizDissertative: ({ variant, paddingBottom, }: QuizVariantInterface) => react_jsx_runtime.JSX.Element;
-declare const QuizTrueOrFalse: ({ variant, paddingBottom, }: QuizVariantInterface) => react_jsx_runtime.JSX.Element;
-declare const QuizConnectDots: ({ variant, paddingBottom, }: QuizVariantInterface) => react_jsx_runtime.JSX.Element;
-declare const QuizFill: ({ variant, paddingBottom, }: QuizVariantInterface) => react_jsx_runtime.JSX.Element;
-declare const QuizImageQuestion: ({ variant, paddingBottom, }: QuizVariantInterface) => react_jsx_runtime.JSX.Element;
+declare const QuizAlternative: ({ paddingBottom }: QuizVariantInterface) => react_jsx_runtime.JSX.Element;
+declare const QuizMultipleChoice: ({ paddingBottom }: QuizVariantInterface) => react_jsx_runtime.JSX.Element;
+declare const QuizDissertative: ({ paddingBottom }: QuizVariantInterface) => react_jsx_runtime.JSX.Element;
+declare const QuizTrueOrFalse: ({ paddingBottom }: QuizVariantInterface) => react_jsx_runtime.JSX.Element;
+declare const QuizConnectDots: ({ paddingBottom }: QuizVariantInterface) => react_jsx_runtime.JSX.Element;
+declare const QuizFill: ({ paddingBottom }: QuizVariantInterface) => react_jsx_runtime.JSX.Element;
+declare const QuizImageQuestion: ({ paddingBottom }: QuizVariantInterface) => react_jsx_runtime.JSX.Element;
 declare const QuizQuestionList: ({ filterType, onQuestionClick, }?: {
     filterType?: string;
     onQuestionClick?: () => void;

package/dist/Quiz/index.js

@@ -995,6 +995,8 @@ var useQuizStore = (0, import_zustand2.create)()(
         isFinished: false,
         userId: "",
         variant: "default",
+        questionsResult: null,
+        currentQuestionResult: null,
         // Setters
         setBySimulated: (simulado) => set({ bySimulated: simulado }),
         setByActivity: (atividade) => set({ byActivity: atividade }),
@@ -1003,6 +1005,7 @@ var useQuizStore = (0, import_zustand2.create)()(
         setUserAnswers: (userAnswers) => set({ userAnswers }),
         getUserId: () => get().userId,
         setVariant: (variant) => set({ variant }),
+        setQuestionResult: (questionsResult) => set({ questionsResult }),
         // Navigation
         goToNextQuestion: () => {
           const { currentQuestionIndex, getTotalQuestions } = get();
@@ -1055,9 +1058,9 @@ var useQuizStore = (0, import_zustand2.create)()(
             questionId,
             activityId,
             userId,
-            answer: question.type === "DISSERTATIVA" /* DISSERTATIVA */ ? answerId : null,
-            optionId: question.type === "DISSERTATIVA" /* DISSERTATIVA */ ? null : answerId,
-            questionType: question.type,
+            answer: question.questionType === "DISSERTATIVA" /* DISSERTATIVA */ ? answerId : null,
+            optionId: question.questionType === "DISSERTATIVA" /* DISSERTATIVA */ ? null : answerId,
+            questionType: question.questionType,
             answerStatus: "PENDENTE_AVALIACAO" /* PENDENTE_AVALIACAO */
           };
           let updatedUserAnswers;
@@ -1097,7 +1100,7 @@ var useQuizStore = (0, import_zustand2.create)()(
               // selectMultipleAnswer is for non-dissertative questions
               optionId: answerId,
               // selectMultipleAnswer should only set optionId
-              questionType: question.type,
+              questionType: question.questionType,
               answerStatus: "PENDENTE_AVALIACAO" /* PENDENTE_AVALIACAO */
             })
           );
@@ -1124,7 +1127,7 @@ var useQuizStore = (0, import_zustand2.create)()(
           const question = activeQuiz.quiz.questions.find(
             (q) => q.id === questionId
           );
-          if (!question || question.type !== "DISSERTATIVA" /* DISSERTATIVA */) {
+          if (!question || question.questionType !== "DISSERTATIVA" /* DISSERTATIVA */) {
             console.warn(
               "selectDissertativeAnswer called for non-dissertative question"
             );
@@ -1174,7 +1177,7 @@ var useQuizStore = (0, import_zustand2.create)()(
               userId,
               answer: null,
               optionId: null,
-              questionType: currentQuestion.type,
+              questionType: currentQuestion.questionType,
               answerStatus: "PENDENTE_AVALIACAO" /* PENDENTE_AVALIACAO */
             };
             let updatedUserAnswers;
@@ -1210,9 +1213,9 @@ var useQuizStore = (0, import_zustand2.create)()(
             questionId,
             activityId,
             userId,
-            answer: question.type === "DISSERTATIVA" /* DISSERTATIVA */ ? answerId || null : null,
-            optionId: question.type !== "DISSERTATIVA" /* DISSERTATIVA */ ? answerId || null : null,
-            questionType: question.type,
+            answer: question.questionType === "DISSERTATIVA" /* DISSERTATIVA */ ? answerId || null : null,
+            optionId: question.questionType !== "DISSERTATIVA" /* DISSERTATIVA */ ? answerId || null : null,
+            questionType: question.questionType,
             answerStatus: "PENDENTE_AVALIACAO" /* PENDENTE_AVALIACAO */
           };
           if (existingAnswerIndex !== -1) {
@@ -1240,7 +1243,10 @@ var useQuizStore = (0, import_zustand2.create)()(
             timeElapsed: 0,
             isStarted: false,
             isFinished: false,
-            userId: ""
+            userId: "",
+            variant: "default",
+            questionsResult: null,
+            currentQuestionResult: null
           });
         },
         // Timer
@@ -1442,6 +1448,31 @@ var useQuizStore = (0, import_zustand2.create)()(
             (q) => q.id === questionId
           );
           return questionIndex + 1;
+        },
+        // Question Result
+        getQuestionResultByQuestionId: (questionId) => {
+          const { questionsResult } = get();
+          return questionsResult?.answers.find(
+            (answer) => answer.questionId === questionId
+          ) || null;
+        },
+        getQuestionResultStatistics: () => {
+          const { questionsResult } = get();
+          return questionsResult?.statistics || null;
+        },
+        getQuestionResult: () => {
+          const { questionsResult } = get();
+          return questionsResult;
+        },
+        setQuestionsResult: (questionsResult) => {
+          set({ questionsResult });
+        },
+        setCurrentQuestionResult: (currentQuestionResult) => {
+          set({ currentQuestionResult });
+        },
+        getCurrentQuestionResult: () => {
+          const { currentQuestionResult } = get();
+          return currentQuestionResult;
         }
       };
     },
@@ -4522,18 +4553,21 @@ var Quiz = (0, import_react12.forwardRef)(({ children, className, variant = "def
 });
 var QuizHeaderResult = (0, import_react12.forwardRef)(
   ({ className, ...props }, ref) => {
-    const { getAllCurrentAnswer } = useQuizStore();
-    const usersAnswer = getAllCurrentAnswer();
+    const { getQuestionResultByQuestionId, getCurrentQuestion } = useQuizStore();
     const [isCorrect, setIsCorrect] = (0, import_react12.useState)(false);
     (0, import_react12.useEffect)(() => {
-      if (usersAnswer) {
-        setIsCorrect(
-          usersAnswer.length > 0 ? usersAnswer.map(
-            (answer) => answer.answerStatus === "RESPOSTA_CORRETA" /* RESPOSTA_CORRETA */
-          ).every(Boolean) : false
-        );
+      const cq = getCurrentQuestion();
+      if (!cq) {
+        setIsCorrect(false);
+        return;
       }
-    }, [usersAnswer]);
+      const qr = getQuestionResultByQuestionId(cq.id);
+      setIsCorrect(qr?.answerStatus === "RESPOSTA_CORRETA" /* RESPOSTA_CORRETA */);
+    }, [
+      getCurrentQuestion,
+      getQuestionResultByQuestionId,
+      getCurrentQuestion()?.id
+    ]);
     return /* @__PURE__ */ (0, import_jsx_runtime17.jsxs)(
       "div",
       {
@@ -4616,7 +4650,7 @@ var QuizContainer = (0, import_react12.forwardRef)(({ children, className, ...pr
   );
 });
 var QuizContent = (0, import_react12.forwardRef)(({ paddingBottom }) => {
-  const { getCurrentQuestion, variant } = useQuizStore();
+  const { getCurrentQuestion } = useQuizStore();
   const currentQuestion = getCurrentQuestion();
   const questionComponents = {
     ["ALTERNATIVA" /* ALTERNATIVA */]: QuizAlternative,
@@ -4627,26 +4661,35 @@ var QuizContent = (0, import_react12.forwardRef)(({ paddingBottom }) => {
     ["PREENCHER" /* PREENCHER */]: QuizFill,
     ["IMAGEM" /* IMAGEM */]: QuizImageQuestion
   };
-  const QuestionComponent = currentQuestion ? questionComponents[currentQuestion.type] : null;
-  return QuestionComponent ? /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(QuestionComponent, { variant, paddingBottom }) : null;
+  const QuestionComponent = currentQuestion ? questionComponents[currentQuestion.questionType] : null;
+  return QuestionComponent ? /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(QuestionComponent, { paddingBottom }) : null;
 });
-var QuizAlternative = ({
-  variant = "default",
-  paddingBottom
-}) => {
-  const { getCurrentQuestion, selectAnswer, getCurrentAnswer } = useQuizStore();
+var QuizAlternative = ({ paddingBottom }) => {
+  const {
+    getCurrentQuestion,
+    selectAnswer,
+    getQuestionResultByQuestionId,
+    getCurrentAnswer,
+    variant
+  } = useQuizStore();
   const currentQuestion = getCurrentQuestion();
+  const currentQuestionResult = getQuestionResultByQuestionId(
+    currentQuestion?.id || ""
+  );
   const currentAnswer = getCurrentAnswer();
   const alternatives = currentQuestion?.options?.map((option) => {
     let status = "neutral" /* NEUTRAL */;
     if (variant === "result") {
-      const isCorrectOption = currentQuestion.options.find(
-        (op) => op.isCorrect
+      const isCorrectOption = currentQuestion.correctOptionIds?.includes(
+        option.id
       );
-      if (isCorrectOption?.id === option.id) {
+      const isSelected = currentQuestionResult?.optionId === option.id;
+      if (isCorrectOption) {
         status = "correct" /* CORRECT */;
-      } else if (currentAnswer?.optionId === option.id && option.id !== isCorrectOption?.id) {
+      } else if (isSelected && !isCorrectOption) {
         status = "incorrect" /* INCORRECT */;
+      } else {
+        status = "neutral" /* NEUTRAL */;
       }
     }
     return {
@@ -4666,8 +4709,8 @@ var QuizAlternative = ({
         name: `question-${currentQuestion?.id || "1"}`,
         layout: "compact",
         alternatives,
-        value: currentAnswer?.optionId || "",
-        selectedValue: currentAnswer?.optionId || "",
+        value: variant === "result" ? currentQuestionResult?.optionId || "" : currentAnswer?.optionId || "",
+        selectedValue: variant === "result" ? currentQuestionResult?.optionId || "" : currentAnswer?.optionId || "",
         onValueChange: (value) => {
           if (currentQuestion) {
             selectAnswer(currentQuestion.id, value);
@@ -4678,13 +4721,19 @@ var QuizAlternative = ({
     ) }) })
   ] });
 };
-var QuizMultipleChoice = ({
-  variant = "default",
-  paddingBottom
-}) => {
-  const { getCurrentQuestion, selectMultipleAnswer, getAllCurrentAnswer } = useQuizStore();
+var QuizMultipleChoice = ({ paddingBottom }) => {
+  const {
+    getCurrentQuestion,
+    selectMultipleAnswer,
+    getAllCurrentAnswer,
+    getQuestionResultByQuestionId,
+    variant
+  } = useQuizStore();
   const currentQuestion = getCurrentQuestion();
   const allCurrentAnswers = getAllCurrentAnswer();
+  const currentQuestionResult = getQuestionResultByQuestionId(
+    currentQuestion?.id || ""
+  );
   const prevSelectedValuesRef = (0, import_react12.useRef)([]);
   const prevQuestionIdRef = (0, import_react12.useRef)("");
   const allCurrentAnswerIds = (0, import_react12.useMemo)(() => {
@@ -4706,8 +4755,16 @@ var QuizMultipleChoice = ({
       prevSelectedValuesRef.current = selectedValues;
       return selectedValues;
     }
+    if (variant == "result" && currentQuestionResult?.options.length && currentQuestionResult?.options.length > 0) {
+      return currentQuestionResult?.options.map((op) => op.id) || [];
+    }
     return prevSelectedValuesRef.current;
-  }, [selectedValues, currentQuestion?.id]);
+  }, [
+    selectedValues,
+    currentQuestion?.id,
+    variant,
+    currentQuestionResult?.optionId
+  ]);
   const handleSelectedValues = (0, import_react12.useCallback)(
     (values) => {
       if (currentQuestion) {
@@ -4723,11 +4780,18 @@ var QuizMultipleChoice = ({
   const choices = currentQuestion?.options?.map((option) => {
     let status = "neutral" /* NEUTRAL */;
     if (variant === "result") {
-      const isAllCorrectOptionId = currentQuestion.options.filter((op) => op.isCorrect).map((op) => op.id);
-      if (isAllCorrectOptionId.includes(option.id)) {
+      const isCorrectOption = currentQuestion.correctOptionIds?.includes(
+        option.id
+      );
+      const isSelected = currentQuestionResult?.options.find(
+        (op) => op.id === option.id
+      );
+      if (isCorrectOption) {
         status = "correct" /* CORRECT */;
-      } else if (allCurrentAnswerIds?.includes(option.id) && !isAllCorrectOptionId.includes(option.id)) {
+      } else if (isSelected && !isCorrectOption) {
         status = "incorrect" /* INCORRECT */;
+      } else {
+        status = "neutral" /* NEUTRAL */;
       }
     }
     return {
@@ -4753,12 +4817,18 @@ var QuizMultipleChoice = ({
     ) }) })
   ] });
 };
-var QuizDissertative = ({
-  variant = "default",
-  paddingBottom
-}) => {
-  const { getCurrentQuestion, getCurrentAnswer, selectDissertativeAnswer } = useQuizStore();
+var QuizDissertative = ({ paddingBottom }) => {
+  const {
+    getCurrentQuestion,
+    getCurrentAnswer,
+    selectDissertativeAnswer,
+    getQuestionResultByQuestionId,
+    variant
+  } = useQuizStore();
   const currentQuestion = getCurrentQuestion();
+  const currentQuestionResult = getQuestionResultByQuestionId(
+    currentQuestion?.id || ""
+  );
   const currentAnswer = getCurrentAnswer();
   const textareaRef = (0, import_react12.useRef)(null);
   const handleAnswerChange = (value) => {
@@ -4782,6 +4852,7 @@ var QuizDissertative = ({
   if (!currentQuestion) {
     return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("div", { className: "space-y-4", children: /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("p", { className: "text-text-600 text-md", children: "Nenhuma quest\xE3o dispon\xEDvel" }) });
   }
+  const localAnswer = (variant == "result" ? currentQuestionResult?.answer : currentAnswer?.answer) || "";
   return /* @__PURE__ */ (0, import_jsx_runtime17.jsxs)(import_jsx_runtime17.Fragment, { children: [
     /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(QuizSubTitle, { subTitle: "Resposta" }),
     /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(QuizContainer, { className: cn(variant != "result" && paddingBottom), children: /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("div", { className: "space-y-4 max-h-[600px] overflow-y-auto", children: variant === "default" ? /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("div", { className: "space-y-4", children: /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
@@ -4789,22 +4860,20 @@ var QuizDissertative = ({
       {
         ref: textareaRef,
         placeholder: "Escreva sua resposta",
-        value: currentAnswer?.answer || "",
+        value: localAnswer,
         onChange: (e) => handleAnswerChange(e.target.value),
         rows: 4,
         className: "min-h-[120px] max-h-[400px] resize-none overflow-y-auto"
       }
-    ) }) : /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("div", { className: "space-y-4", children: /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("p", { className: "text-text-600 text-md whitespace-pre-wrap", children: currentAnswer?.answer || "Nenhuma resposta fornecida" }) }) }) }),
-    variant === "result" && currentAnswer?.answerStatus == "RESPOSTA_INCORRETA" /* RESPOSTA_INCORRETA */ && /* @__PURE__ */ (0, import_jsx_runtime17.jsxs)(import_jsx_runtime17.Fragment, { children: [
+    ) }) : /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("div", { className: "space-y-4", children: /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("p", { className: "text-text-600 text-md whitespace-pre-wrap", children: localAnswer || "Nenhuma resposta fornecida" }) }) }) }),
+    variant === "result" && currentQuestionResult?.answerStatus == "RESPOSTA_INCORRETA" /* RESPOSTA_INCORRETA */ && /* @__PURE__ */ (0, import_jsx_runtime17.jsxs)(import_jsx_runtime17.Fragment, { children: [
       /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(QuizSubTitle, { subTitle: "Observa\xE7\xE3o do professor" }),
       /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(QuizContainer, { className: cn("", paddingBottom), children: /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("p", { className: "text-text-600 text-md whitespace-pre-wrap", children: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed euismod, urna eu tincidunt consectetur, nisi nisl aliquam nunc, eget aliquam massa nisl quis neque. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Integer euismod, urna eu tincidunt consectetur, nisi nisl aliquam nunc, eget aliquam massa nisl quis neque. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Suspendisse potenti. Nullam ac urna eu felis dapibus condimentum sit amet a augue. Sed non neque elit. Sed ut imperdiet nisi. Proin condimentum fermentum nunc. Etiam pharetra, erat sed fermentum feugiat, velit mauris egestas quam, ut aliquam massa nisl quis neque. Suspendisse in orci enim. Mauris euismod, urna eu tincidunt consectetur, nisi nisl aliquam nunc, eget aliquam massa nisl quis neque. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Integer euismod, urna eu tincidunt consectetur, nisi nisl aliquam nunc, eget aliquam massa nisl quis neque. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Suspendisse potenti. Nullam ac urna eu felis dapibus condimentum sit amet a augue. Sed non neque elit. Sed ut imperdiet nisi. Proin condimentum fermentum nunc. Etiam pharetra, erat sed fermentum feugiat, velit mauris egestas quam, ut aliquam massa nisl quis neque. Suspendisse in orci enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Integer euismod, urna eu tincidunt consectetur, nisi nisl aliquam nunc, eget aliquam massa nisl quis neque. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Suspendisse potenti. Nullam ac urna eu felis dapibus condimentum sit amet a augue. Sed non neque elit. Sed ut imperdiet nisi. Proin condimentum fermentum nunc. Etiam pharetra, erat sed fermentum feugiat, velit mauris egestas quam, ut aliquam massa nisl quis neque. Suspendisse in orci enim." }) })
     ] })
   ] });
 };
-var QuizTrueOrFalse = ({
-  variant = "default",
-  paddingBottom
-}) => {
+var QuizTrueOrFalse = ({ paddingBottom }) => {
+  const { variant } = useQuizStore();
   const options = [
     {
       label: "25 metros",
@@ -4864,10 +4933,8 @@ var QuizTrueOrFalse = ({
     }) }) })
   ] });
 };
-var QuizConnectDots = ({
-  variant = "default",
-  paddingBottom
-}) => {
+var QuizConnectDots = ({ paddingBottom }) => {
+  const { variant } = useQuizStore();
   const dotsOptions = [
     { label: "Ra\xE7\xE3o" },
     { label: "Rato" },
@@ -4993,10 +5060,8 @@ var QuizConnectDots = ({
     }) }) })
   ] });
 };
-var QuizFill = ({
-  variant = "default",
-  paddingBottom = "pb-[80px]"
-}) => {
+var QuizFill = ({ paddingBottom = "pb-[80px]" }) => {
+  const { variant } = useQuizStore();
   const options = [
     "ci\xEAncia",
     "disciplina",
@@ -5165,10 +5230,8 @@ var QuizFill = ({
     ] })
   ] });
 };
-var QuizImageQuestion = ({
-  variant = "default",
-  paddingBottom
-}) => {
+var QuizImageQuestion = ({ paddingBottom }) => {
+  const { variant } = useQuizStore();
   const correctPositionRelative = { x: 0.48, y: 0.45 };
   const calculateCorrectRadiusRelative = () => {
     const circleWidthRelative = 0.15;
@@ -5386,7 +5449,6 @@ var QuizFooter = (0, import_react12.forwardRef)(
   }, ref) => {
     const {
       currentQuestionIndex,
-      getUserAnswers,
       getTotalQuestions,
       goToNextQuestion,
       goToPreviousQuestion,
@@ -5396,7 +5458,7 @@ var QuizFooter = (0, import_react12.forwardRef)(
       getCurrentQuestion,
       getQuestionStatusFromUserAnswers,
       variant,
-      getActiveQuiz
+      getQuestionResultStatistics
     } = useQuizStore();
     const totalQuestions = getTotalQuestions();
     const isFirstQuestion = currentQuestionIndex === 0;
@@ -5410,7 +5472,6 @@ var QuizFooter = (0, import_react12.forwardRef)(
     const [modalResolutionOpen, setModalResolutionOpen] = (0, import_react12.useState)(false);
     const [filterType, setFilterType] = (0, import_react12.useState)("all");
     const unansweredQuestions = getUnansweredQuestionsFromUserAnswers();
-    const userAnswers = getUserAnswers();
     const allQuestions = getTotalQuestions();
     const handleFinishQuiz = async () => {
       if (unansweredQuestions.length > 0) {
@@ -5570,21 +5631,9 @@ var QuizFooter = (0, import_react12.forwardRef)(
               /* @__PURE__ */ (0, import_jsx_runtime17.jsxs)("p", { className: "text-text-500 font-sm", children: [
                 "Voc\xEA acertou",
                 " ",
-                (() => {
-                  const activeQuiz = getActiveQuiz();
-                  if (!activeQuiz) return 0;
-                  return userAnswers.filter((answer) => {
-                    const question = activeQuiz.quiz.questions.find(
-                      (q) => q.id === answer.questionId
-                    );
-                    const isCorrectOption = question?.options.find(
-                      (op) => op.isCorrect
-                    );
-                    return question && answer.optionId === isCorrectOption?.id;
-                  }).length;
-                })(),
+                getQuestionResultStatistics()?.correctAnswers ?? "--",
+                " de",
                 " ",
-                "de ",
                 allQuestions,
                 " quest\xF5es."
               ] })
@@ -5641,7 +5690,7 @@ var QuizFooter = (0, import_react12.forwardRef)(
           onClose: () => setModalResolutionOpen(false),
           title: "Resolu\xE7\xE3o",
           size: "lg",
-          children: currentQuestion?.answerKey
+          children: currentQuestion?.solutionExplanation
         }
       )
     ] });
@@ -5657,7 +5706,7 @@ var QuizResultHeaderTitle = (0, import_react12.forwardRef)(({ className, ...prop
       ...props,
       children: [
         /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("p", { className: "text-text-950 font-bold text-2xl", children: "Resultado" }),
-        bySimulated && /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(Badge_default, { variant: "solid", action: "info", children: bySimulated.category })
+        bySimulated && /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(Badge_default, { variant: "solid", action: "info", children: bySimulated.type })
       ]
     }
   );
@@ -5681,13 +5730,11 @@ var QuizResultPerformance = (0, import_react12.forwardRef)(
       getTotalQuestions,
       timeElapsed,
       formatTime,
-      bySimulated,
-      byActivity,
-      byQuestionary,
-      getUserAnswerByQuestionId
+      getQuestionResultStatistics,
+      getQuestionResult
     } = useQuizStore();
     const totalQuestions = getTotalQuestions();
-    const quiz = bySimulated || byActivity || byQuestionary;
+    const questionResult = getQuestionResult();
     let correctAnswers = 0;
     let correctEasyAnswers = 0;
     let correctMediumAnswers = 0;
@@ -5695,24 +5742,23 @@ var QuizResultPerformance = (0, import_react12.forwardRef)(
     let totalEasyQuestions = 0;
     let totalMediumQuestions = 0;
     let totalDifficultQuestions = 0;
-    if (quiz) {
-      quiz.questions.forEach((question) => {
-        const userAnswerItem = getUserAnswerByQuestionId(question.id);
-        const isCorrect = userAnswerItem?.answerStatus == "RESPOSTA_CORRETA" /* RESPOSTA_CORRETA */;
+    if (questionResult) {
+      questionResult.answers.forEach((answer) => {
+        const isCorrect = answer.answerStatus == "RESPOSTA_CORRETA" /* RESPOSTA_CORRETA */;
         if (isCorrect) {
           correctAnswers++;
         }
-        if (question.difficulty === "FACIL" /* FACIL */) {
+        if (answer.difficultyLevel === "FACIL" /* FACIL */) {
           totalEasyQuestions++;
           if (isCorrect) {
             correctEasyAnswers++;
           }
-        } else if (question.difficulty === "MEDIO" /* MEDIO */) {
+        } else if (answer.difficultyLevel === "MEDIO" /* MEDIO */) {
           totalMediumQuestions++;
           if (isCorrect) {
             correctMediumAnswers++;
           }
-        } else if (question.difficulty === "DIFICIL" /* DIFICIL */) {
+        } else if (answer.difficultyLevel === "DIFICIL" /* DIFICIL */) {
           totalDifficultQuestions++;
           if (isCorrect) {
             correctDifficultAnswers++;
@@ -5745,8 +5791,9 @@ var QuizResultPerformance = (0, import_react12.forwardRef)(
                 /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("span", { className: "text-2xs font-medium text-text-800", children: formatTime(timeElapsed) })
               ] }),
               /* @__PURE__ */ (0, import_jsx_runtime17.jsxs)("div", { className: "text-2xl font-medium text-text-800 leading-7", children: [
-                correctAnswers,
-                " de ",
+                getQuestionResultStatistics()?.correctAnswers ?? "--",
+                " de",
+                " ",
                 totalQuestions
               ] }),
               /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("div", { className: "text-2xs font-medium text-text-600 mt-1", children: "Corretas" })