touchstudy-core 0.1.126 → 0.1.128

package/dist/containers/ExamResult/components/ProtractedProblem/index.d.ts

@@ -1,8 +1,10 @@
 import { FC } from "react";
 import { LongTimeSpendQuestion, ProblemKey } from "../../configs/types";
+import { ExamResult } from "../../../../utils";
 interface Props {
     data: LongTimeSpendQuestion[];
     keyOpen: ProblemKey;
+    examResult?: ExamResult;
     openProblem?: ProblemKey;
     changeOpen?: (key?: ProblemKey) => void;
     isMyStoryStudent?: boolean;

package/dist/index.js

@@ -16237,7 +16237,8 @@ var ProtractedProblem = function ProtractedProblem(_ref) {
     data = _ref.data,
     openProblem = _ref.openProblem,
     changeOpen = _ref.changeOpen,
-    isMyStoryStudent = _ref.isMyStoryStudent;
+    isMyStoryStudent = _ref.isMyStoryStudent,
+    examResult = _ref.examResult;
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
   var isOpen = openProblem === keyOpen;
@@ -16288,19 +16289,32 @@ var ProtractedProblem = function ProtractedProblem(_ref) {
   };
   var renderQuestions = function renderQuestions(data) {
     return data.map(function (item) {
+      var _examResult$questions, _examResult$questions2;
+      var category = examResult === null || examResult === void 0 ? void 0 : (_examResult$questions = examResult.questions) === null || _examResult$questions === void 0 ? void 0 : (_examResult$questions2 = _examResult$questions.find(function (i) {
+        return i.id === item.id;
+      })) === null || _examResult$questions2 === void 0 ? void 0 : _examResult$questions2.category;
       return React__default.createElement(material.Stack, {
-        flexDirection: "row",
+        direction: "row",
+        flexWrap: "nowrap",
         className: styles$3["content"] + " " + printStyles["avoid-break-inside"],
         key: item.id
-      }, React__default.createElement("div", {
+      }, React__default.createElement(material.Box, {
+        width: "160px",
         className: styles$3["contentColumn1"]
-      }, React__default.createElement("div", null, React__default.createElement("span", {
+      }, React__default.createElement(material.Stack, null, React__default.createElement("div", null, React__default.createElement("span", {
         className: styles$3["span1"]
       }, t("problem")), React__default.createElement("span", {
         className: styles$3["span2"]
       }, t("number_question", {
         number: item.questionOrder + 1
-      })))), React__default.createElement("div", {
+      }))), (category === null || category === void 0 ? void 0 : category.name) && React__default.createElement(material.Typography, {
+        sx: {
+          fontSize: "14px",
+          fontWeight: 600,
+          color: "#18442A",
+          textAlign: "center"
+        }
+      }, category.name))), React__default.createElement(material.Box, {
         className: styles$3["contentColumn2"]
       }, React__default.createElement("div", null, React__default.createElement("span", {
         className: styles$3["span1"]
@@ -16464,27 +16478,36 @@ 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,
+      var _question$category, _question$selectedAns, _question$selectedAns2, _question$correctAnsw, _question$correctAnsw2, _question$correctAnsw3;
+      return React__default.createElement(material.Stack, {
+        direction: "row",
         flexWrap: "nowrap",
         className: styles$3["content"] + " " + printStyles["avoid-break-inside"],
         key: question.id
-      }, React__default.createElement(material.Grid, {
-        item: true,
-        xs: 1.5,
-        minWidth: "120px",
+      }, React__default.createElement(material.Box, {
+        width: "160px",
         className: styles$3["contentColumn1"]
+      }, React__default.createElement(material.Stack, {
+        direction: "column",
+        gap: 1
       }, React__default.createElement("div", null, React__default.createElement("span", {
         className: styles$3["span1"]
       }, t("problem_number")), React__default.createElement("span", {
         className: styles$3["span2"]
       }, t("number_question", {
         number: question.questionOrder + 1
-      })))), React__default.createElement(material.Grid, {
-        item: true,
-        xs: 10.5,
-        className: styles$3["contentColumn2"]
+      }))), ((_question$category = question.category) === null || _question$category === void 0 ? void 0 : _question$category.name) && React__default.createElement(material.Typography, {
+        sx: {
+          fontSize: "14px",
+          fontWeight: 600,
+          color: "#18442A",
+          textAlign: "center"
+        }
+      }, question.category.name))), React__default.createElement(material.Box, {
+        className: styles$3["contentColumn2"],
+        sx: {
+          alignItems: "center"
+        }
       }, React__default.createElement("div", null, React__default.createElement("span", {
         className: styles$3["span1"]
       }, t("total_correct_rate")), React__default.createElement("span", {
@@ -18818,6 +18841,7 @@ var PrintExamResult = function PrintExamResult(_ref) {
   }), React__default.createElement(ProtractedProblem, {
     keyOpen: ProblemKey.ProtractedProblem,
     data: longTimeSpend,
+    examResult: resultData,
     openProblem: ProblemKey.ProtractedProblem,
     isMyStoryStudent: isMyStoryStudent
   }), chapterId ? textbookResult && React__default.createElement(TextbookGradesByTerritory, {
@@ -20805,6 +20829,7 @@ var ExamResultV2 = function ExamResultV2(props) {
   }), React__default.createElement(ProtractedProblem, {
     keyOpen: ProblemKey.ProtractedProblem,
     data: longTimeSpend,
+    examResult: resultData,
     openProblem: openProblem,
     changeOpen: setOpenProblem,
     isMyStoryStudent: isMyStoryStudent
@@ -31534,6 +31559,8 @@ var TheAcademyDropdown = function TheAcademyDropdown(_ref) {
     open = _useState[0],
     setOpen = _useState[1];
   var handleOpen = function handleOpen(event) {
+    event.preventDefault();
+    event.stopPropagation();
     setOpen(event.currentTarget);
   };
   var handleClose = function handleClose() {
@@ -31550,9 +31577,15 @@ var TheAcademyDropdown = function TheAcademyDropdown(_ref) {
     mx: 1,
     bgcolor: open ? "action.selected" : undefined
   };
+  var handleGoToMainPage = function handleGoToMainPage() {
+    if (!user) return;
+    var isAcademy = user.academyDomain || user.isLearningSpace;
+    var mainUrl = !isAcademy ? homeAcademyUrl : homeUrl;
+    pushTo(history, mainUrl);
+  };
   return React__default.createElement(React.Fragment, null, React__default.createElement(material.Button, {
-    onClick: handleOpen,
-    className: "" + styles["academy-btn"],
+    onClick: handleGoToMainPage,
+    className: styles["academy-btn"] + " pointer",
     sx: _extends({}, popoverStyle)
   }, React__default.createElement(material.Grid, {
     container: true,
@@ -31615,7 +31648,8 @@ var TheAcademyDropdown = function TheAcademyDropdown(_ref) {
     height: "100%",
     justifyContent: "center",
     alignItems: "center"
-  }, React__default.createElement("div", {
+  }, React__default.createElement(material.IconButton, {
+    onClick: handleOpen,
     className: "" + styles["switch-icon"]
   }, React__default.createElement(go.GoArrowSwitch, {
     size: 14,