touchstudy-core 0.1.122 → 0.1.124

package/dist/containers/ExamResult/views/PrintExamResult.d.ts

@@ -6,8 +6,7 @@ interface Props {
     resultData?: ExamResult;
     textbookResult?: TextbookResult;
     examTime: string;
-    status?: string;
-    isShow?: (value: number) => boolean;
+    isShow: (value: number) => boolean;
     isStudent: boolean;
     categoryResponses: CategoryResponse[];
     timelyOrderQuestions: TimelyOrderQuestion[];

package/dist/index.js

@@ -5101,9 +5101,6 @@ var PrintExamView2 = function PrintExamView2(_ref) {
     setErrorLinks([]);
     setState(PrintState.Printing);
   };
-  console.log({
-    status: status
-  });
   var print = function print(_ref2) {
     var examSessionId = _ref2.examSessionId,
       studentId = _ref2.studentId,
@@ -5122,7 +5119,7 @@ var PrintExamView2 = function PrintExamView2(_ref) {
           code: code,
           examSessionId: "" + examSessionId,
           studentId: "" + studentId,
-          message: isTeacher ? "/teacher/exam-results/" + examSessionId + "/students/" + studentId + "/print" : "/student/exam-results/" + code + "/print"
+          message: isTeacher ? "/teacher/exam-results/" + examSessionId + "/students/" + studentId + "/print?status=" + status.join(",") : "/student/exam-results/" + code + "/print"
         }]);
       });
       if (!isTeacher) {
@@ -5209,7 +5206,7 @@ var PrintExamView2 = function PrintExamView2(_ref) {
             code: (_event$data = event.data) === null || _event$data === void 0 ? void 0 : _event$data.code,
             examSessionId: (_event$data2 = event.data) === null || _event$data2 === void 0 ? void 0 : _event$data2.examSessionId,
             studentId: "" + studentId,
-            message: isTeacher ? "/teacher/exam-results/" + event.data.examSessionId + "/students/" + event.data.studentId + "/print" : "/student/exam-results/" + event.data.code + "/print"
+            message: isTeacher ? "/teacher/exam-results/" + event.data.examSessionId + "/students/" + event.data.studentId + "/print?status=" + status.join(",") : "/student/exam-results/" + event.data.code + "/print"
           }]);
         });
       }
@@ -5246,7 +5243,7 @@ var PrintExamView2 = function PrintExamView2(_ref) {
     className: "mt-2"
   }, React__default.createElement(material.Typography, {
     fontWeight: 700
-  }, t("download_failed"), ":"), Array.from(new Set(errorLinks)).map(function (i) {
+  }, t("download_failed"), ":"), Array.from(new Set(errorLinks)).map(function (i, index) {
     var _info$createdBy;
     var info = isTeacher ? dataExamSession.find(function (exam) {
       return "" + (exam === null || exam === void 0 ? void 0 : exam.examSessionId) === "" + (i === null || i === void 0 ? void 0 : i.examSessionId) && "" + (exam === null || exam === void 0 ? void 0 : exam.studentId) === "" + (i === null || i === void 0 ? void 0 : i.studentId);
@@ -5254,6 +5251,7 @@ var PrintExamView2 = function PrintExamView2(_ref) {
       return (exam === null || exam === void 0 ? void 0 : exam.code) === (i === null || i === void 0 ? void 0 : i.code);
     });
     return React__default.createElement(material.Stack, {
+      key: index,
       borderBottom: 1,
       borderColor: theme.palette.grey[500]
     }, React__default.createElement("a", {
@@ -5283,10 +5281,11 @@ var PrintExamView2 = function PrintExamView2(_ref) {
       gap: 1,
       flexWrap: "wrap"
     }
-  }, TabList.map(function (_ref3) {
+  }, TabList.map(function (_ref3, index) {
     var label = _ref3.label,
       value = _ref3.value;
     return React__default.createElement(material.FormControlLabel, {
+      key: index,
       control: React__default.createElement(material.Checkbox, {
         onChange: handleChangeStatus,
         value: value,
@@ -18556,7 +18555,6 @@ var PrintExamResult = function PrintExamResult(_ref) {
     textbookResult = _ref.textbookResult,
     chapterId = _ref.chapterId,
     examTime = _ref.examTime,
-    status = _ref.status,
     isShow = _ref.isShow,
     isStudent = _ref.isStudent,
     totalTime = _ref.totalTime,
@@ -18569,11 +18567,6 @@ var PrintExamResult = function PrintExamResult(_ref) {
     longTimeSpend = _ref.longTimeSpend,
     contentRef = _ref.contentRef,
     setRenderedChart = _ref.setRenderedChart;
-  console.log({
-    bang: status,
-    chapterId: chapterId,
-    bang2: isShow === null || isShow === void 0 ? void 0 : isShow(TabList$2[1].value)
-  });
   var academy = reactRedux.useSelector(function (state) {
     var _state$common;
     return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.academy;
@@ -18747,7 +18740,7 @@ var PrintExamResult = function PrintExamResult(_ref) {
       fontWeight: 600,
       color: styles.gray_700
     }
-  }, resultData === null || resultData === void 0 ? void 0 : resultData.teacherName)))))), (!status || (isShow === null || isShow === void 0 ? void 0 : isShow(TabList$2[0].value))) && React__default.createElement(material.Stack, {
+  }, resultData === null || resultData === void 0 ? void 0 : resultData.teacherName)))))), isShow(TabList$2[0].value) && React__default.createElement(material.Stack, {
     display: "flex",
     flexDirection: "column",
     gap: "12px"
@@ -18761,7 +18754,7 @@ var PrintExamResult = function PrintExamResult(_ref) {
     data: resultData,
     categories: categoryResponses,
     isStudent: isStudent
-  })), (!status || (isShow === null || isShow === void 0 ? void 0 : isShow(TabList$2[1].value))) && React__default.createElement(material.Stack, {
+  })), isShow(TabList$2[1].value) && React__default.createElement(material.Stack, {
     display: "flex",
     flexDirection: "column",
     gap: "12px",
@@ -18788,7 +18781,7 @@ var PrintExamResult = function PrintExamResult(_ref) {
       series: allSeries[index],
       setIsRendered: setRenderedChart
     });
-  })), (!status || (isShow === null || isShow === void 0 ? void 0 : isShow(TabList$2[2].value))) && React__default.createElement(material.Stack, {
+  })), isShow(TabList$2[2].value) && React__default.createElement(material.Stack, {
     display: "flex",
     flexDirection: "column",
     gap: "12px",
@@ -18797,7 +18790,7 @@ var PrintExamResult = function PrintExamResult(_ref) {
     sx: textStyle
   }, i18n.t(TabList$2[2].label)), React__default.createElement(CompareGrass, {
     effectSize: effectSize
-  })), (!status || (isShow === null || isShow === void 0 ? void 0 : isShow(TabList$2[3].value))) && React__default.createElement(material.Stack, {
+  })), isShow(TabList$2[3].value) && React__default.createElement(material.Stack, {
     display: "flex",
     flexDirection: "column",
     gap: "12px",
@@ -19631,7 +19624,6 @@ var useExamResultData = function useExamResultData(props) {
       var _temp6 = _catch(function () {
         return Promise.resolve(Promise.all([getChapterResultsApi(chapterId), getChapterResultsLongTimeSpendApi(chapterId), getChapterResultsEffectSizeApi(chapterId), getChapterResultsTimeOrderQuestionApi(chapterId), getChapterResultsCategoriesApi(chapterId)])).then(function (result) {
           var _result$0$data3, _result$1$data3, _result$2$data3, _result$3$data3, _result$4$data3;
-          console.log(result);
           handleChangeTab === null || handleChangeTab === void 0 ? void 0 : handleChangeTab(0);
           setDataChartIndex(0);
           setTextbookResult((_result$0$data3 = result[0].data) === null || _result$0$data3 === void 0 ? void 0 : _result$0$data3.data);
@@ -20180,8 +20172,9 @@ var usePrintExamResult = function usePrintExamResult(isDataFetching, fileName, t
           };
           var _temp3 = _catch(function () {
             function _temp2() {
-              html2pdf().from(element).set(options).save();
-              onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess();
+              return Promise.resolve(html2pdf().from(element).set(options).save()).then(function () {
+                onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess();
+              });
             }
             var element = contentRef.current;
             var options = {
@@ -20192,7 +20185,7 @@ var usePrintExamResult = function usePrintExamResult(isDataFetching, fileName, t
                 quality: 1
               },
               html2canvas: {
-                scale: 4
+                scale: 1.5
               },
               jsPDF: {
                 format: 'a4',
@@ -20894,12 +20887,10 @@ var usePrintView = function usePrintView(_ref) {
   var search = window.location.search;
   var query = new URLSearchParams(search);
   var status = query.get('status') || '';
-  var isPrintAll = status === "";
-  var isShow = function isShow(value) {
-    return (status === null || status === void 0 ? void 0 : status.split(',').some(function (i) {
-      return i === value.toString();
-    })) || false;
-  };
+  var isPrintAll = !(status !== null && status !== void 0 && status.length);
+  var isShow = React.useCallback(function (value) {
+    return isPrintAll || (status === null || status === void 0 ? void 0 : status.split(',').includes(value.toString()));
+  }, [isPrintAll, status]);
   var handelPrintSuccess = function handelPrintSuccess() {
     var _window$opener$postMe, _window$opener;
     var data;
@@ -21023,11 +21014,10 @@ var PrintExamResultView = function PrintExamResultView(_ref) {
     }),
     fileName = _usePrintView.fileName,
     isDone = _usePrintView.isDone,
-    status = _usePrintView.status,
     isShow = _usePrintView.isShow,
     handelPrintSuccess = _usePrintView.handelPrintSuccess,
     handelPrintError = _usePrintView.handelPrintError;
-  var _usePrintExamResult = usePrintExamResult(isLoading, fileName, !status || isShow !== null && isShow !== void 0 && isShow(TabList$2[1].value) ? timelyOrderQuestions.length : 0, handelPrintSuccess, handelPrintError, true),
+  var _usePrintExamResult = usePrintExamResult(isLoading, fileName, isShow !== null && isShow !== void 0 && isShow(TabList$2[1].value) ? timelyOrderQuestions.length : 0, handelPrintSuccess, handelPrintError, true),
     contentRef = _usePrintExamResult.contentRef,
     setRenderedChart = _usePrintExamResult.setRenderedChart;
   var isTabletUp = material.useMediaQuery("(min-width:900px)");
@@ -21054,7 +21044,6 @@ var PrintExamResultView = function PrintExamResultView(_ref) {
     fileName: fileName,
     isShow: isShow,
     totalTime: totalTime,
-    status: status,
     setRenderedChart: setRenderedChart
   }) : isLoading === undefined || isLoading === true ? React__default.createElement(LoadingComponent, {
     isLoading: !!isLoading,