touchstudy-core 0.1.121 → 0.1.122

package/dist/index.js

@@ -4499,12 +4499,11 @@ function _objectDestructuringEmpty(obj) {
 function _objectWithoutPropertiesLoose(source, excluded) {
   if (source == null) return {};
   var target = {};
-  var sourceKeys = Object.keys(source);
-  var key, i;
-  for (i = 0; i < sourceKeys.length; i++) {
-    key = sourceKeys[i];
-    if (excluded.indexOf(key) >= 0) continue;
-    target[key] = source[key];
+  for (var key in source) {
+    if (Object.prototype.hasOwnProperty.call(source, key)) {
+      if (excluded.indexOf(key) >= 0) continue;
+      target[key] = source[key];
+    }
   }
   return target;
 }
@@ -6131,8 +6130,9 @@ function _finally(body, finalizer) {
   ExamStatus[ExamStatus["Completed"] = 3] = "Completed";
 })(exports.ExamStatus || (exports.ExamStatus = {}));
 (function (QuestionAnswerType) {
-  QuestionAnswerType[QuestionAnswerType["ChoiceOption"] = 0] = "ChoiceOption";
-  QuestionAnswerType[QuestionAnswerType["Textual"] = 1] = "Textual";
+  QuestionAnswerType[QuestionAnswerType["SingleChoice"] = 0] = "SingleChoice";
+  QuestionAnswerType[QuestionAnswerType["MultipleChoice"] = 1] = "MultipleChoice";
+  QuestionAnswerType[QuestionAnswerType["ShortAnswer"] = 2] = "ShortAnswer";
 })(exports.QuestionAnswerType || (exports.QuestionAnswerType = {}));
 
 (function (OrderType) {
@@ -15992,6 +15992,28 @@ var CompareGrass = function CompareGrass(_ref2) {
   var effectSize = _ref2.effectSize;
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
+  var renderAnswer = function renderAnswer(type, content) {
+    var _content$split, _content$split$map;
+    if (!content) return "";
+    switch (type) {
+      case exports.QuestionAnswerType.ShortAnswer:
+        return React__default.createElement(MathJaxContainer, {
+          content: content
+        });
+      case exports.QuestionAnswerType.SingleChoice:
+        return t("number_question", {
+          number: content
+        });
+      case exports.QuestionAnswerType.MultipleChoice:
+        return content === null || content === void 0 ? void 0 : (_content$split = content.split("|")) === null || _content$split === void 0 ? void 0 : (_content$split$map = _content$split.map(function (i) {
+          return t("number_question", {
+            number: i
+          });
+        })) === null || _content$split$map === void 0 ? void 0 : _content$split$map.join(",");
+      default:
+        return content;
+    }
+  };
   var renderTableBody = function renderTableBody(effectSize) {
     return effectSize.map(function (item, index) {
       return React__default.createElement("tr", {
@@ -16009,29 +16031,17 @@ var CompareGrass = function CompareGrass(_ref2) {
           textAlign: "center",
           color: "#202B37"
         }
-      }, (item === null || item === void 0 ? void 0 : item.questionAnswerType) === exports.QuestionAnswerType.Textual ? React__default.createElement(MathJaxContainer, {
-        content: item === null || item === void 0 ? void 0 : item.correctAnswers
-      }) : t("number_question", {
-        number: item.correctAnswers
-      })), React__default.createElement("td", {
+      }, renderAnswer(item === null || item === void 0 ? void 0 : item.questionAnswerType, item === null || item === void 0 ? void 0 : item.correctAnswers)), React__default.createElement("td", {
         className: styles$3["tdcolumn3"],
         style: {
           color: item.isCorrect ? styles$3.green_support_900 : styles$3.red_900
         }
-      }, (item === null || item === void 0 ? void 0 : item.questionAnswerType) === exports.QuestionAnswerType.Textual ? React__default.createElement(MathJaxContainer, {
-        content: item === null || item === void 0 ? void 0 : item.selectedAnswers
-      }) : t("number_question", {
-        number: item.selectedAnswers
-      })), React__default.createElement("td", {
+      }, renderAnswer(item === null || item === void 0 ? void 0 : item.questionAnswerType, item === null || item === void 0 ? void 0 : item.selectedAnswers)), React__default.createElement("td", {
         style: {
           textAlign: "center",
           color: "#414E62"
         }
-      }, (item === null || item === void 0 ? void 0 : item.questionAnswerType) === exports.QuestionAnswerType.Textual ? React__default.createElement(MathJaxContainer, {
-        content: item === null || item === void 0 ? void 0 : item.mostSelectedAnswers
-      }) : t("number_question", {
-        number: item.mostSelectedAnswers
-      })), React__default.createElement("td", {
+      }, renderAnswer(item === null || item === void 0 ? void 0 : item.questionAnswerType, item === null || item === void 0 ? void 0 : item.mostSelectedAnswers)), React__default.createElement("td", {
         className: "" + printStyles["avoid-break-inside"]
       }, React__default.createElement("div", {
         className: styles$3["classification"] + " " + printStyles["avoid-break-inside"]
@@ -16384,6 +16394,28 @@ var Vulnerable = function Vulnerable(_ref) {
       return q2.overallCorrectRate === q1.overallCorrectRate ? q1.questionOrder - q2.questionOrder : q2.overallCorrectRate - q1.overallCorrectRate;
     }).slice(0, limitQuestions);
   }, [JSON.stringify(data.questions)]);
+  var renderAnswer = function renderAnswer(type, content) {
+    var _content$split, _content$split$map;
+    if (!content) return "";
+    switch (type) {
+      case exports.QuestionAnswerType.ShortAnswer:
+        return React__default.createElement(MathJaxContainer, {
+          content: content
+        });
+      case exports.QuestionAnswerType.SingleChoice:
+        return t("number_question", {
+          number: content
+        });
+      case exports.QuestionAnswerType.MultipleChoice:
+        return content === null || content === void 0 ? void 0 : (_content$split = content.split("|")) === null || _content$split === void 0 ? void 0 : (_content$split$map = _content$split.map(function (i) {
+          return t("number_question", {
+            number: i
+          });
+        })) === null || _content$split$map === void 0 ? void 0 : _content$split$map.join(",");
+      default:
+        return content;
+    }
+  };
   var renderTableBody = function renderTableBody(data) {
     return data.map(function (item, index) {
       return React__default.createElement("tr", {
@@ -16418,20 +16450,12 @@ var Vulnerable = function Vulnerable(_ref) {
           fontSize: "13px",
           fontWeight: 500
         }
-      }, (item === null || item === void 0 ? void 0 : item.questionAnswerType) === exports.QuestionAnswerType.Textual ? React__default.createElement(MathJaxContainer, {
-        content: item === null || item === void 0 ? void 0 : item.selectedAnswers
-      }) : t("number_question", {
-        number: item.selectedAnswers
-      })), React__default.createElement("td", {
+      }, renderAnswer(item === null || item === void 0 ? void 0 : item.questionAnswerType, item === null || item === void 0 ? void 0 : item.selectedAnswers)), React__default.createElement("td", {
         style: {
           textAlign: "center",
           color: styles$3.gray_700
         }
-      }, (item === null || item === void 0 ? void 0 : item.questionAnswerType) === exports.QuestionAnswerType.Textual ? React__default.createElement(MathJaxContainer, {
-        content: item === null || item === void 0 ? void 0 : item.correctAnswers
-      }) : t("number_question", {
-        number: item.correctAnswers
-      })), React__default.createElement("td", {
+      }, renderAnswer(item === null || item === void 0 ? void 0 : item.questionAnswerType, item === null || item === void 0 ? void 0 : item.correctAnswers)), React__default.createElement("td", {
         style: {
           textAlign: "center",
           color: styles$3.gray_700
@@ -16441,6 +16465,7 @@ var Vulnerable = function Vulnerable(_ref) {
   };
   var renderQuestions = function renderQuestions(questions) {
     return questions.map(function (question) {
+      var _question$selectedAns, _question$selectedAns2, _question$correctAnsw, _question$correctAnsw2, _question$correctAnsw3;
       return React__default.createElement(material.Grid, {
         container: true,
         flexWrap: "nowrap",
@@ -16467,7 +16492,23 @@ var Vulnerable = function Vulnerable(_ref) {
         className: styles$3["span2"]
       }, t("my_wrong_answer"))), React__default.createElement("div", null, React__default.createElement("span", {
         className: styles$3["overallCorrectRate"]
-      }, question.overallCorrectRate.toFixed(2), "%"), React__default.createElement("span", {
+      }, question.overallCorrectRate.toFixed(2), "%"), question.questionAnswerType === exports.QuestionAnswerType.ShortAnswer ? React__default.createElement("span", {
+        className: styles$3["answer"]
+      }, React__default.createElement(MathJaxContainer, {
+        content: question.selectedAnswers
+      }), " ", t("answer"), " ", React__default.createElement(MathJaxContainer, {
+        content: question.correctAnswers
+      })) : question.questionAnswerType === exports.QuestionAnswerType.MultipleChoice ? React__default.createElement("span", {
+        className: styles$3["answer"]
+      }, (_question$selectedAns = question.selectedAnswers.split("|")) === null || _question$selectedAns === void 0 ? void 0 : (_question$selectedAns2 = _question$selectedAns.map(function (i) {
+        return t("number_question", {
+          number: i
+        });
+      })) === null || _question$selectedAns2 === void 0 ? void 0 : _question$selectedAns2.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", {
         className: styles$3["answer"]
       }, t("number_question", {
         number: question.selectedAnswers
@@ -18231,6 +18272,28 @@ var TextbookVulnerable = function TextbookVulnerable(_ref) {
       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 renderAnswer = function renderAnswer(type, content) {
+    var _content$split, _content$split$map;
+    if (!content) return "";
+    switch (type) {
+      case exports.QuestionAnswerType.ShortAnswer:
+        return React__default.createElement(MathJaxContainer, {
+          content: content
+        });
+      case exports.QuestionAnswerType.SingleChoice:
+        return t("number_question", {
+          number: content
+        });
+      case exports.QuestionAnswerType.MultipleChoice:
+        return content === null || content === void 0 ? void 0 : (_content$split = content.split("|")) === null || _content$split === void 0 ? void 0 : (_content$split$map = _content$split.map(function (i) {
+          return t("number_question", {
+            number: i
+          });
+        })) === null || _content$split$map === void 0 ? void 0 : _content$split$map.join(",");
+      default:
+        return content;
+    }
+  };
   var renderTableBody = function renderTableBody(data) {
     return data === null || data === void 0 ? void 0 : data.map(function (item, index) {
       return React__default.createElement("tr", {
@@ -18265,20 +18328,12 @@ var TextbookVulnerable = function TextbookVulnerable(_ref) {
           fontSize: "13px",
           fontWeight: 500
         }
-      }, (item === null || item === void 0 ? void 0 : item.questionAnswerType) === exports.QuestionAnswerType.Textual ? React__default.createElement(MathJaxContainer, {
-        content: item === null || item === void 0 ? void 0 : item.selectedAnswers
-      }) : t("number_question", {
-        number: item.selectedAnswers
-      })), React__default.createElement("td", {
+      }, renderAnswer(item === null || item === void 0 ? void 0 : item.questionAnswerType, item === null || item === void 0 ? void 0 : item.selectedAnswers)), React__default.createElement("td", {
         style: {
           textAlign: "center",
           color: styles$3.gray_700
         }
-      }, (item === null || item === void 0 ? void 0 : item.questionAnswerType) === exports.QuestionAnswerType.Textual ? React__default.createElement(MathJaxContainer, {
-        content: item === null || item === void 0 ? void 0 : item.correctAnswers
-      }) : t("number_question", {
-        number: item.correctAnswers
-      })), React__default.createElement("td", {
+      }, renderAnswer(item === null || item === void 0 ? void 0 : item.questionAnswerType, item === null || item === void 0 ? void 0 : item.correctAnswers)), React__default.createElement("td", {
         style: {
           textAlign: "center",
           color: styles$3.gray_700
@@ -18290,6 +18345,7 @@ 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",
@@ -18316,17 +18372,27 @@ var TextbookVulnerable = function TextbookVulnerable(_ref) {
         className: styles$3["span2"]
       }, t("my_wrong_answer"))), React__default.createElement("div", null, React__default.createElement("span", {
         className: styles$3["overallCorrectRate"]
-      }, question.overallCorrectRate.toFixed(2), "%"), (question === null || question === void 0 ? void 0 : question.questionAnswerType) === exports.QuestionAnswerType.Textual ? React__default.createElement("span", {
+      }, question.overallCorrectRate.toFixed(2), "%"), (question === null || question === void 0 ? void 0 : question.questionAnswerType) === exports.QuestionAnswerType.ShortAnswer ? React__default.createElement("span", {
         className: styles$3["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
-      })) : React__default.createElement("span", {
+      })) : exports.QuestionAnswerType.MultipleChoice ? React__default.createElement("span", {
+        className: styles$3["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", {
         className: styles$3["answer"]
       }, t("number_question", {
         number: question.selectedAnswers
-      }), " (", t("answer"), " ", t("number_question", {
+      }), " ", "(", t("answer"), " ", t("number_question", {
         number: question.correctAnswers
       }), ")"))));
     });
@@ -26739,7 +26805,7 @@ var DefaultQuestion = {
   author: "",
   subjectId: null,
   preparedType: null,
-  questionAnswerType: exports.QuestionAnswerType.ChoiceOption,
+  questionAnswerType: exports.QuestionAnswerType.SingleChoice,
   textualAnswer: ""
 };
 var DefaultArticle = {