touchstudy-core 0.1.150 → 0.1.151

package/dist/containers/ExamResult/configs/types.d.ts

@@ -55,8 +55,10 @@ export declare type TextbookResult = {
 };
 export declare type StudentQuestionResult = {
     id: number;
-    selectedAnswers: string;
-    correctAnswers: string;
+    selectedAnswers?: number[] | string;
+    correctAnswers?: number[] | string;
+    textualAnswers?: string[];
+    correctTextualAnswers?: string[];
     isStar: boolean;
     duration: number;
     classAverageTime: number;

package/dist/index.js

@@ -18493,6 +18493,7 @@ var TimeOrderChart = function TimeOrderChart(_ref) {
 };
 
 var TextbookAnswerItem = function TextbookAnswerItem(_ref) {
+  var _data$selectedAnswers, _data$textualAnswers, _data$selectedAnswers2, _data$textualAnswers2, _data$selectedAnswers3, _data$textualAnswers3;
   var data = _ref.data,
     nextData = _ref.nextData,
     isFirst = _ref.isFirst,
@@ -18546,11 +18547,11 @@ var TextbookAnswerItem = function TextbookAnswerItem(_ref) {
       alignItems: "center",
       gap: "4px"
     }
-  }, data.isCorrect && data.selectedAnswers !== "" && React__default.createElement(React.Fragment, null, React__default.createElement(iconCorrectAnswer, null), React__default.createElement("span", {
+  }, data.isCorrect && (!!((_data$selectedAnswers = data.selectedAnswers) !== null && _data$selectedAnswers !== void 0 && _data$selectedAnswers.length) || !!((_data$textualAnswers = data.textualAnswers) !== null && _data$textualAnswers !== void 0 && _data$textualAnswers.length)) && React__default.createElement(React.Fragment, null, React__default.createElement(iconCorrectAnswer, null), React__default.createElement("span", {
     className: styles$4["answerCorrect"]
-  }, t("correct"))), !data.isCorrect && data.selectedAnswers !== "" && React__default.createElement(React.Fragment, null, React__default.createElement(iconCorrectAnswer$1, null), React__default.createElement("span", {
+  }, t("correct"))), !data.isCorrect && (!!((_data$selectedAnswers2 = data.selectedAnswers) !== null && _data$selectedAnswers2 !== void 0 && _data$selectedAnswers2.length) || !!((_data$textualAnswers2 = data.textualAnswers) !== null && _data$textualAnswers2 !== void 0 && _data$textualAnswers2.length)) && React__default.createElement(React.Fragment, null, React__default.createElement(iconCorrectAnswer$1, null), React__default.createElement("span", {
     className: styles$4["answerIncorrect"]
-  }, t("incorrect"))), data.selectedAnswers === "" && React__default.createElement(React.Fragment, null, React__default.createElement(iconNoGrass, null), React__default.createElement("span", {
+  }, t("incorrect"))), !((_data$selectedAnswers3 = data.selectedAnswers) !== null && _data$selectedAnswers3 !== void 0 && _data$selectedAnswers3.length) && !((_data$textualAnswers3 = data.textualAnswers) !== null && _data$textualAnswers3 !== void 0 && _data$textualAnswers3.length) && React__default.createElement(React.Fragment, null, React__default.createElement(iconNoGrass, null), React__default.createElement("span", {
     className: styles$4["answerNograss"]
   }, t("no_solution")))), React__default.createElement("div", {
     className: styles["custom-col-2"],
@@ -18934,11 +18935,30 @@ var TextbookVulnerable = function TextbookVulnerable(_ref) {
   var isOpen = openProblem === keyOpen;
   var incorrectQuestions = React.useMemo(function () {
     return data === null || data === void 0 ? void 0 : data.studentQuestionResults.filter(function (i) {
-      return i.selectedAnswers !== "" && i.isCorrect === false && i.isStar === false && i.overallCorrectRate >= correctRateThreshHold$1;
+      var _i$selectedAnswers, _i$textualAnswers;
+      return (((_i$selectedAnswers = i.selectedAnswers) === null || _i$selectedAnswers === void 0 ? void 0 : _i$selectedAnswers.length) || ((_i$textualAnswers = i.textualAnswers) === null || _i$textualAnswers === void 0 ? void 0 : _i$textualAnswers.length)) && i.isCorrect === false && i.isStar === false && i.overallCorrectRate >= correctRateThreshHold$1;
     }).sort(function (q1, q2) {
       return q2.overallCorrectRate === q1.overallCorrectRate ? q1.questionOrder - q2.questionOrder : q2.overallCorrectRate - q1.overallCorrectRate;
     }).slice(0, limitQuestions$1);
   }, [JSON.stringify(data === null || data === void 0 ? void 0 : data.studentQuestionResults)]);
+  var renderTextbookAnswer = function renderTextbookAnswer(type, answers, textualAnswers, isCorrect) {
+    var _textualAnswers$;
+    switch (type) {
+      case exports.QuestionAnswerType.ShortAnswer:
+      case exports.QuestionAnswerType.SynonymProcessing:
+        return isCorrect ? textualAnswers === null || textualAnswers === void 0 ? void 0 : textualAnswers.join(" | ") : (_textualAnswers$ = textualAnswers === null || textualAnswers === void 0 ? void 0 : textualAnswers[0]) != null ? _textualAnswers$ : "";
+      case exports.QuestionAnswerType.SingleChoice:
+      case exports.QuestionAnswerType.MultipleChoice:
+        if (!(answers !== null && answers !== void 0 && answers.length)) return "";
+        return answers.map(function (i) {
+          return t("number_question", {
+            number: i
+          });
+        }).join(",");
+      default:
+        return textualAnswers === null || textualAnswers === void 0 ? void 0 : textualAnswers.join(", ");
+    }
+  };
   var renderAnswer = function renderAnswer(type, content) {
     var _content$split, _content$split$map;
     if (!content) return "";
@@ -18995,12 +19015,12 @@ var TextbookVulnerable = function TextbookVulnerable(_ref) {
           fontSize: "13px",
           fontWeight: 500
         }
-      }, renderAnswer(item === null || item === void 0 ? void 0 : item.questionAnswerType, item === null || item === void 0 ? void 0 : item.selectedAnswers)), React__default.createElement("td", {
+      }, typeof item.selectedAnswers === "string" ? renderAnswer(item.questionAnswerType, item.selectedAnswers) : renderTextbookAnswer(item.questionAnswerType, item.selectedAnswers, item.textualAnswers)), React__default.createElement("td", {
         style: {
           textAlign: "center",
           color: styles$4.gray_700
         }
-      }, renderAnswer(item === null || item === void 0 ? void 0 : item.questionAnswerType, item === null || item === void 0 ? void 0 : item.correctAnswers)), React__default.createElement("td", {
+      }, typeof item.correctAnswers === "string" ? renderAnswer(item.questionAnswerType, item.correctAnswers) : renderTextbookAnswer(item.questionAnswerType, item.correctAnswers, item.correctTextualAnswers, true)), React__default.createElement("td", {
         style: {
           textAlign: "center",
           color: styles$4.gray_700
@@ -19012,7 +19032,6 @@ var TextbookVulnerable = function TextbookVulnerable(_ref) {
   };
   var renderQuestions = function renderQuestions(questions) {
     return questions.map(function (question) {
-      var _question$selectedAns, _question$selectedAns2, _question$selectedAns3, _question$correctAnsw, _question$correctAnsw2, _question$correctAnsw3;
       return React__default.createElement(material.Grid, {
         container: true,
         flexWrap: "nowrap",
@@ -19039,29 +19058,9 @@ var TextbookVulnerable = function TextbookVulnerable(_ref) {
         className: styles$4["span2"]
       }, t("my_wrong_answer"))), React__default.createElement("div", null, React__default.createElement("span", {
         className: styles$4["overallCorrectRate"]
-      }, question.overallCorrectRate.toFixed(2), "%"), (question === null || question === void 0 ? void 0 : question.questionAnswerType) === exports.QuestionAnswerType.ShortAnswer ? React__default.createElement("span", {
-        className: styles$4["answer"]
-      }, React__default.createElement(MathJaxContainer, {
-        content: question === null || question === void 0 ? void 0 : question.selectedAnswers
-      }), " ", React__default.createElement(MathJaxContainer, {
-        content: question === null || question === void 0 ? void 0 : question.correctAnswers
-      })) : exports.QuestionAnswerType.MultipleChoice ? React__default.createElement("span", {
-        className: styles$4["answer"]
-      }, (_question$selectedAns = question.selectedAnswers) === null || _question$selectedAns === void 0 ? void 0 : (_question$selectedAns2 = _question$selectedAns.split("|")) === null || _question$selectedAns2 === void 0 ? void 0 : (_question$selectedAns3 = _question$selectedAns2.map(function (i) {
-        return t("number_question", {
-          number: i
-        });
-      })) === null || _question$selectedAns3 === void 0 ? void 0 : _question$selectedAns3.join(","), " ", "(", t("answer"), " ", (_question$correctAnsw = question.correctAnswers) === null || _question$correctAnsw === void 0 ? void 0 : (_question$correctAnsw2 = _question$correctAnsw.split("|")) === null || _question$correctAnsw2 === void 0 ? void 0 : (_question$correctAnsw3 = _question$correctAnsw2.map(function (i) {
-        return t("number_question", {
-          number: i
-        });
-      })) === null || _question$correctAnsw3 === void 0 ? void 0 : _question$correctAnsw3.join(","), ")", " ") : React__default.createElement("span", {
+      }, question.overallCorrectRate.toFixed(2), "%"), React__default.createElement("span", {
         className: styles$4["answer"]
-      }, t("number_question", {
-        number: question.selectedAnswers
-      }), " ", "(", t("answer"), " ", t("number_question", {
-        number: question.correctAnswers
-      }), ")"))));
+      }, typeof question.selectedAnswers === "string" ? renderAnswer(question.questionAnswerType, question.selectedAnswers) : renderTextbookAnswer(question.questionAnswerType, question.selectedAnswers, question.textualAnswers), " ", t("answer"), " ", typeof question.correctAnswers === "string" ? renderAnswer(question.questionAnswerType, question.correctAnswers) : renderTextbookAnswer(question.questionAnswerType, question.correctAnswers, question.correctTextualAnswers, true)))));
     });
   };
   var handleToggle = function handleToggle() {