touchstudy-core 0.1.152 → 0.1.154

package/dist/index.modern.js

@@ -15173,8 +15173,9 @@ var useVirtualList = function useVirtualList(studentId, defaultFilter, getItemsA
       return;
     }
     setFilter(function (state) {
+      var _filter$currentPage;
       return !state ? state : _extends({}, state, {
-        currentPage: 1
+        currentPage: ((_filter$currentPage = filter.currentPage) != null ? _filter$currentPage : 0) + 1
       });
     });
   }, [filter === null || filter === void 0 ? void 0 : filter.currentPage, totalPages]);
@@ -19437,7 +19438,6 @@ var PrintExamResult = function PrintExamResult(_ref) {
     sx: textStyle
   }, t$1(TabList$2[0].label)), chapterId ? textbookResult && React__default.createElement(TextbookMyAnswer, {
     data: textbookResult,
-    categories: categoryResponses,
     isStudent: isStudent
   }) : resultData && React__default.createElement(MyAnswer, {
     data: resultData,
@@ -20392,7 +20392,7 @@ var useExamResult = function useExamResult(props) {
     studentId = _props$studentId === void 0 ? 0 : _props$studentId,
     code = props.code,
     chapterId = props.chapterId,
-    onViewExamQuestion = props.onViewExamQuestion;
+    onViewQA = props.onViewQA;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   var _useTab = useTab(),
@@ -20442,7 +20442,7 @@ var useExamResult = function useExamResult(props) {
   var handleViewQAndA = function handleViewQAndA(e, note) {
     e.stopPropagation();
     if (!note.examSessionId || !note.questionId) return;
-    onViewExamQuestion === null || onViewExamQuestion === void 0 ? void 0 : onViewExamQuestion(note.userId, note.examSessionId, note.questionId);
+    onViewQA === null || onViewQA === void 0 ? void 0 : onViewQA(note.userId, note.examSessionId, note.questionId);
   };
   var fileExamName = !resultData ? "" : "Exam-Result_" + resultData.student.fullName + "_" + resultData.title + "_(" + utcToLocalTime(resultData.startTime, "MM-DD-YYYY HH:mm") + ")";
   var fileTextbookName = !textbookResult ? "" : "Textbook-Result_" + textbookResult.chapterName + "_(" + utcToLocalTime(textbookResult.startTime, "MM-DD-YYYY HH:mm") + ")";
@@ -20469,9 +20469,12 @@ var useExamResult = function useExamResult(props) {
 };
 
 var ExamResultV2 = function ExamResultV2(props) {
-  var isMyStoryStudent = props.isMyStoryStudent,
-    onViewExamQuestion = props.onViewExamQuestion,
-    chapterId = props.chapterId;
+  var role = props.role,
+    isMyStoryStudent = props.isMyStoryStudent,
+    onViewQA = props.onViewQA,
+    chapterId = props.chapterId,
+    studentId = props.studentId;
+  var isAdminSite = role === Role.Admin;
   var _useExamResult = useExamResult(props),
     t = _useExamResult.t,
     fileName = _useExamResult.fileName,
@@ -20589,7 +20592,13 @@ var ExamResultV2 = function ExamResultV2(props) {
     onItemClick: handleOpenNoteDrawer,
     isLoading: isLoadingNotes
   };
-  var questionActions = [{
+  var questionActions = chapterId ? [{
+    label: "ask_a_question",
+    textStyle: {
+      color: "#3dc674"
+    },
+    onClick: handleOpenQuestionDialog
+  }] : [{
     label: "write_a_note_of_incorrect_answers",
     textStyle: {
       color: "#3dc674"
@@ -20608,6 +20617,14 @@ var ExamResultV2 = function ExamResultV2(props) {
     onOpenContextMenu: handleOpenQuestionContextMenu,
     isStudent: isStudent
   };
+  var handleViewTextbookQA = function handleViewTextbookQA() {
+    if (!studentId) return;
+    onViewQA === null || onViewQA === void 0 ? void 0 : onViewQA(+studentId, textbookResult === null || textbookResult === void 0 ? void 0 : textbookResult.studentTextbookSessionId, undefined, true);
+  };
+  var handleViewExamQA = function handleViewExamQA() {
+    if (!resultData) return;
+    onViewQA === null || onViewQA === void 0 ? void 0 : onViewQA(resultData.student.id, resultData.examSessionId);
+  };
   return React__default.createElement(Fragment$1, null, React__default.createElement(LoadingComponent, {
     isLoading: !!isLoading
   }), timelyOrderQuestions[dataChartIndex] && longTimeSpend && effectSize ? React__default.createElement("div", {
@@ -20754,7 +20771,7 @@ var ExamResultV2 = function ExamResultV2(props) {
     direction: "row",
     gap: "8px",
     alignItems: "center"
-  }, React__default.createElement(Button, {
+  }, !isAdminSite && React__default.createElement(Button, {
     variant: "outlined",
     sx: {
       color: styles.less_dark,
@@ -20770,7 +20787,7 @@ var ExamResultV2 = function ExamResultV2(props) {
       size: "14px"
     })),
     onClick: function onClick(e) {
-      return isStudent ? handleOpenQuestionDialog(e) : onViewExamQuestion === null || onViewExamQuestion === void 0 ? void 0 : onViewExamQuestion(resultData.student.id, resultData.examSessionId);
+      return isStudent ? handleOpenQuestionDialog(e) : handleViewExamQA();
     }
   }, t(isStudent ? "ask_a_question2" : "check_q&a")), React__default.createElement(Button, {
     variant: "outlined",
@@ -20828,7 +20845,7 @@ var ExamResultV2 = function ExamResultV2(props) {
     direction: "row",
     gap: "8px",
     alignItems: "center"
-  }, React__default.createElement(Button, {
+  }, !isAdminSite && React__default.createElement(Button, {
     variant: "outlined",
     sx: {
       color: styles.less_dark,
@@ -20844,7 +20861,7 @@ var ExamResultV2 = function ExamResultV2(props) {
       size: "14px"
     })),
     onClick: function onClick(e) {
-      return handleOpenQuestionDialog(e);
+      return isStudent ? handleOpenQuestionDialog(e) : handleViewTextbookQA();
     }
   }, t(isStudent ? "ask_a_question2" : "check_q&a")), React__default.createElement(Button, {
     variant: "outlined",
@@ -21231,12 +21248,14 @@ var PrintExamResultView = function PrintExamResultView(_ref) {
 
 var ExamResultDrawer = function ExamResultDrawer(_ref) {
   var _BRIEF_GRADE_OPTIONS$;
-  var history = _ref.history,
+  var role = _ref.role,
+    history = _ref.history,
     open = _ref.open,
     anchor = _ref.anchor,
     width = _ref.width,
     student = _ref.student,
     data = _ref.data,
+    onViewQA = _ref.onViewQA,
     onClose = _ref.onClose;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
@@ -21245,16 +21264,6 @@ var ExamResultDrawer = function ExamResultDrawer(_ref) {
     return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.language;
   });
   var search = window.location.search;
-  var searchParams = new URLSearchParams(search);
-  var handleViewExamQuestion = function handleViewExamQuestion(studentId, examSessionId, questionId) {
-    searchParams.set("sId", "" + studentId);
-    examSessionId && searchParams.set("eId", "" + examSessionId);
-    questionId && searchParams.set("qId", "" + questionId);
-    pushTo(history, {
-      pathname: "/teacher/question-and-answers",
-      search: searchParams.toString()
-    });
-  };
   var studentId = student === null || student === void 0 ? void 0 : student.id;
   var code = data === null || data === void 0 ? void 0 : data.code;
   var examSessionId = data === null || data === void 0 ? void 0 : data.id;
@@ -21354,21 +21363,24 @@ var ExamResultDrawer = function ExamResultDrawer(_ref) {
       pb: 4
     }
   }, examSessionId && React__default.createElement(ExamResultV2, {
+    role: role,
     history: history,
     searchParams: search,
     code: code,
     examSessionId: examSessionId,
     studentId: studentId,
-    onViewExamQuestion: handleViewExamQuestion
+    onViewQA: onViewQA
   })));
 };
 
 var DrawerExamResultTab = function DrawerExamResultTab(_ref) {
-  var history = _ref.history,
+  var role = _ref.role,
+    history = _ref.history,
     student = _ref.student,
     selectedTab = _ref.selectedTab,
     value = _ref.value,
-    studentId = _ref.studentId;
+    studentId = _ref.studentId,
+    onViewQA = _ref.onViewQA;
   var _useVirtualList = useVirtualList(studentId, EXAM_SESSION_DEFAULT_FILTER, getExamSessionListApi),
     items = _useVirtualList.items,
     selectedItem = _useVirtualList.selectedItem,
@@ -21403,13 +21415,15 @@ var DrawerExamResultTab = function DrawerExamResultTab(_ref) {
     onItemClick: handleChangeSelectedItem,
     listHeight: 0
   })), React__default.createElement(ExamResultDrawer, {
+    role: role,
     open: !!selectedItem,
     data: selectedItem,
     student: student,
     anchor: "right",
     width: "80dvw",
     onClose: handleCloseDrawer,
-    history: history
+    history: history,
+    onViewQA: onViewQA
   }));
 };
 
@@ -22418,11 +22432,13 @@ var ChapterDetail = function ChapterDetail(_ref) {
 
 var ChapterProblemSolvingResultsDialog = function ChapterProblemSolvingResultsDialog(_ref) {
   var t = _ref.t,
+    role = _ref.role,
     onClose = _ref.onClose,
     open = _ref.open,
     history = _ref.history,
     chapterId = _ref.chapterId,
-    studentId = _ref.studentId;
+    studentId = _ref.studentId,
+    onViewQA = _ref.onViewQA;
   return React__default.createElement(Dialog, {
     onClose: onClose,
     open: open,
@@ -22454,11 +22470,13 @@ var ChapterProblemSolvingResultsDialog = function ChapterProblemSolvingResultsDi
   }, React__default.createElement(Stack, {
     mx: "24px"
   }, React__default.createElement(ExamResultV2, {
+    role: role,
     history: history,
     searchParams: "",
     chapterId: chapterId,
     studentId: studentId,
-    isMyStoryStudent: false
+    isMyStoryStudent: false,
+    onViewQA: onViewQA
   })), React__default.createElement(DialogActions, {
     sx: {
       display: "flex",
@@ -22734,7 +22752,8 @@ var TextbookDrawer = function TextbookDrawer(_ref) {
     studentId = _ref.studentId,
     anchor = _ref.anchor,
     navigate = _ref.navigate,
-    onClose = _ref.onClose;
+    onClose = _ref.onClose,
+    onViewQA = _ref.onViewQA;
   var isStudent = role === Role.Student;
   var _useTextbookDrawer = useTextbookDrawer({
       isStudent: isStudent,
@@ -23008,12 +23027,14 @@ var TextbookDrawer = function TextbookDrawer(_ref) {
     });
   }))))), React__default.createElement(ChapterProblemSolvingResultsDialog, {
     t: t,
+    role: role,
     theme: theme,
     history: history,
     chapterId: chapterSelected === null || chapterSelected === void 0 ? void 0 : chapterSelected.id,
     studentId: studentId,
     open: isOpenChapterDialog,
-    onClose: handleCloseChapterDialog
+    onClose: handleCloseChapterDialog,
+    onViewQA: onViewQA
   }), React__default.createElement(StartPageDialog, {
     options: startPageOptions,
     t: t,
@@ -23362,6 +23383,7 @@ var TextbookInfoDrawer = function TextbookInfoDrawer(_ref) {
 var Textbook = function Textbook(_ref) {
   var _textbook$createdBy, _textbook$createdBy2;
   var t = _ref.t,
+    role = _ref.role,
     user = _ref.user,
     theme = _ref.theme,
     textbook = _ref.textbook,
@@ -23370,7 +23392,8 @@ var Textbook = function Textbook(_ref) {
     navigate = _ref.navigate,
     preparedType = _ref.preparedType,
     preparedFilterType = _ref.preparedFilterType,
-    getTextbookList = _ref.getTextbookList;
+    getTextbookList = _ref.getTextbookList,
+    onViewQA = _ref.onViewQA;
   var isTabletUp = useMediaQuery(theme.breakpoints.up("lg"));
   var _useDrawer = useDrawer(),
     isOpenDialog = _useDrawer.isOpenDialog,
@@ -23510,15 +23533,16 @@ var Textbook = function Textbook(_ref) {
   }, React__default.createElement(IoTrash, {
     size: "20px"
   }), t("delete_test"))), isOpenDialog && React__default.createElement(TextbookDrawer, {
-    role: isStudent ? Role.Student : Role.Teacher,
+    role: role,
     isOpen: isOpenDialog,
     onClose: handleCloseDialog,
     textbookId: textbook.id,
     navigate: navigate,
     width: !isTabletUp ? "100dvw" : "50dvw",
-    anchor: "right"
+    anchor: "right",
+    onViewQA: onViewQA
   }), openDetailDialog && React__default.createElement(TextbookInfoDrawer, {
-    role: isStudent ? Role.Student : Role.Teacher,
+    role: role,
     user: user,
     isSuperAdmin: isSuperAdmin,
     isOpen: openDetailDialog,
@@ -23537,9 +23561,11 @@ var Textbook = function Textbook(_ref) {
 };
 
 var PreparedItem = function PreparedItem(_ref) {
-  var preparedType = _ref.preparedType,
+  var role = _ref.role,
+    preparedType = _ref.preparedType,
     preparedFilterType = _ref.preparedFilterType,
-    navigate = _ref.navigate;
+    navigate = _ref.navigate,
+    onViewQA = _ref.onViewQA;
   var _useExpand = useExpand(),
     expanded = _useExpand.expanded,
     handleCloseExpand = _useExpand.handleCloseExpand,
@@ -24067,6 +24093,7 @@ var PreparedItem = function PreparedItem(_ref) {
   }, textbookList === null || textbookList === void 0 ? void 0 : textbookList.map(function (textbook) {
     return React__default.createElement(Textbook, {
       t: t,
+      role: role,
       user: user,
       theme: theme,
       textbook: textbook,
@@ -24075,7 +24102,8 @@ var PreparedItem = function PreparedItem(_ref) {
       navigate: navigate,
       getTextbookList: getTextbookList,
       preparedType: preparedType,
-      preparedFilterType: preparedFilterType
+      preparedFilterType: preparedFilterType,
+      onViewQA: onViewQA
     });
   }), React__default.createElement(Stack, {
     display: "flex",
@@ -24090,10 +24118,12 @@ var PreparedItem = function PreparedItem(_ref) {
 };
 
 var DrawerTextbookResultTab = function DrawerTextbookResultTab(_ref) {
-  var history = _ref.history,
+  var role = _ref.role,
+    history = _ref.history,
     studentId = _ref.studentId,
     selectedTab = _ref.selectedTab,
-    value = _ref.value;
+    value = _ref.value,
+    onViewQA = _ref.onViewQA;
   var _useVirtualList = useVirtualList(studentId, TEXTBOOK_DEFAULT_FILTER, getTextbookListApi),
     items = _useVirtualList.items,
     selectedItem = _useVirtualList.selectedItem,
@@ -24128,14 +24158,15 @@ var DrawerTextbookResultTab = function DrawerTextbookResultTab(_ref) {
     onItemClick: handleChangeSelectedItem,
     listHeight: 0
   })), React__default.createElement(TextbookDrawer, {
-    role: Role.Teacher,
+    role: role,
     navigate: history,
     isOpen: !!selectedItem,
     width: "80dvw",
     onClose: handleCloseDrawer,
     textbookId: selectedItem === null || selectedItem === void 0 ? void 0 : selectedItem.id,
     studentId: studentId,
-    anchor: "right"
+    anchor: "right",
+    onViewQA: onViewQA
   }));
 };
 
@@ -24767,7 +24798,9 @@ var StudentInfoDrawer = function StudentInfoDrawer(props) {
     studentId = props.studentId,
     anchor = props.anchor,
     width = props.width,
-    history = props.history;
+    history = props.history,
+    role = props.role,
+    onViewQA = props.onViewQA;
   var _useStudentInfoDrawer = useStudentInfoDrawer(props),
     loadedTabs = _useStudentInfoDrawer.loadedTabs,
     isLoading = _useStudentInfoDrawer.isLoading,
@@ -24811,21 +24844,26 @@ var StudentInfoDrawer = function StudentInfoDrawer(props) {
     data: studentInfo,
     isLoading: isLoading
   }), loadedTabs[DrawerTab.Exam] && React__default.createElement(DrawerExamResultTab, {
+    role: role,
     value: DrawerTab.Exam,
     selectedTab: selectedTab,
     studentId: studentId,
     student: studentInfo,
-    history: history
+    history: history,
+    onViewQA: onViewQA
   }), loadedTabs[DrawerTab.Textbook] && React__default.createElement(DrawerTextbookResultTab, {
+    role: role,
     value: DrawerTab.Textbook,
     selectedTab: selectedTab,
     studentId: studentId,
-    history: history
+    history: history,
+    onViewQA: onViewQA
   }))));
 };
 
 var StudentList = function StudentList(_ref) {
-  var history = _ref.history,
+  var role = _ref.role,
+    history = _ref.history,
     onAdd = _ref.onAdd,
     paging = _ref.paging,
     classList = _ref.classList,
@@ -24839,7 +24877,8 @@ var StudentList = function StudentList(_ref) {
     handleSort = _ref.handleSort,
     handleChangeSearchText = _ref.handleChangeSearchText,
     handleChangePage = _ref.handleChangePage,
-    handleRemoveStudentFromClass = _ref.handleRemoveStudentFromClass;
+    handleRemoveStudentFromClass = _ref.handleRemoveStudentFromClass,
+    onViewQA = _ref.onViewQA;
   var _useState = useState(),
     selectedViewStudent = _useState[0],
     setSelectedViewStudent = _useState[1];
@@ -24969,13 +25008,15 @@ var StudentList = function StudentList(_ref) {
     onConfirm: handleRemoveStudentFromClass,
     isDelete: true
   }), React__default.createElement(StudentInfoDrawer, {
+    role: role,
     open: !!selectedViewStudent,
     studentId: (selectedViewStudent === null || selectedViewStudent === void 0 ? void 0 : selectedViewStudent.studentId) || 0,
     onClose: handleCloseStudentInfo,
     anchor: "right",
     width: "80dvw",
     history: history,
-    inert: true
+    inert: true,
+    onViewQA: onViewQA
   }));
 };
 
@@ -26553,7 +26594,8 @@ var ClassDetail = function ClassDetail(_ref) {
   var id = _ref.id,
     history = _ref.history,
     classListUrl = _ref.classListUrl,
-    role = _ref.role;
+    role = _ref.role,
+    onViewQA = _ref.onViewQA;
   var classId = !id || Number.isNaN(+id) ? 0 : +id;
   var _useClassDetail = useClassDetail({
       history: history,
@@ -26668,10 +26710,13 @@ var ClassDetail = function ClassDetail(_ref) {
     value: selected,
     index: TabList$1[1].value
   }, !!classId && selected === TabList$1[1].value && React__default.createElement(StudentList, Object.assign({
+    role: role,
     disabled: isDisabled && !isTeacher,
     onAdd: handleOpenSelectDialog,
     history: history
-  }, studentListProps))), React__default.createElement(CustomTabPanel, {
+  }, studentListProps, {
+    onViewQA: onViewQA
+  }))), React__default.createElement(CustomTabPanel, {
     value: selected,
     index: TabList$1[2].value
   }, !!classId && selected === TabList$1[2].value && React__default.createElement(TeacherList, Object.assign({
@@ -28404,7 +28449,8 @@ var UserRow = function UserRow(_ref) {
 
 var UserList = function UserList(_ref) {
   var role = _ref.role,
-    history = _ref.history;
+    history = _ref.history,
+    onViewQA = _ref.onViewQA;
   var isSuperAdmin = useSelector(function (state) {
     var _state$common, _state$common$user;
     return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : (_state$common$user = _state$common.user) === null || _state$common$user === void 0 ? void 0 : _state$common$user.isSuperAdmin;
@@ -28610,12 +28656,14 @@ var UserList = function UserList(_ref) {
     onClose: handleCloseRecentUserActionDialog,
     recentUserActions: recentUserActions
   }), React__default.createElement(StudentInfoDrawer, {
+    role: role,
     open: !!selectedStudent,
     studentId: selectedStudent === null || selectedStudent === void 0 ? void 0 : selectedStudent.id,
     width: "80dvw",
     anchor: "right",
     onClose: handleCloseStudentInfo,
     history: history,
+    onViewQA: onViewQA,
     inert: true
   }), (isAdmin || isSuperAdmin) && React__default.createElement(DeleteUserCsvDialog, {
     open: isOpenDeleteUserCsv,