QAGDEV-723 - [FE] Прикрепления тестов к заданиям v4

Author: nik1999777

src/features/admin-panel/tests-admin/components/create-test-form.tsx

@@ -23,7 +23,10 @@ import {
   QuestionAnswer as QuestionIcon,
 } from "@mui/icons-material";
 
-import { TestGroupDto } from "api/graphql/generated/graphql";
+import {
+  TestGroupDto,
+  useTestAnswerByQuestionLazyQuery,
+} from "api/graphql/generated/graphql";
 
 import { QuestionForm } from "../types";
 
@@ -51,33 +54,56 @@ const CreateTestForm: FC<CreateTestFormProps> = ({
     false
   );
 
+  const [getTestAnswers] = useTestAnswerByQuestionLazyQuery();
+
   // Загружаем данные существующего теста для редактирования
   useEffect(() => {
     if (existingTest) {
       setTestName(existingTest.testName || "");
       setSuccessThreshold(existingTest.successThreshold || 70);
 
-      const loadedQuestions: QuestionForm[] =
-        existingTest.testQuestions?.map((q, index) => ({
-          id: q?.id || "",
-          text: q?.text || "",
-          answers: q?.testAnswers?.map((a) => ({
-            id: a?.id || "",
-            text: a?.text || "",
-            correct: false, // В схеме нет поля correct для TestAnswerShortDto, будем получать отдельно
-          })) || [
-            { text: "", correct: true },
-            { text: "", correct: false },
-          ],
-        })) || [];
-
-      setQuestions(loadedQuestions);
-      // Открываем первый вопрос по умолчанию
-      if (loadedQuestions.length > 0) {
-        setExpandedQuestion(`question-0`);
-      }
+      // Загружаем вопросы и ответы с правильностью
+      const loadQuestionsWithAnswers = async () => {
+        const loadedQuestions: QuestionForm[] = [];
+
+        for (const question of existingTest.testQuestions || []) {
+          if (!question?.id) continue;
+
+          // Получаем полную информацию об ответах для каждого вопроса
+          const { data: answersData } = await getTestAnswers({
+            variables: { questionId: question.id },
+          });
+
+          const answers =
+            answersData?.testAnswerByQuestion?.map((a) => ({
+              id: a?.id || "",
+              text: a?.text || "",
+              correct: a?.correct || false,
+            })) || [];
+
+          loadedQuestions.push({
+            id: question.id,
+            text: question.text || "",
+            answers:
+              answers.length > 0
+                ? answers
+                : [
+                    { text: "", correct: true },
+                    { text: "", correct: false },
+                  ],
+          });
+        }
+
+        setQuestions(loadedQuestions);
+        // Открываем первый вопрос по умолчанию
+        if (loadedQuestions.length > 0) {
+          setExpandedQuestion(`question-0`);
+        }
+      };
+
+      loadQuestionsWithAnswers();
     }
-  }, [existingTest]);
+  }, [existingTest, getTestAnswers]);
 
   const addQuestion = () => {
     const newQuestionIndex = questions.length;

src/features/admin-panel/tests-admin/create-test-form.tsx

@@ -26,7 +26,7 @@ import {
   useUpdateTestQuestionMutation,
   useUpdateTestAnswerMutation,
   TestGroupInput,
-  TestQuestionInput,
+  useTestAnswerByQuestionLazyQuery,
 } from "api/graphql/generated/graphql";
 
 import { QuestionForm } from "./types";
@@ -56,6 +56,7 @@ const CreateTestForm: FC<CreateTestFormProps> = ({
     useUpdateTestGroupMutation();
   const [updateTestQuestion] = useUpdateTestQuestionMutation();
   const [updateTestAnswer] = useUpdateTestAnswerMutation();
+  const [getTestAnswers] = useTestAnswerByQuestionLazyQuery();
 
   // Загружаем данные существующего теста для редактирования
   useEffect(() => {
@@ -64,21 +65,38 @@ const CreateTestForm: FC<CreateTestFormProps> = ({
       setTestName(test.testName || "");
       setSuccessThreshold(test.successThreshold || 70);
 
-      const loadedQuestions: QuestionForm[] =
-        test.testQuestions?.map((q) => ({
-          id: q?.id || "",
-          text: q?.text || "",
-          answers:
-            q?.testAnswers?.map((a) => ({
+      // Загружаем вопросы и ответы с правильностью
+      const loadQuestionsWithAnswers = async () => {
+        const loadedQuestions: QuestionForm[] = [];
+
+        for (const question of test.testQuestions || []) {
+          if (!question?.id) continue;
+
+          // Получаем полную информацию об ответах для каждого вопроса
+          const { data: answersData } = await getTestAnswers({
+            variables: { questionId: question.id },
+          });
+
+          const answers =
+            answersData?.testAnswerByQuestion?.map((a) => ({
               id: a?.id || "",
               text: a?.text || "",
-              correct: false, // В схеме нет поля correct для TestAnswerShortDto
-            })) || [],
-        })) || [];
+              correct: a?.correct || false,
+            })) || [];
+
+          loadedQuestions.push({
+            id: question.id,
+            text: question.text || "",
+            answers: answers.length > 0 ? answers : [],
+          });
+        }
+
+        setQuestions(loadedQuestions);
+      };
 
-      setQuestions(loadedQuestions);
+      loadQuestionsWithAnswers();
     }
-  }, [existingTestData]);
+  }, [existingTestData, getTestAnswers]);
 
   const addQuestion = () => {
     setQuestions([
@@ -187,7 +205,7 @@ const CreateTestForm: FC<CreateTestFormProps> = ({
 
     try {
       // Сначала сохраняем вопросы и ответы
-      const savedQuestions: TestQuestionInput[] = [];
+      const savedQuestions: { id: string }[] = [];
 
       for (const question of questions) {
         // Сохраняем вопрос

src/features/test/containers/test-container.tsx

@@ -151,6 +151,16 @@ const TestContainer: FC<TestContainerProps> = ({
       }
     });
 
+    const scorePercentage = (correctAnswers / testQuestions.length) * 100;
+
+    console.log("🔍 Test Result Debug:", {
+      correctAnswers,
+      totalQuestions: testQuestions.length,
+      scorePercentage: scorePercentage.toFixed(1) + "%",
+      userAnswers: userAnswers.length,
+      allLoadedAnswers: allLoadedAnswers.length,
+    });
+
     setScore(correctAnswers);
     setIsCompleted(true);
   };

src/features/test/views/test-view.tsx

@@ -81,7 +81,17 @@ const TestView: FC<TestViewProps> = ({
 
   const successThreshold = testData.successThreshold ?? 0;
   const progress = ((currentQuestionIndex + 1) / totalQuestions) * 100;
-  const isPassed = score >= successThreshold;
+  const scorePercentage = (score / totalQuestions) * 100;
+  const isPassed = scorePercentage >= successThreshold;
+
+  // Отладочная информация
+  console.log("🔍 TestView Debug:", {
+    score,
+    totalQuestions,
+    successThreshold,
+    scorePercentage: scorePercentage.toFixed(1) + "%",
+    isPassed,
+  });
 
   if (isCompleted) {
     return (
@@ -94,15 +104,19 @@ const TestView: FC<TestViewProps> = ({
 
             <Alert severity={isPassed ? "success" : "error"} sx={{ mb: 2 }}>
               {isPassed
-                ? `Поздравляем! Вы прошли тест с результатом ${score}/${totalQuestions}`
-                : `Тест не пройден. Результат: ${score}/${totalQuestions}. Требуется: ${successThreshold}`}
+                ? `Поздравляем! Вы прошли тест с результатом ${scorePercentage.toFixed(
+                    0
+                  )}% (${score}/${totalQuestions})`
+                : `Тест не пройден. Результат: ${scorePercentage.toFixed(
+                    0
+                  )}% (${score}/${totalQuestions}). Требуется: ${successThreshold}%`}
             </Alert>
 
             <Typography variant="body1">
               Правильных ответов: {score} из {totalQuestions}
             </Typography>
             <Typography variant="body2" color="text.secondary">
-              Проходной балл: {successThreshold}
+              Проходной балл: {successThreshold}%
             </Typography>
 
             {trainingId && lectureId && (