touchstudy-core 0.1.80 → 0.1.81

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

@@ -24,6 +24,7 @@ export declare type Question = {
     id: number;
     isCorrect: boolean;
     isStar: boolean;
+    score: number;
     overallCorrectRate: number;
     selectedAnswers: string;
     topDuration?: number | null;

package/dist/index.css

@@ -1417,11 +1417,11 @@
   100% {
     transform: translateY(-8px); } }
 
-@media print {
-  ._35kyG {
-    page-break-before: always; }
-  ._1PFgl {
-    print-color-adjust: exact; }
-  ._3rPGh {
-    -moz-column-break-inside: avoid;
-         break-inside: avoid; } }
+._35kyG {
+  page-break-before: always; }
+
+._1PFgl {
+  print-color-adjust: exact; }
+
+._3rPGh {
+  page-break-inside: avoid; }

package/dist/index.js

@@ -13115,7 +13115,7 @@ var iconNoStarQuestion = function iconNoStarQuestion(_ref) {
     clipPath: "url(#clip0_307_1248)"
   }, React__default.createElement("path", {
     d: "M10.7735 13.125C10.6814 13.1253 10.5916 13.0966 10.5168 13.043L7.00007 10.4934L3.48339 13.043C3.40826 13.0975 3.31774 13.1266 3.22493 13.1263C3.13212 13.126 3.04182 13.0961 2.96709 13.0411C2.89235 12.986 2.83706 12.9087 2.8092 12.8201C2.78134 12.7316 2.78236 12.6365 2.8121 12.5486L4.18367 8.48612L0.628977 6.04843C0.55198 5.99569 0.493868 5.9197 0.46313 5.83158C0.432392 5.74346 0.43064 5.64781 0.458129 5.55863C0.485619 5.46944 0.54091 5.39138 0.615924 5.33585C0.690937 5.28032 0.781742 5.25024 0.875071 5.24999H5.26046L6.5839 1.17714C6.61241 1.08921 6.66804 1.01257 6.74281 0.958208C6.81757 0.903851 6.90763 0.874573 7.00007 0.874573C7.09251 0.874573 7.18257 0.903851 7.25734 0.958208C7.33211 1.01257 7.38773 1.08921 7.41624 1.17714L8.73968 5.25136H13.1251C13.2185 5.25131 13.3095 5.28119 13.3848 5.33661C13.46 5.39203 13.5155 5.47008 13.5432 5.55934C13.5708 5.6486 13.5692 5.74437 13.5385 5.83262C13.5078 5.92088 13.4496 5.99699 13.3725 6.0498L9.81648 8.48612L11.1872 12.5475C11.2094 12.6132 11.2157 12.6833 11.2054 12.752C11.1952 12.8206 11.1688 12.8859 11.1284 12.9423C11.088 12.9987 11.0347 13.0447 10.973 13.0765C10.9113 13.1082 10.8429 13.1249 10.7735 13.125Z",
-    fill: "#FEAF06"
+    fill: "#E4E7EC"
   })), React__default.createElement("defs", null, React__default.createElement("clipPath", {
     id: "clip0_307_1248"
   }, React__default.createElement("rect", {
@@ -13458,6 +13458,8 @@ function CreateNewQuestionDialog(_ref) {
   })));
 }
 
+var printStyles = {"page-break":"_35kyG","print-exact-color":"_1PFgl","avoid-break-inside":"_3rPGh"};
+
 function MyAnswer(_ref) {
   var data = _ref.data,
     categories = _ref.categories,
@@ -13490,11 +13492,15 @@ function MyAnswer(_ref) {
   };
   var renderQuestions = function renderQuestions(questions) {
     return questions.map(function (question, index) {
+      var _questions;
       return React__default.createElement("div", {
+        className: "" + printStyles["avoid-break-inside"],
         style: isOpenTime[question.id] ? {
           borderTop: index !== 0 ? "1px solid #E4E7EC" : "",
           borderBottom: "1px solid #E4E7EC"
-        } : {},
+        } : {
+          borderBottom: (question === null || question === void 0 ? void 0 : question.article) !== ((_questions = questions[index + 1]) === null || _questions === void 0 ? void 0 : _questions.article) && index !== (questions === null || questions === void 0 ? void 0 : questions.length) && index !== 0 && index !== questions.length - 1 ? "1px solid #E4E7EC" : ""
+        },
         key: question.id
       }, React__default.createElement("div", {
         className: styles$4["myAnswerItem"] + " " + styles["noGutters"]
@@ -13590,11 +13596,13 @@ function MyAnswer(_ref) {
     });
   };
   return React__default.createElement("div", {
-    className: styles$4["myanswer"]
+    className: "" + styles$4["myanswer"]
   }, formattedData && formattedData.length > 0 && formattedData.map(function (item) {
     return React__default.createElement("div", {
       key: item.category.id
-    }, React__default.createElement("div", null, React__default.createElement(material.Stack, {
+    }, React__default.createElement("div", {
+      className: "" + printStyles["avoid-break-inside"]
+    }, React__default.createElement(material.Stack, {
       bgcolor: "#F9FAFB",
       flexDirection: "row",
       padding: "12px",
@@ -13744,18 +13752,29 @@ var iconBtnNextChart = function iconBtnNextChart(_ref) {
   }));
 };
 
-var CompareGrass = function CompareGrass(_ref) {
-  var effectSize = _ref.effectSize;
+var ChipCustom = material.styled(material.Stack)(function (_ref) {
+  _objectDestructuringEmpty(_ref);
+  return {
+    width: "fit-content",
+    borderRadius: "6px",
+    padding: "4px 8px",
+    flexWrap: "nowrap"
+  };
+});
+var CompareGrass = function CompareGrass(_ref2) {
+  var effectSize = _ref2.effectSize;
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
   var renderTableBody = function renderTableBody(effectSize) {
     return effectSize.map(function (item, index) {
       return React__default.createElement("tr", {
         id: "print-item",
+        className: "" + printStyles["avoid-break-inside"],
         key: item.id,
-        style: index < effectSize.length - 1 ? {
-          borderBottom: "1px solid #e4e7ec"
-        } : {}
+        style: {
+          borderBottom: index < effectSize.length - 1 ? "1px solid #e4e7ec" : undefined,
+          borderTop: index < effectSize.length - 1 ? "1px solid transparent" : undefined
+        }
       }, React__default.createElement("td", {
         className: styles$4["tdcolumn1"]
       }, t("problem"), " ", item.questionOrder + 1), React__default.createElement("td", {
@@ -13779,31 +13798,47 @@ var CompareGrass = function CompareGrass(_ref) {
         }
       }, item.mostSelectedAnswers ? t("number_question", {
         number: item.mostSelectedAnswers
-      }) : ""), React__default.createElement("td", null, React__default.createElement("div", {
-        className: styles$4["classification"]
+      }) : ""), React__default.createElement("td", {
+        className: "" + printStyles["avoid-break-inside"]
+      }, React__default.createElement("div", {
+        className: styles$4["classification"] + " " + printStyles["avoid-break-inside"]
       }, item.problemCategories.map(function (problem, index) {
-        return React__default.createElement("div", {
-          key: index
-        }, problem === 1 && React__default.createElement("span", {
+        return React__default.createElement(material.Stack, {
+          flexDirection: "row",
+          key: index,
+          gap: "10px",
+          flexWrap: "wrap",
+          className: "" + printStyles["avoid-break-inside"]
+        }, problem === 1 && React__default.createElement(ChipCustom, {
           style: {
-            border: "1px solid " + styles$4.green_support_900
-          }
-        }, t("easy_problem")), problem === 3 && React__default.createElement("span", {
+            border: "1px solid #1EE288",
+            fontSize: "11px"
+          },
+          className: "" + printStyles["avoid-break-inside"]
+        }, t("easy_problem")), problem === 3 && React__default.createElement(ChipCustom, {
           style: {
-            border: "1px solid " + styles$4.yellow_900
-          }
-        }, t("trick_problem")), problem === 2 && React__default.createElement("span", {
+            border: "1px solid #FEAF06",
+            fontSize: "11px"
+          },
+          className: "" + printStyles["avoid-break-inside"]
+        }, t("trick_problem")), problem === 2 && React__default.createElement(ChipCustom, {
           style: {
-            border: "1px solid " + styles$4.red_900
-          }
-        }, t("differential_problem")), problem === 0 && React__default.createElement("span", {
+            border: "1px solid #F34B4B",
+            fontSize: "11px"
+          },
+          className: "" + printStyles["avoid-break-inside"]
+        }, t("differential_problem")), problem === 0 && React__default.createElement(ChipCustom, {
           style: {
-            border: "1px solid #DDDDDD"
-          }
-        }, t("general_problem")), problem === 4 && React__default.createElement("span", {
+            border: "1px solid #DDDDDD",
+            fontSize: "11px"
+          },
+          className: "" + printStyles["avoid-break-inside"]
+        }, t("general_problem")), problem === 4 && React__default.createElement(ChipCustom, {
           style: {
-            border: "1px solid " + styles$4.red_900
-          }
+            border: "1px solid #FF0000",
+            fontSize: "11px"
+          },
+          className: "" + printStyles["avoid-break-inside"]
         }, t("difficult_problem")));
       }))));
     });
@@ -13820,8 +13855,10 @@ var CompareGrass = function CompareGrass(_ref) {
     }
   }, React__default.createElement("thead", {
     style: {
-      borderBottom: "1px solid #E4E7EC"
-    }
+      borderBottom: "1px solid #E4E7EC",
+      borderTop: "1px solid transparent"
+    },
+    className: "" + printStyles["avoid-break-inside"]
   }, React__default.createElement("tr", null, React__default.createElement("th", {
     className: styles$4["thcolumn1"]
   }, t("problem_number")), React__default.createElement("th", {
@@ -13904,9 +13941,9 @@ var TrickyProblem = function TrickyProblem(_ref) {
   });
   var renderProblems = function renderProblems() {
     return React__default.createElement(React.Fragment, null, React__default.createElement("div", {
-      className: styles$4["titleTrickyProblem"]
+      className: styles$4["titleTrickyProblem"] + " " + printStyles["avoid-break-inside"]
     }, React__default.createElement(iconX, null), React__default.createElement("span", null, t("incorrect_problem_among_the_starred_problems"))), React__default.createElement("div", {
-      className: styles$4["wrongQuestions"]
+      className: styles$4["wrongQuestions"] + " " + printStyles["avoid-break-inside"]
     }, !!inCorrectQuestions.length && inCorrectQuestions.map(function (question) {
       return React__default.createElement("span", {
         key: question.id,
@@ -13917,9 +13954,9 @@ var TrickyProblem = function TrickyProblem(_ref) {
     }), !data.questions.length && React__default.createElement("div", {
       className: styles$4["noData"]
     }, t("no_data"))), React__default.createElement("div", {
-      className: styles$4["titleTrickyProblem"]
+      className: styles$4["titleTrickyProblem"] + " " + printStyles["avoid-break-inside"]
     }, React__default.createElement(iconAssignedQuestions, null), React__default.createElement("span", null, t("correct_problem_among_the_starred_problems"))), React__default.createElement("div", {
-      className: styles$4["assignedQuestions"]
+      className: styles$4["assignedQuestions"] + " " + printStyles["avoid-break-inside"]
     }, !!correctQuestions.length && correctQuestions.map(function (question) {
       return React__default.createElement("div", {
         key: question.id,
@@ -13934,7 +13971,7 @@ var TrickyProblem = function TrickyProblem(_ref) {
   return React__default.createElement("div", {
     className: "" + styles$4["wrapperProblem"]
   }, React__default.createElement("div", {
-    className: "" + (!isOpen ? styles$4["titleProblemClose"] : styles$4["titleProblem"]),
+    className: printStyles["avoid-break-inside"] + " " + (!isOpen ? styles$4["titleProblemClose"] : styles$4["titleProblem"]),
     onClick: function onClick() {
       return changeOpen === null || changeOpen === void 0 ? void 0 : changeOpen(isOpen ? undefined : keyOpen);
     }
@@ -13968,6 +14005,7 @@ var ProtractedProblem = function ProtractedProblem(_ref) {
       var isBetter = time > 0;
       return React__default.createElement("tr", {
         id: "print-item",
+        className: "" + printStyles["avoid-break-inside"],
         key: item.id,
         style: index < data.length - 1 ? {
           borderBottom: "1px solid #e4e7ec"
@@ -14008,8 +14046,9 @@ var ProtractedProblem = function ProtractedProblem(_ref) {
   };
   var renderQuestions = function renderQuestions(data) {
     return data.map(function (item) {
-      return React__default.createElement("div", {
-        className: styles$4["content"],
+      return React__default.createElement(material.Stack, {
+        flexDirection: "row",
+        className: styles$4["content"] + " " + printStyles["avoid-break-inside"],
         key: item.id
       }, React__default.createElement("div", {
         className: styles$4["contentColumn1"]
@@ -14035,7 +14074,7 @@ var ProtractedProblem = function ProtractedProblem(_ref) {
   return React__default.createElement("div", {
     className: "" + styles$4["wrapperProblem"]
   }, React__default.createElement("div", {
-    className: "" + (!isOpen ? styles$4["titleProblemClose"] : styles$4["titleProblem"]),
+    className: printStyles["avoid-break-inside"] + " " + (!isOpen ? styles$4["titleProblemClose"] : styles$4["titleProblem"]),
     onClick: function onClick() {
       return changeOpen === null || changeOpen === void 0 ? void 0 : changeOpen(isOpen ? undefined : keyOpen);
     }
@@ -14073,7 +14112,8 @@ var ProtractedProblem = function ProtractedProblem(_ref) {
   }, isMyStoryStudent && React__default.createElement("thead", {
     style: {
       borderBottom: "1px solid #E4E7EC"
-    }
+    },
+    className: "" + printStyles["avoid-break-inside"]
   }, React__default.createElement("tr", null, React__default.createElement("th", {
     className: styles$4["thcolumn1"]
   }, t("problem_number")), React__default.createElement("th", {
@@ -14089,7 +14129,7 @@ var ProtractedProblem = function ProtractedProblem(_ref) {
       textAlign: "center"
     }
   }, t("time_comparison")))), React__default.createElement("tbody", null, isMyStoryStudent ? renderTableBody(data) : renderQuestions(data))))) : React__default.createElement("div", {
-    className: "" + styles$4["noData"]
+    className: styles$4["noData"] + " " + printStyles["avoid-break-inside"]
   }, t("no_data"))));
 };
 
@@ -14115,10 +14155,11 @@ var Vulnerable = function Vulnerable(_ref) {
     return data.map(function (item, index) {
       return React__default.createElement("tr", {
         id: "print-item",
+        className: "" + printStyles["avoid-break-inside"],
         key: item.id,
-        style: index < data.length - 1 ? {
-          borderBottom: "1px solid #e4e7ec"
-        } : {}
+        style: {
+          borderBottom: index < data.length - 1 ? "1px solid #e4e7ec" : undefined
+        }
       }, React__default.createElement("td", {
         className: styles$4["tdcolumn1"],
         style: {
@@ -14166,7 +14207,7 @@ var Vulnerable = function Vulnerable(_ref) {
       return React__default.createElement(material.Grid, {
         container: true,
         flexWrap: "nowrap",
-        className: styles$4["content"],
+        className: styles$4["content"] + " " + printStyles["avoid-break-inside"],
         key: question.id
       }, React__default.createElement(material.Grid, {
         item: true,
@@ -14204,7 +14245,7 @@ var Vulnerable = function Vulnerable(_ref) {
   return React__default.createElement("div", {
     className: "" + styles$4["wrapperProblem"]
   }, React__default.createElement("div", {
-    className: "" + (!isOpen ? styles$4["titleProblemClose"] : styles$4["titleProblem"]),
+    className: printStyles["avoid-break-inside"] + " " + (!isOpen ? styles$4["titleProblemClose"] : styles$4["titleProblem"]),
     onClick: handleToggle
   }, React__default.createElement(material.Stack, {
     flexDirection: "row",
@@ -14240,7 +14281,8 @@ var Vulnerable = function Vulnerable(_ref) {
   }, React__default.createElement("thead", {
     style: {
       borderBottom: "1px solid #E4E7EC"
-    }
+    },
+    className: "" + printStyles["avoid-break-inside"]
   }, React__default.createElement("tr", null, React__default.createElement("th", {
     className: styles$4["thcolumn1"]
   }, t("problem_number")), React__default.createElement("th", {
@@ -14260,7 +14302,7 @@ var Vulnerable = function Vulnerable(_ref) {
       textAlign: "center"
     }
   }, t("_category")))), React__default.createElement("tbody", null, renderTableBody(incorrectQuestions))), !isMyStoryStudent && renderQuestions(incorrectQuestions))) : React__default.createElement("div", {
-    className: "" + styles$4["noData"]
+    className: styles$4["noData"] + " " + printStyles["avoid-break-inside"]
   }, t("no_data"))));
 };
 
@@ -14301,10 +14343,11 @@ var GradesByTerritory = function GradesByTerritory(_ref) {
     return data.map(function (item, index) {
       return React__default.createElement("tr", {
         id: "print-item",
+        className: "" + printStyles["avoid-break-inside"],
         key: item.id,
-        style: index < data.length - 1 ? {
-          borderBottom: "1px solid #e4e7ec"
-        } : {}
+        style: {
+          borderBottom: index < data.length - 1 ? "1px solid #e4e7ec" : undefined
+        }
       }, React__default.createElement("td", {
         className: styles$4["tdcolumn1"],
         style: {
@@ -14354,7 +14397,7 @@ var GradesByTerritory = function GradesByTerritory(_ref) {
         left: item.percentageAmongStudents + "%"
       };
       return React__default.createElement("div", {
-        className: styles$4["contentProblem"],
+        className: styles$4["contentProblem"] + " " + printStyles["avoid-break-inside"],
         key: item.id
       }, React__default.createElement("div", {
         className: styles$4["labelProblem"]
@@ -14373,7 +14416,7 @@ var GradesByTerritory = function GradesByTerritory(_ref) {
   return React__default.createElement("div", {
     className: "" + styles$4["wrapperProblem"]
   }, React__default.createElement("div", {
-    className: "" + (!isOpen ? styles$4["titleProblemClose"] : styles$4["titleProblem"]),
+    className: printStyles["avoid-break-inside"] + " " + (!isOpen ? styles$4["titleProblemClose"] : styles$4["titleProblem"]),
     onClick: function onClick() {
       return changeOpen === null || changeOpen === void 0 ? void 0 : changeOpen(isOpen ? undefined : ProblemKey.GradesByTerritory);
     }
@@ -14401,7 +14444,8 @@ var GradesByTerritory = function GradesByTerritory(_ref) {
   }, React__default.createElement("thead", {
     style: {
       borderBottom: "1px solid #E4E7EC"
-    }
+    },
+    className: "" + printStyles["avoid-break-inside"]
   }, React__default.createElement("tr", null, React__default.createElement("th", {
     className: styles$4["thcolumn1"]
   }, t("categories")), React__default.createElement("th", {
@@ -14421,7 +14465,7 @@ var GradesByTerritory = function GradesByTerritory(_ref) {
       textAlign: "center"
     }
   }, t("total_solve_time")))), React__default.createElement("tbody", null, renderTableBody(formattedData))), !isMyStoryStudent && renderCategories(formattedData))) : React__default.createElement("div", {
-    className: "" + styles$4["noData"]
+    className: styles$4["noData"] + " " + printStyles["avoid-break-inside"]
   }, t("no_data"))));
 };
 
@@ -14675,7 +14719,7 @@ var usePrintExamResult = function usePrintExamResult(isDataFetching, fileName, t
                 orientation: 'portrait'
               },
               pagebreak: {
-                mode: ['avoid-all', 'css', 'legacy']
+                mode: ['css', 'legacy']
               }
             };
             return Promise.resolve(html2pdf().from(element).set(options).save()).then(function () {
@@ -14710,8 +14754,6 @@ var usePrintExamResult = function usePrintExamResult(isDataFetching, fileName, t
   };
 };
 
-var printStyles = {"page-break":"_35kyG","print-exact-color":"_1PFgl","avoid-break-inside":"_3rPGh"};
-
 var TimeOrderChart = function TimeOrderChart(_ref) {
   var timelyOrderQuestion = _ref.timelyOrderQuestion,
     options = _ref.options,
@@ -14742,7 +14784,7 @@ var TimeOrderChart = function TimeOrderChart(_ref) {
       color: "#414E62"
     }
   }, t("article_number"), " ", timelyOrderQuestion.article), React__default.createElement("div", {
-    className: "" + styles$4["compareChart"]
+    className: styles$4["compareChart"] + " " + printStyles["avoid-break-inside"]
   }, React__default.createElement("div", {
     className: "" + styles$4["prevChart"]
   }), React__default.createElement("div", {
@@ -14923,10 +14965,22 @@ var PrintExamResult = function PrintExamResult(_ref) {
     flexDirection: "column",
     gap: "12px",
     marginTop: "24px"
+  }, React__default.createElement(material.Stack, {
+    flexDirection: "column",
+    gap: "12px",
+    className: "" + printStyles["avoid-break-inside"]
   }, React__default.createElement(material.Typography, {
     sx: textStyle
   }, i18n.t(TabList[1].label)), timelyOrderQuestions.map(function (timelyOrderQuestion, index) {
-    return React__default.createElement(TimeOrderChart, {
+    return index === 0 && React__default.createElement(TimeOrderChart, {
+      key: index,
+      timelyOrderQuestion: timelyOrderQuestion,
+      options: allChartOptions[index],
+      series: allSeries[index],
+      setIsRendered: setRenderedChart
+    });
+  })), timelyOrderQuestions.map(function (timelyOrderQuestion, index) {
+    return index > 0 && React__default.createElement(TimeOrderChart, {
       key: index,
       timelyOrderQuestion: timelyOrderQuestion,
       options: allChartOptions[index],