touchstudy-core 0.1.81 → 0.1.82

package/dist/components/Print/configs/constants.d.ts

@@ -0,0 +1,4 @@
+export declare const TabList: {
+    label: string;
+    value: number;
+}[];

package/dist/containers/ExamResult/hooks/usePrintView.d.ts

@@ -10,6 +10,8 @@ declare const usePrintView: ({ examSessionId, studentId, code, setNotFound, resu
 }) => {
     fileName: string;
     isDone: boolean;
+    status: string;
+    isShow: (value: number) => boolean;
     handelPrintSuccess: () => void;
     handelPrintError: (errorMessage?: string | undefined) => void;
 };

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

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

package/dist/index.js

@@ -2580,6 +2580,7 @@ var your_browser_must = "귀하의 브라우저는 다음을 충족해야 합니
 var allowed_to_send_pop_ups_and_use_redirects = "팝업 보내기 및 리디렉션 사용이 허용됨";
 var disable_ask_where_to_save_each_file_before_downloading = "다운로드하기 전에 각 파일을 저장할 위치 묻기 비활성화";
 var total_number_of_selected_results = "선택된 결과의 총 개수";
+var choose_to_print = "인쇄를 선택하세요";
 var lang_ko = {
 	problem_solving: problem_solving,
 	my_story: my_story,
@@ -3352,7 +3353,8 @@ var lang_ko = {
 	your_browser_must: your_browser_must,
 	allowed_to_send_pop_ups_and_use_redirects: allowed_to_send_pop_ups_and_use_redirects,
 	disable_ask_where_to_save_each_file_before_downloading: disable_ask_where_to_save_each_file_before_downloading,
-	total_number_of_selected_results: total_number_of_selected_results
+	total_number_of_selected_results: total_number_of_selected_results,
+	choose_to_print: choose_to_print
 };
 
 var problem_solving$1 = "Problem Solving";
@@ -4135,6 +4137,7 @@ var your_browser_must$1 = "Your browser must";
 var allowed_to_send_pop_ups_and_use_redirects$1 = "Allowed to send pop-ups and use redirects";
 var disable_ask_where_to_save_each_file_before_downloading$1 = "Disable ask where to save each file before downloading";
 var total_number_of_selected_results$1 = "Total number of selected results";
+var choose_to_print$1 = "Choose to print";
 var lang_en = {
 	problem_solving: problem_solving$1,
 	my_story: my_story$1,
@@ -4908,7 +4911,8 @@ var lang_en = {
 	your_browser_must: your_browser_must$1,
 	allowed_to_send_pop_ups_and_use_redirects: allowed_to_send_pop_ups_and_use_redirects$1,
 	disable_ask_where_to_save_each_file_before_downloading: disable_ask_where_to_save_each_file_before_downloading$1,
-	total_number_of_selected_results: total_number_of_selected_results$1
+	total_number_of_selected_results: total_number_of_selected_results$1,
+	choose_to_print: choose_to_print$1
 };
 
 i18n__default.use(reactI18next.initReactI18next).init({
@@ -10868,6 +10872,7 @@ var EXAM_RESULT = {
     topDuration: 180.939,
     answerResponseSignal: 0,
     isCorrect: false,
+    score: 2,
     answerTime: "2024-03-13T04:29:00.685+00:00",
     article: 1,
     category: {
@@ -10889,6 +10894,7 @@ var EXAM_RESULT = {
     classAverageTime: 2.014,
     topDuration: 2.014,
     answerResponseSignal: 1,
+    score: 2,
     isCorrect: false,
     answerTime: "2024-03-13T04:29:02.7+00:00",
     article: 1,
@@ -10911,6 +10917,7 @@ var EXAM_RESULT = {
     classAverageTime: 52.244,
     topDuration: 24.244,
     answerResponseSignal: 1,
+    score: 2,
     isCorrect: false,
     answerTime: "2024-03-13T04:29:04.944+00:00",
     article: 1,
@@ -10933,6 +10940,7 @@ var EXAM_RESULT = {
     classAverageTime: 1.373,
     topDuration: 1.373,
     answerResponseSignal: 4,
+    score: 2,
     isCorrect: true,
     answerTime: "2024-03-13T04:29:06.317+00:00",
     article: 1,
@@ -10955,6 +10963,7 @@ var EXAM_RESULT = {
     classAverageTime: 132.683,
     topDuration: 110.683,
     answerResponseSignal: 2,
+    score: 2,
     isCorrect: false,
     answerTime: "2024-03-13T04:29:07+00:00",
     article: 1,
@@ -10977,6 +10986,7 @@ var EXAM_RESULT = {
     classAverageTime: 1.052,
     topDuration: 1.052,
     answerResponseSignal: 1,
+    score: 2,
     isCorrect: true,
     answerTime: "2024-03-13T04:29:08.052+00:00",
     article: 2,
@@ -10999,6 +11009,7 @@ var EXAM_RESULT = {
     classAverageTime: 0,
     topDuration: null,
     answerResponseSignal: null,
+    score: 2,
     isCorrect: false,
     answerTime: "0001-01-01T00:00:00+00:00",
     article: 2,
@@ -11021,6 +11032,7 @@ var EXAM_RESULT = {
     classAverageTime: 2.596,
     topDuration: 2.596,
     answerResponseSignal: 1,
+    score: 2,
     isCorrect: false,
     answerTime: "2024-03-13T04:29:10.648+00:00",
     article: 2,
@@ -11043,6 +11055,7 @@ var EXAM_RESULT = {
     classAverageTime: 0.899,
     topDuration: 0.899,
     answerResponseSignal: 1,
+    score: 2,
     isCorrect: false,
     answerTime: "2024-03-13T04:29:12.864+00:00",
     article: 2,
@@ -11066,6 +11079,7 @@ var EXAM_RESULT = {
     topDuration: 20.496,
     answerResponseSignal: 0,
     isCorrect: true,
+    score: 2,
     answerTime: "2024-03-13T04:29:14.36+00:00",
     article: 2,
     category: {
@@ -11087,6 +11101,7 @@ var EXAM_RESULT = {
     classAverageTime: 0,
     topDuration: null,
     answerResponseSignal: null,
+    score: 2,
     isCorrect: false,
     answerTime: "0001-01-01T00:00:00+00:00",
     article: 2,
@@ -11110,6 +11125,7 @@ var EXAM_RESULT = {
     topDuration: 1.317,
     answerResponseSignal: 1,
     isCorrect: true,
+    score: 2,
     answerTime: "2024-03-13T04:29:11.965+00:00",
     article: 3,
     category: {
@@ -11131,6 +11147,7 @@ var EXAM_RESULT = {
     classAverageTime: 1.593,
     topDuration: 1.593,
     answerResponseSignal: 1,
+    score: 2,
     isCorrect: false,
     answerTime: "2024-03-13T04:29:20.734+00:00",
     article: 3,
@@ -11153,6 +11170,7 @@ var EXAM_RESULT = {
     classAverageTime: 1.204,
     topDuration: 1.204,
     answerResponseSignal: 1,
+    score: 2,
     isCorrect: false,
     answerTime: "2024-03-13T04:29:18.164+00:00",
     article: 3,
@@ -11175,6 +11193,7 @@ var EXAM_RESULT = {
     classAverageTime: 2.6,
     topDuration: 2.6,
     answerResponseSignal: 1,
+    score: 2,
     isCorrect: false,
     answerTime: "2024-03-13T04:29:16.96+00:00",
     article: 3,
@@ -11197,6 +11216,7 @@ var EXAM_RESULT = {
     classAverageTime: 0.977,
     topDuration: 0.977,
     answerResponseSignal: 1,
+    score: 2,
     isCorrect: true,
     answerTime: "2024-03-13T04:29:19.141+00:00",
     article: 3,
@@ -11725,12 +11745,12 @@ var useExamResult = function useExamResult(props) {
           setCategoryResponses(((_result$4$data2 = result[4].data) === null || _result$4$data2 === void 0 ? void 0 : _result$4$data2.data) || []);
           return isStudent ? _temp3(!isStudent && createRecentUserActionListApi({
             userId: studentId,
-            action: RecentUserAction$1.ViewedExamResult,
+            action: isPrint ? RecentUserAction$1.PrintedExamResult : RecentUserAction$1.ViewedExamResult,
             data: "" + examSessionId,
             roles: [exports.Role.Teacher]
           })) : Promise.resolve(!isStudent && createRecentUserActionListApi({
             userId: studentId,
-            action: RecentUserAction$1.ViewedExamResult,
+            action: isPrint ? RecentUserAction$1.PrintedExamResult : RecentUserAction$1.ViewedExamResult,
             data: "" + examSessionId,
             roles: [exports.Role.Teacher]
           })).then(_temp3);
@@ -14694,7 +14714,7 @@ var usePrintExamResult = function usePrintExamResult(isDataFetching, fileName, t
   var autoPrintPdf = function autoPrintPdf() {
     if (printState === PrintState.Printing) return;
     if (autoPrint && printState !== PrintState.Default) return;
-    if (totalChart !== renderedCharts.length) {
+    if (totalChart !== 0 && totalChart !== renderedCharts.length) {
       !autoPrint && setPrintState(PrintState.Pending);
       return;
     }
@@ -14823,6 +14843,8 @@ var studentNameStyle = {
 var PrintExamResult = function PrintExamResult(_ref) {
   var resultData = _ref.resultData,
     examTime = _ref.examTime,
+    status = _ref.status,
+    isShow = _ref.isShow,
     isStudent = _ref.isStudent,
     categoryResponses = _ref.categoryResponses,
     timelyOrderQuestions = _ref.timelyOrderQuestions,
@@ -14950,7 +14972,7 @@ var PrintExamResult = function PrintExamResult(_ref) {
       fontWeight: 600,
       color: styles.gray_700
     }
-  }, resultData === null || resultData === void 0 ? void 0 : resultData.teacherName)))))), React__default.createElement(material.Stack, {
+  }, resultData === null || resultData === void 0 ? void 0 : resultData.teacherName)))))), (!status || (isShow === null || isShow === void 0 ? void 0 : isShow(TabList[0].value))) && React__default.createElement(material.Stack, {
     display: "flex",
     flexDirection: "column",
     gap: "12px"
@@ -14960,7 +14982,7 @@ var PrintExamResult = function PrintExamResult(_ref) {
     data: resultData,
     categories: categoryResponses,
     isStudent: isStudent
-  })), React__default.createElement(material.Stack, {
+  })), (!status || (isShow === null || isShow === void 0 ? void 0 : isShow(TabList[1].value))) && React__default.createElement(material.Stack, {
     display: "flex",
     flexDirection: "column",
     gap: "12px",
@@ -14987,7 +15009,7 @@ var PrintExamResult = function PrintExamResult(_ref) {
       series: allSeries[index],
       setIsRendered: setRenderedChart
     });
-  })), React__default.createElement(material.Stack, {
+  })), (!status || (isShow === null || isShow === void 0 ? void 0 : isShow(TabList[2].value))) && React__default.createElement(material.Stack, {
     display: "flex",
     flexDirection: "column",
     gap: "12px",
@@ -14996,7 +15018,7 @@ var PrintExamResult = function PrintExamResult(_ref) {
     sx: textStyle
   }, i18n.t(TabList[2].label)), React__default.createElement(CompareGrass, {
     effectSize: effectSize
-  })), React__default.createElement(material.Stack, {
+  })), (!status || (isShow === null || isShow === void 0 ? void 0 : isShow(TabList[3].value))) && React__default.createElement(material.Stack, {
     display: "flex",
     flexDirection: "column",
     gap: "12px",
@@ -16615,6 +16637,15 @@ var usePrintView = function usePrintView(_ref) {
   var _useState = React.useState(false),
     isDone = _useState[0],
     setDone = _useState[1];
+  var _useLocation = reactRouterDom.useLocation(),
+    search = _useLocation.search;
+  var query = new URLSearchParams(search);
+  var status = query.get('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 handelPrintSuccess = function handelPrintSuccess() {
     var _window$opener$postMe, _window$opener;
     var data;
@@ -16661,6 +16692,8 @@ var usePrintView = function usePrintView(_ref) {
   return {
     fileName: fileName,
     isDone: isDone,
+    status: status,
+    isShow: isShow,
     handelPrintSuccess: handelPrintSuccess,
     handelPrintError: handelPrintError
   };
@@ -16729,9 +16762,11 @@ 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, timelyOrderQuestions.length, handelPrintSuccess, handelPrintError, true),
+  var _usePrintExamResult = usePrintExamResult(isLoading, fileName, !status || isShow !== null && isShow !== void 0 && isShow(TabList[1].value) ? timelyOrderQuestions.length : 0, handelPrintSuccess, handelPrintError, true),
     contentRef = _usePrintExamResult.contentRef,
     setRenderedChart = _usePrintExamResult.setRenderedChart;
   var isTabletUp = material.useMediaQuery("(min-width:900px)");
@@ -16754,6 +16789,8 @@ var PrintExamResultView = function PrintExamResultView(_ref) {
     timelyOrderQuestions: timelyOrderQuestions,
     isMyStoryStudent: isMyStoryStudent,
     fileName: fileName,
+    isShow: isShow,
+    status: status,
     setRenderedChart: setRenderedChart
   }) : isLoading === undefined || isLoading === true ? React__default.createElement(LoadingComponent, {
     isLoading: !!isLoading,
@@ -16776,6 +16813,20 @@ var PrintState$1;
   PrintState[PrintState["Paused"] = 3] = "Paused";
 })(PrintState$1 || (PrintState$1 = {}));
 
+var TabList$1 = [{
+  label: "comprehensive_analysis",
+  value: 0
+}, {
+  label: "solution_order",
+  value: 1
+}, {
+  label: "compare_solution",
+  value: 2
+}, {
+  label: "problem_analysis",
+  value: 3
+}];
+
 var TOTAL = 3;
 var PrintExamView2 = function PrintExamView2(_ref) {
   var history = _ref.history,
@@ -16810,7 +16861,23 @@ var PrintExamView2 = function PrintExamView2(_ref) {
   var _useState5 = React.useState([]),
     errorLinks = _useState5[0],
     setErrorLinks = _useState5[1];
+  var _useState6 = React.useState([]),
+    status = _useState6[0],
+    setStatus = _useState6[1];
   var theme = material.useTheme();
+  var handleChangeStatus = function handleChangeStatus(event) {
+    if (event.target.checked) {
+      setStatus(function (prev) {
+        var _event$target;
+        return [].concat(prev, [(_event$target = event.target) === null || _event$target === void 0 ? void 0 : _event$target.value]);
+      });
+    } else setStatus(function (prev) {
+      return prev === null || prev === void 0 ? void 0 : prev.filter(function (i) {
+        var _event$target2;
+        return i !== ((_event$target2 = event.target) === null || _event$target2 === void 0 ? void 0 : _event$target2.value);
+      });
+    });
+  };
   var handleProgressPrint = function handleProgressPrint() {
     setData(dataProps);
     setCompleted([]);
@@ -16818,6 +16885,9 @@ var PrintExamView2 = function PrintExamView2(_ref) {
     setErrorLinks([]);
     setState(PrintState$1.Printing);
   };
+  console.log({
+    status: status
+  });
   var print = function print(_ref2) {
     var examSessionId = _ref2.examSessionId,
       studentId = _ref2.studentId,
@@ -16826,7 +16896,7 @@ var PrintExamView2 = function PrintExamView2(_ref) {
     var height = 200;
     var left = window.screenX + window.outerWidth / 2 - width / 2;
     var top = window.screenY + window.outerHeight / 2 - height / 2;
-    var url = isTeacher ? window.location.origin + "/teacher/exam-results/" + examSessionId + "/students/" + studentId + "/print" : window.location.origin + "/student/exam-results/" + code + "/print";
+    var url = isTeacher ? window.location.origin + "/teacher/exam-results/" + examSessionId + "/students/" + studentId + "/print?status=" + status.join(",") : window.location.origin + "/student/exam-results/" + code + "/print";
     var windowName = isTeacher ? "popup-" + examSessionId + "-" + studentId : "popup-" + code;
     var windowSpecs = "left=" + left + ",top=" + top + ",width=" + width + ",height=" + height + ",location=yes,resizable=yes,scrollbars=yes,status=yes";
     var childWindow = window.open(url, windowName, windowSpecs);
@@ -16988,7 +17058,29 @@ var PrintExamView2 = function PrintExamView2(_ref) {
     disablePadding: true
   }, t("allowed_to_send_pop_ups_and_use_redirects")), React__default.createElement(material.ListItem, {
     disablePadding: true
-  }, t("disable_ask_where_to_save_each_file_before_downloading")))), React__default.createElement(material.Button, {
+  }, t("disable_ask_where_to_save_each_file_before_downloading")))), isTeacher && React__default.createElement(material.Stack, null, React__default.createElement(material.Typography, {
+    fontWeight: 700
+  }, t("choose_to_print"), ":"), React__default.createElement(material.FormGroup, {
+    sx: {
+      display: "flex",
+      flexDirection: "row",
+      gap: 1,
+      flexWrap: "wrap"
+    }
+  }, TabList$1.map(function (_ref3) {
+    var label = _ref3.label,
+      value = _ref3.value;
+    return React__default.createElement(material.FormControlLabel, {
+      control: React__default.createElement(material.Checkbox, {
+        onChange: handleChangeStatus,
+        value: value,
+        checked: status.some(function (i) {
+          return i === value.toString();
+        })
+      }),
+      label: t(label)
+    });
+  }))), React__default.createElement(material.Button, {
     className: "mt-3",
     variant: "contained",
     onClick: handleProgressPrint