npm - touchstudy-core - Versions diffs - 0.1.144 → 0.1.146 - Mend

touchstudy-core 0.1.144 → 0.1.146

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

package/dist/components/Inputs/SearchInput.d.ts +3 -0
package/dist/containers/Login/hooks/useLoginPhoneNumber.d.ts +4 -0
package/dist/containers/Notes/configs/enums.d.ts +4 -0
package/dist/containers/Notes/configs/interfaces.d.ts +1 -0
package/dist/containers/Notes/configs/types.d.ts +2 -2
package/dist/containers/PreparedExam/configs/types.d.ts +6 -0
package/dist/containers/PreparedTextbook/components/QuestionGroupBlockBody.d.ts +1 -0
package/dist/containers/PreparedTextbook/configs/functions.d.ts +6 -1
package/dist/containers/PreparedTextbook/configs/types.d.ts +4 -0
package/dist/containers/PreparedTextbook/hooks/useTextbookManagement.d.ts +1 -1
package/dist/index.js +505 -180
package/dist/index.js.map +1 -1
package/dist/index.modern.js +513 -186
package/dist/index.modern.js.map +1 -1
package/dist/utils/enums/index.d.ts +3 -1
package/dist/utils/types/note.d.ts +3 -1
package/package.json +1 -1

package/dist/index.modern.js CHANGED Viewed

@@ -23,7 +23,7 @@ import { useSelector, useDispatch } from 'react-redux';
 import Select, { components } from 'react-select';
 import CreatableSelect from 'react-select/creatable';
 import axios from 'axios';
-import _$5 from 'lodash';
+import _$6 from 'lodash';
 import { useGoogleLogout, GoogleLogin } from '@leecheuk/react-google-login';
 import 'moment/locale/ko.js';
 import 'moment/locale/en-au.js';
@@ -1465,6 +1465,10 @@ var textbook_owner_email_is_required = "교재 소유자의 이메일은 필수
 var invalid_textbook_owner_email_address = "유효하지 않은 교재 소유자 이메일 주소입니다";
 var textbook_owner_academy_is_required = "교재 소유자의 학원은 필수입니다";
 var textbook_owner_course_is_required = "교재 소유자의 수업은 필수입니다";
+var start_order = "주문 번호 시작";
+var student_notice_notes = "학생 공지/노트";
+var note = "메모";
+var student_parents = "학생/학부모";
 var lang_ko = {
 	problem_solving: problem_solving,
 	my_story: my_story,
@@ -2563,7 +2567,11 @@ var lang_ko = {
 	textbook_owner_email_is_required: textbook_owner_email_is_required,
 	invalid_textbook_owner_email_address: invalid_textbook_owner_email_address,
 	textbook_owner_academy_is_required: textbook_owner_academy_is_required,
-	textbook_owner_course_is_required: textbook_owner_course_is_required
+	textbook_owner_course_is_required: textbook_owner_course_is_required,
+	start_order: start_order,
+	student_notice_notes: student_notice_notes,
+	note: note,
+	student_parents: student_parents
 };
 var problem_solving$1 = "Problem Solving";
@@ -3685,6 +3693,10 @@ var textbook_owner_email_is_required$1 = "Textbook owner email is required";
 var invalid_textbook_owner_email_address$1 = "Invalid textbook owner email address";
 var textbook_owner_academy_is_required$1 = "Textbook owner academy is required";
 var textbook_owner_course_is_required$1 = "Textbook owner class is required";
+var start_order$1 = "Start order number";
+var student_notice_notes$1 = "Student notice/notes";
+var note$1 = "Note";
+var student_parents$1 = "Student/Parents";
 var lang_en = {
 	problem_solving: problem_solving$1,
 	my_story: my_story$1,
@@ -4785,7 +4797,11 @@ var lang_en = {
 	textbook_owner_email_is_required: textbook_owner_email_is_required$1,
 	invalid_textbook_owner_email_address: invalid_textbook_owner_email_address$1,
 	textbook_owner_academy_is_required: textbook_owner_academy_is_required$1,
-	textbook_owner_course_is_required: textbook_owner_course_is_required$1
+	textbook_owner_course_is_required: textbook_owner_course_is_required$1,
+	start_order: start_order$1,
+	student_notice_notes: student_notice_notes$1,
+	note: note$1,
+	student_parents: student_parents$1
 };
 i18n.use(initReactI18next).init({
@@ -6164,6 +6180,18 @@ var UserSortColumn;
   UserSortColumn["Grade"] = "Grade";
 })(UserSortColumn || (UserSortColumn = {}));
+var NoteSortColumn;
+(function (NoteSortColumn) {
+  NoteSortColumn["Content"] = "Content";
+  NoteSortColumn["CreatedAt"] = "CreatedAt";
+  NoteSortColumn["Question"] = "Question";
+})(NoteSortColumn || (NoteSortColumn = {}));
+var NoteType;
+(function (NoteType) {
+  NoteType[NoteType["Default"] = 0] = "Default";
+  NoteType[NoteType["StudentReadable"] = 1] = "StudentReadable";
+})(NoteType || (NoteType = {}));
 var SchoolType;
 (function (SchoolType) {
   SchoolType[SchoolType["Default"] = 0] = "Default";
@@ -6171,6 +6199,31 @@ var SchoolType;
   SchoolType[SchoolType["Middle"] = 2] = "Middle";
   SchoolType[SchoolType["High"] = 3] = "High";
 })(SchoolType || (SchoolType = {}));
+var HighSchoolGrade;
+(function (HighSchoolGrade) {
+  HighSchoolGrade[HighSchoolGrade["Default"] = 0] = "Default";
+  HighSchoolGrade[HighSchoolGrade["AdvancedMathematics1"] = 1] = "AdvancedMathematics1";
+  HighSchoolGrade[HighSchoolGrade["AdvancedMathematics2"] = 2] = "AdvancedMathematics2";
+  HighSchoolGrade[HighSchoolGrade["Algebra"] = 3] = "Algebra";
+  HighSchoolGrade[HighSchoolGrade["Calculus1"] = 4] = "Calculus1";
+  HighSchoolGrade[HighSchoolGrade["Calculus2"] = 5] = "Calculus2";
+  HighSchoolGrade[HighSchoolGrade["ProbabilityAndStatistics"] = 6] = "ProbabilityAndStatistics";
+  HighSchoolGrade[HighSchoolGrade["Geometry"] = 7] = "Geometry";
+})(HighSchoolGrade || (HighSchoolGrade = {}));
+var TextbookEditorType;
+(function (TextbookEditorType) {
+  TextbookEditorType[TextbookEditorType["Default"] = 0] = "Default";
+  TextbookEditorType[TextbookEditorType["Korea"] = 1] = "Korea";
+  TextbookEditorType[TextbookEditorType["Math"] = 2] = "Math";
+})(TextbookEditorType || (TextbookEditorType = {}));
+var SchoolType$1;
+(function (SchoolType) {
+  SchoolType[SchoolType["Default"] = 0] = "Default";
+  SchoolType[SchoolType["Elementary"] = 1] = "Elementary";
+  SchoolType[SchoolType["Middle"] = 2] = "Middle";
+  SchoolType[SchoolType["High"] = 3] = "High";
+})(SchoolType$1 || (SchoolType$1 = {}));
 var canAccess = function canAccess(userRoles, componentRoles) {
   if (!Array.isArray(userRoles)) {
@@ -6344,7 +6397,7 @@ var getLocalDayOfWeek = function getLocalDayOfWeek(utcDateTime, dayOfWeek) {
   return moment.utc(utcDateTime).add(diff, "days").local().weekday();
 };
 var getUtcDayOfWeek = function getUtcDayOfWeek(localDateTime, dayOfWeek) {
-  var currentDayOfWeek = _$5.cloneDeep(localDateTime).local().weekday();
+  var currentDayOfWeek = _$6.cloneDeep(localDateTime).local().weekday();
   var diff = dayOfWeek - currentDayOfWeek;
   if (diff < 0) diff += 7;
   return localDateTime.add(diff, "days").utc().weekday();
@@ -6841,7 +6894,7 @@ var useList = function useList(fetchData, defaultQuery) {
     var _paging$page, _paging$limit;
     return (((_paging$page = paging.page) != null ? _paging$page : 0) - 1) * ((_paging$limit = paging.limit) != null ? _paging$limit : 0) + index + 1;
   };
-  var debounceSearch = _$5.debounce(function () {
+  var debounceSearch = _$6.debounce(function () {
     var _textSearchRef$curren;
     setFilter(_extends({}, filter, {
       currentPage: 1,
@@ -7779,11 +7832,13 @@ var SearchInput = function SearchInput(_ref) {
     placeholder = _ref$placeholder === void 0 ? "Search for..." : _ref$placeholder,
     onChange = _ref.onChange,
     _ref$fit = _ref.fit,
-    fit = _ref$fit === void 0 ? true : _ref$fit;
+    fit = _ref$fit === void 0 ? true : _ref$fit,
+    sx = _ref.sx,
+    searchSx = _ref.searchSx;
   return React__default.createElement(Paper, {
     component: "div",
-    className: "bg-light w-100 " + (fit && "h-100"),
-    sx: {
+    className: (sx ? "" : "bg-light") + " w-100 " + (fit && "h-100"),
+    sx: _extends({
       p: "2px 4px",
       display: "flex",
       alignItems: "center",
@@ -7795,11 +7850,11 @@ var SearchInput = function SearchInput(_ref) {
           return theme.palette.primary.main;
         }
       }
-    }
+    }, sx)
   }, React__default.createElement(Box, {
-    sx: {
+    sx: _extends({
       p: "10px"
-    },
+    }, searchSx),
     "aria-label": "search"
   }, React__default.createElement(IoSearch, {
     size: 24,
@@ -10700,6 +10755,8 @@ var useLoginPhoneNumber = function useLoginPhoneNumber(props) {
   var _useState5 = useState(false),
     refreshReCaptcha = _useState5[0],
     setRefreshReCaptcha = _useState5[1];
+  var passwordRef = useRef(null);
+  var submitBtnRef = useRef(null);
   var dispatch = useDispatch();
   var handleClickShowPassword = function handleClickShowPassword() {
     setShowPassword(!showPassword);
@@ -10757,6 +10814,18 @@ var useLoginPhoneNumber = function useLoginPhoneNumber(props) {
       return Promise.reject(e);
     }
   };
+  var handlePhoneKeyDown = function handlePhoneKeyDown(e) {
+    if (e.key === 'Enter') {
+      e.preventDefault();
+      if (passwordRef.current) passwordRef.current.focus();
+    }
+  };
+  var handlePasswordKeyDown = function handlePasswordKeyDown(e) {
+    if (e.key === 'Enter' && tokenReCaptcha && password.trim() && phoneNumber.trim()) {
+      e.preventDefault();
+      if (submitBtnRef.current) submitBtnRef.current.click();
+    }
+  };
   return {
     t: t,
     showPassword: showPassword,
@@ -10764,6 +10833,10 @@ var useLoginPhoneNumber = function useLoginPhoneNumber(props) {
     tokenReCaptcha: tokenReCaptcha,
     phoneNumber: phoneNumber,
     password: password,
+    passwordRef: passwordRef,
+    submitBtnRef: submitBtnRef,
+    handlePasswordKeyDown: handlePasswordKeyDown,
+    handlePhoneKeyDown: handlePhoneKeyDown,
     handleChangePassword: handleChangePassword,
     handlePhoneNumberChange: handlePhoneNumberChange,
     handleLoginPhoneNumber: handleLoginPhoneNumber,
@@ -10780,6 +10853,10 @@ var LoginPhone = function LoginPhone(props) {
     tokenReCaptcha = _useLoginPhoneNumber.tokenReCaptcha,
     phoneNumber = _useLoginPhoneNumber.phoneNumber,
     password = _useLoginPhoneNumber.password,
+    passwordRef = _useLoginPhoneNumber.passwordRef,
+    submitBtnRef = _useLoginPhoneNumber.submitBtnRef,
+    handlePasswordKeyDown = _useLoginPhoneNumber.handlePasswordKeyDown,
+    handlePhoneKeyDown = _useLoginPhoneNumber.handlePhoneKeyDown,
     handleChangePassword = _useLoginPhoneNumber.handleChangePassword,
     handlePhoneNumberChange = _useLoginPhoneNumber.handlePhoneNumberChange,
     handleLoginPhoneNumber = _useLoginPhoneNumber.handleLoginPhoneNumber,
@@ -10813,8 +10890,10 @@ var LoginPhone = function LoginPhone(props) {
     id: "phone_new_xs",
     name: "phone_new_xs",
     value: phoneNumber,
-    onChange: handlePhoneNumberChange
+    onChange: handlePhoneNumberChange,
+    onKeyDown: handlePhoneKeyDown
   }), React__default.createElement(TextField, {
+    inputRef: passwordRef,
     label: t("password"),
     type: showPassword ? "text" : "password",
     fullWidth: true,
@@ -10841,12 +10920,14 @@ var LoginPhone = function LoginPhone(props) {
     size: "small",
     value: password,
     onChange: handleChangePassword,
+    onKeyDown: handlePasswordKeyDown,
     InputLabelProps: {
       style: {
         color: "#349056"
       }
     }
   }), React__default.createElement(Button, {
+    ref: submitBtnRef,
     variant: "outlined",
     sx: {
       color: "#349056"
@@ -11230,13 +11311,6 @@ var useLogin$1 = function useLogin(_ref) {
                 var isAcademy = !!(user !== null && user !== void 0 && user.academyDomain) || !!(user !== null && user !== void 0 && user.isLearningSpace);
                 var needToRegister = isFirstLogin && isAcademy;
                 var redirectUrl = needToRegister ? registerUrl : isAcademy ? homeAcademyUrl : homeUrl;
-                console.log({
-                  isFirstLogin: isFirstLogin,
-                  isAcademy: isAcademy,
-                  token: token,
-                  user: user,
-                  redirectUrl: redirectUrl
-                });
                 handleSwitchOTP(false);
                 redirectLoginUser(_extends({}, user, {
                   isNotEnoughStatements: isFirstLogin
@@ -12635,7 +12709,7 @@ var ClassForm = function ClassForm(_ref) {
   };
   var handleDeleteWeeklyDays = function handleDeleteWeeklyDays(currentValue) {
     if (formikProp.values.courseWeeklyDays.length <= 1) return;
-    var courseWeeklyDays = _$5.cloneDeep(formikProp.values.courseWeeklyDays);
+    var courseWeeklyDays = _$6.cloneDeep(formikProp.values.courseWeeklyDays);
     var newValues = courseWeeklyDays.filter(function (i) {
       var _i$startTime, _currentValue$startTi, _i$endTime, _currentValue$endTime;
       return i.dayOfWeek !== currentValue.dayOfWeek || ((_i$startTime = i.startTime) === null || _i$startTime === void 0 ? void 0 : _i$startTime.format("HH:mm:ss")) !== ((_currentValue$startTi = currentValue.startTime) === null || _currentValue$startTi === void 0 ? void 0 : _currentValue$startTi.format("HH:mm:ss")) || ((_i$endTime = i.endTime) === null || _i$endTime === void 0 ? void 0 : _i$endTime.format("HH:mm:ss")) !== ((_currentValue$endTime = currentValue.endTime) === null || _currentValue$endTime === void 0 ? void 0 : _currentValue$endTime.format("HH:mm:ss"));
@@ -12671,7 +12745,7 @@ var ClassForm = function ClassForm(_ref) {
   var handleChangeWeeklyDayTime = function handleChangeWeeklyDayTime(key, newValue, currentValue) {
     var _extends2;
     var time = newValue === null || newValue === void 0 ? void 0 : newValue.local();
-    var courseWeeklyDays = _$5.cloneDeep(formikProp.values.courseWeeklyDays);
+    var courseWeeklyDays = _$6.cloneDeep(formikProp.values.courseWeeklyDays);
     var currentIndex = courseWeeklyDays.findIndex(function (i) {
       var _i$startTime2, _currentValue$startTi2, _i$endTime2, _currentValue$endTime2;
       return i.dayOfWeek === currentValue.dayOfWeek && ((_i$startTime2 = i.startTime) === null || _i$startTime2 === void 0 ? void 0 : _i$startTime2.format("HH:mm:ss")) === ((_currentValue$startTi2 = currentValue.startTime) === null || _currentValue$startTi2 === void 0 ? void 0 : _currentValue$startTi2.format("HH:mm:ss")) && ((_i$endTime2 = i.endTime) === null || _i$endTime2 === void 0 ? void 0 : _i$endTime2.format("HH:mm:ss")) === ((_currentValue$endTime2 = currentValue.endTime) === null || _currentValue$endTime2 === void 0 ? void 0 : _currentValue$endTime2.format("HH:mm:ss"));
@@ -12706,11 +12780,11 @@ var ClassForm = function ClassForm(_ref) {
   }, [JSON.stringify(data)]);
   var minDate = useMemo(function () {
     if (!formikProp.values.startDate) return undefined;
-    return _$5.cloneDeep(formikProp.values.startDate).add(1, "days");
+    return _$6.cloneDeep(formikProp.values.startDate).add(1, "days");
   }, [formikProp.values.startDate]);
   var maxDate = useMemo(function () {
     if (!formikProp.values.endDate) return undefined;
-    return _$5.cloneDeep(formikProp.values.endDate).add(1, "days");
+    return _$6.cloneDeep(formikProp.values.endDate).add(1, "days");
   }, [formikProp.values.endDate]);
   var WeeklyDayErrors = formikProp.touched.courseWeeklyDays && formikProp.errors.courseWeeklyDays && React__default.createElement("div", {
     className: "mt-1"
@@ -12727,7 +12801,7 @@ var ClassForm = function ClassForm(_ref) {
     });
   }, [JSON.stringify(formikProp.values.courseWeeklyDays)]);
   var courseWeeklyDays = useMemo(function () {
-    return _$5.sortBy(formikProp.values.courseWeeklyDays, ["dayOfWeek"]);
+    return _$6.sortBy(formikProp.values.courseWeeklyDays, ["dayOfWeek"]);
   }, [JSON.stringify(formikProp.values.courseWeeklyDays)]);
   return React__default.createElement("div", {
     className: "d-flex flex-column"
@@ -12878,7 +12952,7 @@ var ClassForm = function ClassForm(_ref) {
       value: v.startTime,
       format: "HH:mm",
       open: open === index + "-startTime",
-      maxTime: v.endTime ? _$5.cloneDeep(v.endTime).add(-1, "minutes") : undefined,
+      maxTime: v.endTime ? _$6.cloneDeep(v.endTime).add(-1, "minutes") : undefined,
       onAccept: function onAccept(newValue) {
         return handleChangeWeeklyDayTime("startTime", newValue, v);
       },
@@ -12908,7 +12982,7 @@ var ClassForm = function ClassForm(_ref) {
       components: ["TimePicker"]
     }, React__default.createElement(TimePicker, {
       value: v.endTime,
-      minTime: v.startTime ? (_$cloneDeep = _$5.cloneDeep(v.startTime)) === null || _$cloneDeep === void 0 ? void 0 : _$cloneDeep.add(1, "minutes") : undefined,
+      minTime: v.startTime ? (_$cloneDeep = _$6.cloneDeep(v.startTime)) === null || _$cloneDeep === void 0 ? void 0 : _$cloneDeep.add(1, "minutes") : undefined,
       format: "HH:mm",
       open: open === index + "-endTime",
       onAccept: function onAccept(newValue) {
@@ -13533,7 +13607,7 @@ var useStudentClassList = function useStudentClassList(courseId) {
       currentPage: 1
     }));
   };
-  var debounceSearch = _$5.debounce(function () {
+  var debounceSearch = _$6.debounce(function () {
     setFilter(_extends({}, filter, {
       currentPage: 1
     }));
@@ -13669,7 +13743,7 @@ var useTeacherClassList = function useTeacherClassList(courseId) {
       currentPage: 1
     }));
   };
-  var debounceSearch = _$5.debounce(function () {
+  var debounceSearch = _$6.debounce(function () {
     setFilter(_extends({}, filter, {
       currentPage: 1
     }));
@@ -13977,7 +14051,7 @@ var useClassDetail = function useClassDetail(_ref) {
     });
   }, [JSON.stringify(course)]);
   var convertToRequestBody = function convertToRequestBody(request) {
-    var localStartDate = _$5.cloneDeep(request.startDate);
+    var localStartDate = _$6.cloneDeep(request.startDate);
     return _extends({}, request, {
       startDate: request.startDate.utc().format(DATE_TIME_FORMAT),
       endDate: request.endDate.utc().format(DATE_TIME_FORMAT),
@@ -14226,13 +14300,13 @@ var useClassDetail = function useClassDetail(_ref) {
     });
     if (event.target.checked) {
       setSelected(function (prev) {
-        return _$5.uniq([].concat(prev, newSelected));
+        return _$6.uniq([].concat(prev, newSelected));
       });
       return;
     }
-    setSelected(_$5.difference(selected, newSelected));
+    setSelected(_$6.difference(selected, newSelected));
   };
-  var debounceSearch = _$5.debounce(function () {
+  var debounceSearch = _$6.debounce(function () {
     setFilter(_extends({}, filter, {
       currentPage: 1
     }));
@@ -14250,7 +14324,7 @@ var useClassDetail = function useClassDetail(_ref) {
     }) : userList.map(function (n) {
       return n.teacherId;
     });
-    var checkLength = _$5.intersection(selected, newSelected).length;
+    var checkLength = _$6.intersection(selected, newSelected).length;
     return checkLength === userLength;
   };
   var handleClear = function handleClear() {
@@ -14285,7 +14359,7 @@ var useClassDetail = function useClassDetail(_ref) {
     }));
     setSelected([]);
   };
-  var debounceSort = _$5.debounce(handleSort, 300);
+  var debounceSort = _$6.debounce(handleSort, 300);
   var handleChangePage = function handleChangePage(_, page) {
     setFilter(_extends({}, filter, {
       currentPage: page
@@ -14363,8 +14437,8 @@ var LessonFormBody = function LessonFormBody(_ref) {
   useEffect(function () {
     if (open && data) formikProp.setValues(data);else formikProp.setValues(DEFAULT_LESSON_REQUEST);
   }, [open, JSON.stringify(data)]);
-  var maxTime = formikProp.values.endTime ? _$5.cloneDeep(formikProp.values.endTime).add(-1, "minutes") : undefined;
-  var minTime = formikProp.values.startTime ? _$5.cloneDeep(formikProp.values.startTime).add(1, "minutes") : undefined;
+  var maxTime = formikProp.values.endTime ? _$6.cloneDeep(formikProp.values.endTime).add(-1, "minutes") : undefined;
+  var minTime = formikProp.values.startTime ? _$6.cloneDeep(formikProp.values.startTime).add(1, "minutes") : undefined;
   return React__default.createElement(Fragment$1, null, React__default.createElement(DialogContent, {
     sx: {
       overflowY: "unset"
@@ -14944,7 +15018,7 @@ var useClassList = function useClassList(history, classCreateUrl, classUpdateUrl
       currentPage: 1
     }));
   };
-  var debounceSearch = _$5.debounce(function () {
+  var debounceSearch = _$6.debounce(function () {
     setClassFilter(_extends({}, classFilter, {
       currentPage: 1
     }));
@@ -17387,13 +17461,6 @@ var PrintState$1;
   PrintState[PrintState["Printed"] = 3] = "Printed";
 })(PrintState$1 || (PrintState$1 = {}));
-var NoteSortColumn;
-(function (NoteSortColumn) {
-  NoteSortColumn["Content"] = "Content";
-  NoteSortColumn["CreatedAt"] = "CreatedAt";
-  NoteSortColumn["Question"] = "Question";
-})(NoteSortColumn || (NoteSortColumn = {}));
 var DEFAULT_NOTE_FILTER = {
   sortColumnDirection: OrderType.DESC,
   sortColumnName: NoteSortColumn.CreatedAt,
@@ -19629,6 +19696,7 @@ var ClassNoteDialog = function ClassNoteDialog(_ref) {
   var open = _ref.open,
     studentName = _ref.studentName,
     selectedNote = _ref.selectedNote,
+    tip = _ref.tip,
     onClose = _ref.onClose,
     onSaveNote = _ref.onSaveNote;
   var _useTranslation = useTranslation(),
@@ -19672,7 +19740,7 @@ var ClassNoteDialog = function ClassNoteDialog(_ref) {
     fontSize: "16px",
     lineHeight: "19.09px",
     color: "#202B37"
-  }, t(selectedNote ? "edit_student_note" : "student_note_taking"))), React__default.createElement(IconButton$1, {
+  }, t(selectedNote ? "edit_student_note" : "student_note_taking"), tip)), React__default.createElement(IconButton$1, {
     "aria-label": "close",
     sx: {
       position: "absolute",
@@ -20044,7 +20112,7 @@ var useNotes = function useNotes(setFilter, filter) {
           var items = (data === null || data === void 0 ? void 0 : data.items) || [];
           var newNotes = items;
           if (filter !== null && filter !== void 0 && filter.currentPage && (filter === null || filter === void 0 ? void 0 : filter.currentPage) > 1) {
-            newNotes = [].concat(_$5.uniqBy([].concat(notes, items), "id"));
+            newNotes = [].concat(_$6.uniqBy([].concat(notes, items), "id"));
           }
           setNotes(newNotes);
         });
@@ -20067,7 +20135,7 @@ var useNotes = function useNotes(setFilter, filter) {
     });
   }, [filter === null || filter === void 0 ? void 0 : filter.currentPage, totalPages]);
   var handleNoteAdded = function handleNoteAdded(note) {
-    var newNotes = [].concat(_$5.uniqBy([note].concat(notes), "id"));
+    var newNotes = [].concat(_$6.uniqBy([note].concat(notes), "id"));
     setNotes(newNotes);
   };
   var handleNoteUpdated = function handleNoteUpdated(note) {
@@ -20098,6 +20166,7 @@ var useNotes = function useNotes(setFilter, filter) {
 };
 var NoteItem = function NoteItem(_ref) {
+  var _user$roles;
   var data = _ref.data,
     openTooltip = _ref.openTooltip,
     actions = _ref.actions,
@@ -20108,6 +20177,11 @@ var NoteItem = function NoteItem(_ref) {
     onLoad = _ref.onLoad;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
+  var user = 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.user;
+  });
+  var isAdmin = !!user && (user === null || user === void 0 ? void 0 : (_user$roles = user.roles) === null || _user$roles === void 0 ? void 0 : _user$roles.includes(Role.Admin));
   var handleMoreClick = function handleMoreClick(e) {
     e.preventDefault();
     e.stopPropagation();
@@ -20130,7 +20204,7 @@ var NoteItem = function NoteItem(_ref) {
     gap: 1
   }, React__default.createElement(Typography, Object.assign({}, NoteItemStyles.text.left), data.examSessionId ? t("article") + " " + data.articleNumber : "" + data.fullName), React__default.createElement(Typography, Object.assign({}, NoteItemStyles.text.middle), data.examSessionId ? "" + t("number_question", {
     number: (data.questionOrder || 0) + 1
-  }) : "" + utcToLocalTime(data.createdAt, t("date_format") + " HH:mm")), data.examSessionId && React__default.createElement(Typography, Object.assign({}, NoteItemStyles.text.right), data.categoryName)), React__default.createElement(Typography, Object.assign({}, NoteItemStyles.contentText), data.content)), React__default.createElement(Box, null, React__default.createElement(ClickAwayListener, {
+  }) : "" + utcToLocalTime(data.createdAt, t("date_format") + " HH:mm")), data.examSessionId && React__default.createElement(Typography, Object.assign({}, NoteItemStyles.text.right), data.categoryName)), React__default.createElement(Typography, Object.assign({}, NoteItemStyles.contentText), data.content)), React__default.createElement(Box, null, (isAdmin || data.isOwned) && React__default.createElement(ClickAwayListener, {
     onClickAway: onClose
   }, React__default.createElement(Box, null, React__default.createElement(CustomTooltip, {
     onClose: onClose,
@@ -20528,7 +20602,7 @@ var useExamResultData = function useExamResultData(props) {
           topAnswerOrder: i.topAnswerOrder == null ? 0 : i.topAnswerOrder
         });
       });
-      var sortedMySeriesQuestionData = _$5.sortBy(questionsData.filter(function (i) {
+      var sortedMySeriesQuestionData = _$6.sortBy(questionsData.filter(function (i) {
         return i.answerOrder !== 0;
       }), ["answerOrder", "questionOrder"]);
       var mySeriesData = [null].concat(sortedMySeriesQuestionData.map(function (item) {
@@ -20538,7 +20612,7 @@ var useExamResultData = function useExamResultData(props) {
       }).map(function () {
         return null;
       }), [null]);
-      var sortedTopSeriesQuestionData = _$5.sortBy(questionsData.filter(function (i) {
+      var sortedTopSeriesQuestionData = _$6.sortBy(questionsData.filter(function (i) {
         return i.topAnswerOrder !== 0;
       }), ["topAnswerOrder", "questionOrder"]);
       var topSeriesData = [null].concat(sortedTopSeriesQuestionData.map(function (item) {
@@ -22794,7 +22868,7 @@ var useUserList = function useUserList(role) {
       currentPage: 1
     }));
   };
-  var debounceSort = _$5.debounce(handleSort, 300);
+  var debounceSort = _$6.debounce(handleSort, 300);
   var getUserById = function getUserById(id) {
     try {
       var _temp8 = function _temp8() {
@@ -22952,7 +23026,7 @@ var useUserList = function useUserList(role) {
       return Promise.reject(e);
     }
   };
-  var debounceSearch = _$5.debounce(function () {
+  var debounceSearch = _$6.debounce(function () {
     setFilter(_extends({}, filter, {
       currentPage: 1
     }));
@@ -24208,8 +24282,8 @@ var useExamDetailView = function useExamDetailView(props) {
   var handleAddArticle = function handleAddArticle() {
     var _$maxBy, _$maxBy2;
     if (!exam) return;
-    var maxArticle = ((_$maxBy = _$5.maxBy(exam.questions, "article")) === null || _$maxBy === void 0 ? void 0 : _$maxBy.article) || 0;
-    var maxOrder = ((_$maxBy2 = _$5.maxBy(exam.questions, "questionOrder")) === null || _$maxBy2 === void 0 ? void 0 : _$maxBy2.questionOrder) || 0;
+    var maxArticle = ((_$maxBy = _$6.maxBy(exam.questions, "article")) === null || _$maxBy === void 0 ? void 0 : _$maxBy.article) || 0;
+    var maxOrder = ((_$maxBy2 = _$6.maxBy(exam.questions, "questionOrder")) === null || _$maxBy2 === void 0 ? void 0 : _$maxBy2.questionOrder) || 0;
     onChangeExam(_extends({}, exam, {
       questions: [].concat(exam.questions, [{
         questionAnswerType: QuestionAnswerType.SingleChoice,
@@ -24257,7 +24331,7 @@ var useExamDetailView = function useExamDetailView(props) {
   var examGroupByArticle = useMemo(function () {
     if (!exam) return [];
     var articles = [];
-    var groupedArticle = _$5.groupBy(exam.questions, "article");
+    var groupedArticle = _$6.groupBy(exam.questions, "article");
     for (var key in groupedArticle) {
       if (Object.prototype.hasOwnProperty.call(groupedArticle, key)) {
         var _questions$find, _$maxBy3;
@@ -24267,13 +24341,13 @@ var useExamDetailView = function useExamDetailView(props) {
           categoryId: (_questions$find = questions.find(function (i) {
             return !!i.categoryId;
           })) === null || _questions$find === void 0 ? void 0 : _questions$find.categoryId,
-          answerCount: ((_$maxBy3 = _$5.maxBy(questions, "numberOfAnswers")) === null || _$maxBy3 === void 0 ? void 0 : _$maxBy3.numberOfAnswers) || DEFAULT_ANSWER_COUNT,
+          answerCount: ((_$maxBy3 = _$6.maxBy(questions, "numberOfAnswers")) === null || _$maxBy3 === void 0 ? void 0 : _$maxBy3.numberOfAnswers) || DEFAULT_ANSWER_COUNT,
           questionCount: questions.length,
           questions: questions
         });
       }
     }
-    return _$5.sortBy(articles, "article");
+    return _$6.sortBy(articles, "article");
   }, [JSON.stringify(exam)]);
   var durationOptions = useMemo(function () {
     var options = DURATION_OPTIONS.map(function (i) {
@@ -26694,11 +26768,11 @@ var useTextbookShare = function useTextbookShare(props) {
     });
     if (event.target.checked) {
       setSelectedShare(function (prev) {
-        return _$5.uniq([].concat(prev, newSelected));
+        return _$6.uniq([].concat(prev, newSelected));
       });
       return;
     }
-    setSelectedShare(_$5.difference(selectedShare, newSelected));
+    setSelectedShare(_$6.difference(selectedShare, newSelected));
   };
   var isCheckAllShare = function isCheckAllShare(userLength) {
     var newSelected = isUpdate ? shared.map(function (n) {
@@ -26706,7 +26780,7 @@ var useTextbookShare = function useTextbookShare(props) {
     }) : notShared.map(function (n) {
       return n.id;
     });
-    var checkLength = _$5.intersection(selectedShare, newSelected).length;
+    var checkLength = _$6.intersection(selectedShare, newSelected).length;
     return checkLength === userLength;
   };
   var handleClickCheckboxShare = function handleClickCheckboxShare(id) {
@@ -26965,7 +27039,7 @@ var TextbookList = function TextbookList(props) {
     handleUpdateSharedTextbook = _useTextbookShare.handleUpdateSharedTextbook,
     currentModel = _useTextbookShare.currentModel;
   var textbookHeaders = useMemo(function () {
-    var headers = _$5.clone(TEXTBOOK_HEADERS);
+    var headers = _$6.clone(TEXTBOOK_HEADERS);
     if (isTeacher && isTeacherSite) headers.splice(5, 0, {
       title: "teacher_personal_textbook"
     });
@@ -27560,7 +27634,7 @@ var useNotificationList = function useNotificationList(_ref) {
       currentPage: 1
     }));
   };
-  var debounceSearch = _$5.debounce(function () {
+  var debounceSearch = _$6.debounce(function () {
     setNotificationFilter(_extends({}, notificationFilter, {
       currentPage: 1
     }));
@@ -27986,31 +28060,6 @@ var useTextbookManagement = function useTextbookManagement(_ref) {
   };
 };
-var SchoolType$1;
-(function (SchoolType) {
-  SchoolType[SchoolType["Default"] = 0] = "Default";
-  SchoolType[SchoolType["Elementary"] = 1] = "Elementary";
-  SchoolType[SchoolType["Middle"] = 2] = "Middle";
-  SchoolType[SchoolType["High"] = 3] = "High";
-})(SchoolType$1 || (SchoolType$1 = {}));
-var HighSchoolGrade;
-(function (HighSchoolGrade) {
-  HighSchoolGrade[HighSchoolGrade["Default"] = 0] = "Default";
-  HighSchoolGrade[HighSchoolGrade["AdvancedMathematics1"] = 1] = "AdvancedMathematics1";
-  HighSchoolGrade[HighSchoolGrade["AdvancedMathematics2"] = 2] = "AdvancedMathematics2";
-  HighSchoolGrade[HighSchoolGrade["Algebra"] = 3] = "Algebra";
-  HighSchoolGrade[HighSchoolGrade["Calculus1"] = 4] = "Calculus1";
-  HighSchoolGrade[HighSchoolGrade["Calculus2"] = 5] = "Calculus2";
-  HighSchoolGrade[HighSchoolGrade["ProbabilityAndStatistics"] = 6] = "ProbabilityAndStatistics";
-  HighSchoolGrade[HighSchoolGrade["Geometry"] = 7] = "Geometry";
-})(HighSchoolGrade || (HighSchoolGrade = {}));
-var TextbookEditorType;
-(function (TextbookEditorType) {
-  TextbookEditorType[TextbookEditorType["Default"] = 0] = "Default";
-  TextbookEditorType[TextbookEditorType["Korea"] = 1] = "Korea";
-  TextbookEditorType[TextbookEditorType["Math"] = 2] = "Math";
-})(TextbookEditorType || (TextbookEditorType = {}));
 var TextbookSortBy$1;
 (function (TextbookSortBy) {
   TextbookSortBy["Name"] = "Name";
@@ -28041,16 +28090,16 @@ var TextbookState;
 var SCHOOL_OPTIONS = [{
   label: "all",
-  value: SchoolType$1.Default
+  value: SchoolType.Default
 }, {
   label: "elementary_school",
-  value: SchoolType$1.Elementary
+  value: SchoolType.Elementary
 }, {
   label: "middle_school",
-  value: SchoolType$1.Middle
+  value: SchoolType.Middle
 }, {
   label: "high_school",
-  value: SchoolType$1.High
+  value: SchoolType.High
 }];
 var SEMESTER_OPTIONS = Array.from({
   length: 3
@@ -28163,6 +28212,12 @@ var preparedTextbookSchema = function preparedTextbookSchema(t) {
       }),
       name: string().required(t("name_required")),
       questionGroups: array().of(object().shape({
+        pageFrom: number().notRequired().integer().notRequired().min(1, t("min_is_1")),
+        pageTo: number().notRequired().integer().typeError(t("must_be_number")).test("is-greater", t("page_to_must_be_greater_than_or_equal_to_page_from"), function (value) {
+          var _this$parent2 = this === null || this === void 0 ? void 0 : this.parent,
+            pageFrom = _this$parent2.pageFrom;
+          return !value || !pageFrom || value >= pageFrom;
+        }),
         articles: array().of(object().shape({
           categories: array().of(number()).min(1, t("category_required")),
           title: string().notRequired(),
@@ -28184,12 +28239,18 @@ var preparedTextbookSchema = function preparedTextbookSchema(t) {
       subChapters: array().of(object().shape({
         pageFrom: number().required(t("page_from_required")).integer().typeError(t("must_be_number")).min(1, t("min_is_1")),
         pageTo: number().required(t("page_to_required")).integer().typeError(t("must_be_number")).test("is-greater", t("page_to_must_be_greater_than_or_equal_to_page_from"), function (value) {
-          var _this$parent2 = this === null || this === void 0 ? void 0 : this.parent,
-            pageFrom = _this$parent2.pageFrom;
+          var _this$parent3 = this === null || this === void 0 ? void 0 : this.parent,
+            pageFrom = _this$parent3.pageFrom;
           return value >= pageFrom;
         }),
         name: string().required(t("name_required")),
         questionGroups: array().of(object().shape({
+          pageFrom: number().notRequired().integer().notRequired().min(1, t("min_is_1")),
+          pageTo: number().notRequired().integer().typeError(t("must_be_number")).test("is-greater", t("page_to_must_be_greater_than_or_equal_to_page_from"), function (value) {
+            var _this$parent4 = this === null || this === void 0 ? void 0 : this.parent,
+              pageFrom = _this$parent4.pageFrom;
+            return !value || !pageFrom || value >= pageFrom;
+          }),
           articles: array().of(object().shape({
             categories: array().of(number()).min(1, t("category_required")),
             title: string().notRequired(),
@@ -28277,7 +28338,7 @@ var CustomTextbookTab = function CustomTextbookTab(props) {
 };
 var _reduceToMathArticles = function reduceToMathArticles(textbook, isMath) {
-  var values = isMath !== undefined ? _$5.cloneDeep(textbook) : textbook;
+  var values = isMath !== undefined ? _$6.cloneDeep(textbook) : textbook;
   if (isMath !== undefined) values.type = isMath;
   for (var key in values) {
     if (values.hasOwnProperty(key)) {
@@ -28292,7 +28353,7 @@ var _reduceToMathArticles = function reduceToMathArticles(textbook, isMath) {
   return values;
 };
 var _resetAllCategoriesAndQuestionTypesBySubject = function resetAllCategoriesAndQuestionTypesBySubject(textbook, subject) {
-  var values = subject ? _$5.cloneDeep(textbook) : textbook;
+  var values = subject ? _$6.cloneDeep(textbook) : textbook;
   if (subject) {
     values.subjectId = subject === null || subject === void 0 ? void 0 : subject.value;
     values.subject = subject;
@@ -28354,6 +28415,8 @@ var convertResponseToRequest = function convertResponseToRequest(selectedTextboo
           return {
             id: g.id,
             chapterId: c.id,
+            pageFrom: g.pageFrom,
+            pageTo: g.pageTo,
             questions: g.questions.map(function (q) {
               var _q$questionType;
               return _extends({}, q, {
@@ -28397,6 +28460,8 @@ var convertResponseToRequest = function convertResponseToRequest(selectedTextboo
               return {
                 id: g.id,
                 chapterId: c.id,
+                pageFrom: g.pageFrom,
+                pageTo: g.pageTo,
                 questions: g.questions.map(function (q) {
                   var _q$questionType2;
                   return _extends({}, q, {
@@ -28440,9 +28505,21 @@ var handleKeyDown = function handleKeyDown(e) {
     e.preventDefault();
   }
 };
+var isSequentialQuestionGroups = function isSequentialQuestionGroups(questionGroups) {
+  if (!questionGroups.length) return true;
+  if (questionGroups[0].questions[0].questionOrder !== 0) return false;
+  for (var index = 1; index < questionGroups.length; index++) {
+    var questionGroup = questionGroups[index];
+    var prevQuestionGroup = questionGroups[index - 1];
+    if (prevQuestionGroup.questions[prevQuestionGroup.questions.length - 1].questionOrder !== questionGroup.questions[0].questionOrder - 1) return false;
+  }
+  return true;
+};
+var _ = _$6;
 var ArticleBlock = function ArticleBlock(_ref) {
-  var expandedIndex = _ref.expandedIndex,
+  var errors = _ref.errors,
+    expandedIndex = _ref.expandedIndex,
     data = _ref.data,
     categories = _ref.categories,
     path = _ref.path,
@@ -28476,13 +28553,22 @@ var ArticleBlock = function ArticleBlock(_ref) {
     onOpenCategoryMenu(path + ".categories[0]");
   };
   var handleChangeCategory = function handleChangeCategory(val) {
-    setFieldValue(path + ".categoryOptions", [val]);
-    setFieldValue(path + ".categories", [val === null || val === void 0 ? void 0 : val.value]);
+    setFieldValue(path + ".categoryOptions", val !== null && val !== void 0 && val.value ? [val] : []);
+    setFieldValue(path + ".categories", val !== null && val !== void 0 && val.value ? [val.value] : []);
   };
   var handleChangeSubCategory = function handleChangeSubCategory(val) {
-    setFieldValue(path + ".categoryOptions[1]", val);
-    setFieldValue(path + ".categories[1]", val === null || val === void 0 ? void 0 : val.value);
+    if (!(val !== null && val !== void 0 && val.value)) {
+      var _data$categories, _data$categoryOptions;
+      var category = data === null || data === void 0 ? void 0 : (_data$categories = data.categories) === null || _data$categories === void 0 ? void 0 : _data$categories[0];
+      var categoryOption = data === null || data === void 0 ? void 0 : (_data$categoryOptions = data.categoryOptions) === null || _data$categoryOptions === void 0 ? void 0 : _data$categoryOptions[0];
+      setFieldValue(path + ".categories", category ? [category] : []);
+      setFieldValue(path + ".categoryOptions", categoryOption ? [categoryOption] : []);
+    } else {
+      setFieldValue(path + ".categories[1]", val.value);
+      setFieldValue(path + ".categoryOptions[1]", val);
+    }
   };
+  var categoryError = _.get(errors, path + ".categories");
   return React__default.createElement(Stack, {
     direction: "row",
     alignItems: "center",
@@ -28534,7 +28620,7 @@ var ArticleBlock = function ArticleBlock(_ref) {
   }, t("category")), React__default.createElement(Field, {
     name: path + ".categories[0]",
     render: function render() {
-      var _data$categoryOptions;
+      var _data$categoryOptions2;
       return React__default.createElement(ArticleCategorySelector, {
         style: {
           "div:has(&)": {
@@ -28542,7 +28628,7 @@ var ArticleBlock = function ArticleBlock(_ref) {
           }
         },
         id: "category",
-        optionValue: (_data$categoryOptions = data.categoryOptions) === null || _data$categoryOptions === void 0 ? void 0 : _data$categoryOptions[0],
+        optionValue: (_data$categoryOptions2 = data.categoryOptions) === null || _data$categoryOptions2 === void 0 ? void 0 : _data$categoryOptions2[0],
         options: categories,
         rest: {
           isLoading: optionKey === path + ".categories[0]" ? isLoadingCategories : false,
@@ -28554,7 +28640,13 @@ var ArticleBlock = function ArticleBlock(_ref) {
         placeholder: t("select_category")
       });
     }
-  }))), React__default.createElement(Grid, {
+  }), !!categoryError && React__default.createElement(Typography, {
+    fontWeight: 500,
+    fontSize: "10px",
+    lineHeight: "11.93px",
+    mt: 1,
+    color: !categoryError ? "#97A1AF" : "#F34B4B"
+  }, categoryError))), React__default.createElement(Grid, {
     item: true,
     xs: 12 / 5
   }, React__default.createElement(FormGroup, {
@@ -28571,7 +28663,7 @@ var ArticleBlock = function ArticleBlock(_ref) {
   }, t("sub_category")), React__default.createElement(Field, {
     name: path + ".categories[1]",
     render: function render() {
-      var _data$categoryOptions2;
+      var _data$categoryOptions3;
       return React__default.createElement(ArticleCategorySelector, {
         style: {
           "div:has(&)": {
@@ -28579,7 +28671,7 @@ var ArticleBlock = function ArticleBlock(_ref) {
           }
         },
         id: "sub_category",
-        optionValue: (_data$categoryOptions2 = data.categoryOptions) === null || _data$categoryOptions2 === void 0 ? void 0 : _data$categoryOptions2[1],
+        optionValue: (_data$categoryOptions3 = data.categoryOptions) === null || _data$categoryOptions3 === void 0 ? void 0 : _data$categoryOptions3[1],
         options: categories,
         rest: {
           isClearable: true,
@@ -28684,7 +28776,9 @@ var isEqual = function isEqual(prev, next) {
   var nextIsLoadingCategories = isNextMatched ? next.isLoadingCategories : undefined;
   var prevCategories = isPrevMatched ? prev.categories : undefined;
   var nextCategories = isNextMatched ? next.categories : undefined;
-  return prevOptionKey === nextOptionKey && prevIsLoadingCategories === nextIsLoadingCategories && JSON.stringify(prev.data) === JSON.stringify(next.data) && JSON.stringify(prevCategories) === JSON.stringify(nextCategories) && prev.path === next.path && prev.expandedIndex == next.expandedIndex && prev.disabled === next.disabled && prev.onOpenCategoryMenu == next.onOpenCategoryMenu && prev.onOpenSubCategoryMenu == next.onOpenSubCategoryMenu;
+  var prevCategoryError = _.get(prev.errors, prev.path + ".categories");
+  var nextCategoryError = _.get(next.errors, next.path + ".categories");
+  return prevOptionKey === nextOptionKey && prevIsLoadingCategories === nextIsLoadingCategories && JSON.stringify(prev.data) === JSON.stringify(next.data) && JSON.stringify(prevCategories) === JSON.stringify(nextCategories) && prev.path === next.path && prev.expandedIndex == next.expandedIndex && prev.disabled === next.disabled && prev.onOpenCategoryMenu == next.onOpenCategoryMenu && prev.onOpenSubCategoryMenu == next.onOpenSubCategoryMenu && prevCategoryError === nextCategoryError;
 };
 var ArticleBlock$1 = memo(ArticleBlock, isEqual);
@@ -28970,10 +29064,10 @@ var isEqual$1 = function isEqual(prev, next) {
 };
 var QuestionBlock$1 = memo(QuestionBlock, isEqual$1);
-var _excluded$g = ["data", "path", "isMath", "open", "isLoadingCategories", "isLoadingQuestionTypes", "optionKey", "categories", "questionTypes", "disabled", "onDelete", "onOpenSubCategoryMenu", "onOpenCategoryMenu", "onCloseCategoryMenu", "onCloseQuestionTypeMenu", "onOpenQuestionTypeMenu"];
-var _ = _$5;
+var _excluded$g = ["data", "path", "isMath", "open", "isLoadingCategories", "isLoadingQuestionTypes", "optionKey", "categories", "questionTypes", "disabled", "onQuestioStartOrderChange", "onDelete", "onOpenSubCategoryMenu", "onOpenCategoryMenu", "onCloseCategoryMenu", "onCloseQuestionTypeMenu", "onOpenQuestionTypeMenu"];
+var _$1 = _$6;
 var QuestionGroupBlockBody = function QuestionGroupBlockBody(_ref) {
-  var _data$articles$3, _data$articles$3$cate, _data$articles$4, _data$articles$4$cate;
+  var _data$articles$3, _data$articles$3$cate, _data$articles$4, _data$articles$4$cate, _questions$2;
   var data = _ref.data,
     path = _ref.path,
     isMath = _ref.isMath,
@@ -28984,6 +29078,7 @@ var QuestionGroupBlockBody = function QuestionGroupBlockBody(_ref) {
     categories = _ref.categories,
     questionTypes = _ref.questionTypes,
     disabled = _ref.disabled,
+    onQuestioStartOrderChange = _ref.onQuestioStartOrderChange,
     onDelete = _ref.onDelete,
     onOpenSubCategoryMenu = _ref.onOpenSubCategoryMenu,
     onOpenCategoryMenu = _ref.onOpenCategoryMenu,
@@ -28992,14 +29087,30 @@ var QuestionGroupBlockBody = function QuestionGroupBlockBody(_ref) {
     onOpenQuestionTypeMenu = _ref.onOpenQuestionTypeMenu,
     formikProps = _objectWithoutPropertiesLoose(_ref, _excluded$g);
   var errors = formikProps.errors;
-  var theme = useTheme();
+  var startOrderRef = useRef(null);
   var articles = data.articles,
     questions = data.questions;
-  var blockErrors = _.get(errors, path);
+  var blockErrors = _$1.get(errors, path);
   var handleOpenQuestionTypeMenu = useCallback(function (key) {
     var _data$articles$, _data$articles$$categ, _data$articles$2, _data$articles$2$cate;
     onOpenQuestionTypeMenu(key, (_data$articles$ = data.articles[0]) === null || _data$articles$ === void 0 ? void 0 : (_data$articles$$categ = _data$articles$.categories) === null || _data$articles$$categ === void 0 ? void 0 : _data$articles$$categ[0], (_data$articles$2 = data.articles[0]) === null || _data$articles$2 === void 0 ? void 0 : (_data$articles$2$cate = _data$articles$2.categories) === null || _data$articles$2$cate === void 0 ? void 0 : _data$articles$2$cate[1]);
   }, [(_data$articles$3 = data.articles[0]) === null || _data$articles$3 === void 0 ? void 0 : (_data$articles$3$cate = _data$articles$3.categories) === null || _data$articles$3$cate === void 0 ? void 0 : _data$articles$3$cate[0], (_data$articles$4 = data.articles[0]) === null || _data$articles$4 === void 0 ? void 0 : (_data$articles$4$cate = _data$articles$4.categories) === null || _data$articles$4$cate === void 0 ? void 0 : _data$articles$4$cate[1]]);
+  var debounceQuestionStartOrderChange = _$1.debounce(onQuestioStartOrderChange, 300);
+  var handleChangeStartQuestionOrder = function handleChangeStartQuestionOrder(e) {
+    var value = e.target.value.replace(/\D/g, '');
+    var order = +value;
+    if (Number.isNaN(order) || order === 0) {
+      order = 1;
+      if (order === 0 && startOrderRef.current) {
+        startOrderRef.current.value = "1";
+      }
+    }
+    debounceQuestionStartOrderChange(order - 1);
+  };
+  useEffect(function () {
+    var _questions$;
+    if (startOrderRef.current) startOrderRef.current.value = "" + ((((_questions$ = questions[0]) === null || _questions$ === void 0 ? void 0 : _questions$.questionOrder) || 0) + 1);
+  }, [(_questions$2 = questions[0]) === null || _questions$2 === void 0 ? void 0 : _questions$2.questionOrder]);
   return React__default.createElement(FieldArray, {
     name: path + ".articles",
     render: function render(arrayHelpers) {
@@ -29013,7 +29124,7 @@ var QuestionGroupBlockBody = function QuestionGroupBlockBody(_ref) {
         gap: 2
       }, !isMath && React__default.createElement(Stack, {
         sx: {
-          border: "1.5px solid " + (blockErrors ? open ? error.main : error.light : open ? theme.palette.secondary.main : theme.palette.secondary.light),
+          border: (open ? "3px" : "1.5px") + " solid " + (blockErrors ? open ? error.main : error.light : "#a3a3a4"),
           borderRadius: 2
         },
         gap: 1,
@@ -29051,7 +29162,20 @@ var QuestionGroupBlockBody = function QuestionGroupBlockBody(_ref) {
       }, t$1("article")))), React__default.createElement(Stack, {
         gap: 1,
         direction: "column"
-      }, React__default.createElement(ListView, {
+      }, React__default.createElement(Box, null, React__default.createElement(FormControl, {
+        sx: {
+          display: "flex",
+          flexDirection: "row",
+          alignItems: "center",
+          gap: 1
+        }
+      }, React__default.createElement(FormLabel, null, t$1("start_order")), React__default.createElement(TextField, {
+        inputRef: startOrderRef,
+        onChange: handleChangeStartQuestionOrder,
+        type: "number",
+        size: "small",
+        disabled: disabled
+      }))), React__default.createElement(ListView, {
         data: questions,
         render: function render(question, index) {
           return React__default.createElement(QuestionBlock$1, Object.assign({
@@ -29077,8 +29201,8 @@ var isEqual$2 = function isEqual(prev, next) {
   var isNextMatched = next.optionKey.startsWith(next.path);
   var prevOptionKey = isPrevMatched ? prev.optionKey : undefined;
   var nextOptionKey = isNextMatched ? next.optionKey : undefined;
-  var prevBlockErrors = _.get(prev.errors, prev.path);
-  var nextBlockErrors = _.get(next.errors, next.path);
+  var prevBlockErrors = _$1.get(prev.errors, prev.path);
+  var nextBlockErrors = _$1.get(next.errors, next.path);
   var prevIsLoadingCategories = isPrevMatched ? prev.isLoadingCategories : undefined;
   var nextIsLoadingCategories = isNextMatched ? next.isLoadingCategories : undefined;
   var prevCategories = isPrevMatched ? prev.categories : undefined;
@@ -29098,9 +29222,9 @@ var isEqual$2 = function isEqual(prev, next) {
 var QuestionGroupBlockBody$1 = memo(QuestionGroupBlockBody, isEqual$2);
 var _excluded$h = ["expandedIndex", "open", "paths", "path", "isMath", "data", "categories", "isLoadingCategories", "isLoadingQuestionTypes", "questionTypes", "optionKey", "disabled", "onToggle", "onQuestionCountChange", "onDelete", "onOpenSubCategoryMenu", "onOpenCategoryMenu", "onCloseCategoryMenu", "onCopiedPrevQuestionGroup", "onCloseQuestionTypeMenu", "onOpenQuestionTypeMenu"];
-var _$1 = _$5;
+var _$2 = _$6;
 var QuestionGroupBlock = function QuestionGroupBlock(_ref) {
-  var _data$articles$2, _data$articles$2$cate, _data$articles$2$cate2, _data$articles$3, _data$articles$3$cate, _data$articles$3$cate2;
+  var _data$articles$3, _data$articles$3$cate, _data$articles$3$cate2, _data$articles$4, _data$articles$4$cate, _data$articles$4$cate2;
   var expandedIndex = _ref.expandedIndex,
     open = _ref.open,
     paths = _ref.paths,
@@ -29145,6 +29269,16 @@ var QuestionGroupBlock = function QuestionGroupBlock(_ref) {
     setFieldValue(path + ".questionCount", questionCount);
     onQuestionCountChange(questionCount, expandedIndex);
   };
+  var handleChangeStartQuestionOrder = function handleChangeStartQuestionOrder(order) {
+    var _questions$;
+    var questions = data.questions;
+    if (((_questions$ = questions[0]) === null || _questions$ === void 0 ? void 0 : _questions$.questionOrder) === order) return;
+    setFieldValue(path + ".questions", questions.map(function (q, index) {
+      return _extends({}, q, {
+        questionOrder: order + index
+      });
+    }));
+  };
   var handleChangeAnswerCount = function handleChangeAnswerCount(val) {
     var answerCount = (val === null || val === void 0 ? void 0 : val.value) || 1;
     setFieldValue(path + ".answerCount", answerCount);
@@ -29188,16 +29322,24 @@ var QuestionGroupBlock = function QuestionGroupBlock(_ref) {
     }
   };
   var handleChangeCategory = function handleChangeCategory(val) {
-    setFieldValue(path + ".articles[0].categoryOptions", [val]);
-    setFieldValue(path + ".articles[0].categories", [val === null || val === void 0 ? void 0 : val.value]);
+    setFieldValue(path + ".articles[0].categoryOptions", val !== null && val !== void 0 && val.value ? [val] : []);
+    setFieldValue(path + ".articles[0].categories", val !== null && val !== void 0 && val.value ? [val.value] : []);
   };
   var handleChangeSubCategory = function handleChangeSubCategory(val) {
-    setFieldValue(path + ".articles[0].categories[1]", val === null || val === void 0 ? void 0 : val.value);
-    setFieldValue(path + ".articles[0].categoryOptions[1]", val);
+    if (!(val !== null && val !== void 0 && val.value)) {
+      var _data$articles, _data$articles$2, _data$articles$2$cate, _data$articles2, _data$articles2$, _data$articles2$$cate;
+      var category = data === null || data === void 0 ? void 0 : (_data$articles = data.articles) === null || _data$articles === void 0 ? void 0 : (_data$articles$2 = _data$articles[0]) === null || _data$articles$2 === void 0 ? void 0 : (_data$articles$2$cate = _data$articles$2.categories) === null || _data$articles$2$cate === void 0 ? void 0 : _data$articles$2$cate[0];
+      var categoryOption = data === null || data === void 0 ? void 0 : (_data$articles2 = data.articles) === null || _data$articles2 === void 0 ? void 0 : (_data$articles2$ = _data$articles2[0]) === null || _data$articles2$ === void 0 ? void 0 : (_data$articles2$$cate = _data$articles2$.categoryOptions) === null || _data$articles2$$cate === void 0 ? void 0 : _data$articles2$$cate[0];
+      setFieldValue(path + ".articles[0].categories", category ? [category] : []);
+      setFieldValue(path + ".articles[0].categoryOptions", categoryOption ? [categoryOption] : []);
+    } else {
+      setFieldValue(path + ".articles[0].categories[1]", val.value);
+      setFieldValue(path + ".articles[0].categoryOptions[1]", val);
+    }
   };
   var summary = open ? "" : [t("number_questions", {
     n: data.questionCount
-  }), (_data$articles$2 = data.articles[0]) === null || _data$articles$2 === void 0 ? void 0 : (_data$articles$2$cate = _data$articles$2.categoryOptions) === null || _data$articles$2$cate === void 0 ? void 0 : (_data$articles$2$cate2 = _data$articles$2$cate[0]) === null || _data$articles$2$cate2 === void 0 ? void 0 : _data$articles$2$cate2.label, (_data$articles$3 = data.articles[0]) === null || _data$articles$3 === void 0 ? void 0 : (_data$articles$3$cate = _data$articles$3.categoryOptions) === null || _data$articles$3$cate === void 0 ? void 0 : (_data$articles$3$cate2 = _data$articles$3$cate[1]) === null || _data$articles$3$cate2 === void 0 ? void 0 : _data$articles$3$cate2.label, isMath ? data.questions.map(function (i) {
+  }), (_data$articles$3 = data.articles[0]) === null || _data$articles$3 === void 0 ? void 0 : (_data$articles$3$cate = _data$articles$3.categoryOptions) === null || _data$articles$3$cate === void 0 ? void 0 : (_data$articles$3$cate2 = _data$articles$3$cate[0]) === null || _data$articles$3$cate2 === void 0 ? void 0 : _data$articles$3$cate2.label, (_data$articles$4 = data.articles[0]) === null || _data$articles$4 === void 0 ? void 0 : (_data$articles$4$cate = _data$articles$4.categoryOptions) === null || _data$articles$4$cate === void 0 ? void 0 : (_data$articles$4$cate2 = _data$articles$4$cate[1]) === null || _data$articles$4$cate2 === void 0 ? void 0 : _data$articles$4$cate2.label, isMath ? data.questions.map(function (i) {
     var _i$questionType;
     return ((_i$questionType = i.questionType) === null || _i$questionType === void 0 ? void 0 : _i$questionType.label) || i.questionTypeName;
   }).filter(function (i) {
@@ -29205,12 +29347,15 @@ var QuestionGroupBlock = function QuestionGroupBlock(_ref) {
   }).join(",") : ""].filter(function (i) {
     return !!i;
   }).join(" / ");
-  var blockErrors = _$1.get(errors, path);
+  var pageFromError = _$2.get(errors, path + ".pageFrom");
+  var pageToError = _$2.get(errors, path + ".pageTo");
+  var categoryError = _$2.get(errors, path + ".articles[0].categories");
+  var blockErrors = _$2.get(errors, path);
   return React__default.createElement(Accordion, {
     expanded: open,
     onChange: handleToggle,
     sx: {
-      border: "1.5px solid " + (blockErrors ? open ? error.main : error.light : open ? yellow$1[900] : yellow$1[500])
+      border: (open ? "5px" : "1.5px") + " solid " + (blockErrors ? open ? error.main : error.light : open ? yellow$1[900] : yellow$1[500])
     }
   }, React__default.createElement(AccordionSummary, {
     expandIcon: React__default.createElement(MdExpandMore, {
@@ -29244,24 +29389,28 @@ var QuestionGroupBlock = function QuestionGroupBlock(_ref) {
     whiteSpace: "nowrap"
   }, title, !open && ":")), React__default.createElement(Box, {
     sx: {
-      flexGrow: 1
+      flexGrow: 1,
+      cursor: "default"
+    },
+    onClick: function onClick(e) {
+      open && e.stopPropagation();
     }
   }, open ? React__default.createElement(Stack, {
-    direction: "row",
-    flexWrap: "nowrap",
+    direction: "column",
     gap: 2
+  }, React__default.createElement(Stack, {
+    direction: "row",
+    flexWrap: "nowrap"
   }, React__default.createElement(Grid, {
     container: true,
     flexGrow: 1,
-    direction: "row",
-    flexWrap: "nowrap",
-    gap: 2
+    direction: "row"
   }, React__default.createElement(Grid, {
     item: true,
     xs: 3
   }, React__default.createElement(FormGroup, {
-    onClick: function onClick(e) {
-      open && e.stopPropagation();
+    sx: {
+      marginRight: 2
     }
   }, React__default.createElement(FormLabel, {
     htmlFor: "question_count",
@@ -29283,10 +29432,8 @@ var QuestionGroupBlock = function QuestionGroupBlock(_ref) {
       maxWidth: "100%",
       "& div": {
         maxWidth: "100%"
-      }
-    },
-    onClick: function onClick(e) {
-      open && e.stopPropagation();
+      },
+      marginRight: 2
     }
   }, React__default.createElement(FormLabel, {
     htmlFor: "category",
@@ -29314,7 +29461,13 @@ var QuestionGroupBlock = function QuestionGroupBlock(_ref) {
         placeholder: t("select_category")
       });
     }
-  }))), isMath && React__default.createElement(Grid, {
+  }), !!categoryError && React__default.createElement(Typography, {
+    fontWeight: 500,
+    fontSize: "10px",
+    lineHeight: "11.93px",
+    mt: 1,
+    color: !categoryError ? "#97A1AF" : "#F34B4B"
+  }, categoryError))), isMath && React__default.createElement(Grid, {
     item: true,
     xs: 3
   }, React__default.createElement(FormGroup, {
@@ -29322,10 +29475,8 @@ var QuestionGroupBlock = function QuestionGroupBlock(_ref) {
       maxWidth: "100%",
       "& div": {
         maxWidth: "100%"
-      }
-    },
-    onClick: function onClick(e) {
-      open && e.stopPropagation();
+      },
+      marginRight: 2
     }
   }, React__default.createElement(FormLabel, {
     htmlFor: "category",
@@ -29333,7 +29484,7 @@ var QuestionGroupBlock = function QuestionGroupBlock(_ref) {
   }, t("sub_category")), React__default.createElement(Field, {
     name: path + ".articles[0].categoryOptions[1]",
     render: function render(_ref4) {
-      var _data$articles$4, _data$articles$4$cate;
+      var _data$articles$5, _data$articles$5$cate;
       var field = _ref4.field;
       return React__default.createElement(ArticleCategorySelector, {
         style: {
@@ -29351,7 +29502,7 @@ var QuestionGroupBlock = function QuestionGroupBlock(_ref) {
           onMenuClose: onCloseCategoryMenu
         },
         onChange: handleChangeSubCategory,
-        isDisabled: disabled || !((_data$articles$4 = data.articles[0]) !== null && _data$articles$4 !== void 0 && (_data$articles$4$cate = _data$articles$4.categories) !== null && _data$articles$4$cate !== void 0 && _data$articles$4$cate[0]),
+        isDisabled: disabled || !((_data$articles$5 = data.articles[0]) !== null && _data$articles$5 !== void 0 && (_data$articles$5$cate = _data$articles$5.categories) !== null && _data$articles$5$cate !== void 0 && _data$articles$5$cate[0]),
         placeholder: t("select_category")
       });
     }
@@ -29361,6 +29512,9 @@ var QuestionGroupBlock = function QuestionGroupBlock(_ref) {
   }, React__default.createElement(FormGroup, {
     onClick: function onClick(e) {
       open && e.stopPropagation();
+    },
+    sx: {
+      marginRight: 2
     }
   }, React__default.createElement(FormLabel, {
     htmlFor: "question_count",
@@ -29374,12 +29528,67 @@ var QuestionGroupBlock = function QuestionGroupBlock(_ref) {
         isDisabled: disabled
       }));
     }
-  })))), isMath && React__default.createElement(Box, {
+  }))), !isMath && React__default.createElement(Grid, {
+    item: true,
+    xs: 3
+  }, React__default.createElement(FormGroup, {
+    sx: {
+      marginRight: 2
+    }
+  }, React__default.createElement(FormLabel, {
+    htmlFor: "question_count",
+    className: "form-label"
+  }, t("page_from")), React__default.createElement(Field, {
+    name: path + ".pageFrom",
+    render: function render(_ref6) {
+      var field = _ref6.field;
+      return React__default.createElement(TextField, Object.assign({
+        placeholder: t("page_from"),
+        type: "number"
+      }, field, {
+        size: "small",
+        onKeyDown: handleKeyDown,
+        disabled: disabled
+      }));
+    }
+  }), !!pageFromError && React__default.createElement(Typography, {
+    fontWeight: 500,
+    fontSize: "10px",
+    lineHeight: "11.93px",
+    mt: 1,
+    color: !pageFromError ? "#97A1AF" : "#F34B4B"
+  }, pageFromError))), !isMath && React__default.createElement(Grid, {
+    item: true,
+    xs: 3
+  }, React__default.createElement(FormGroup, {
+    sx: {
+      marginRight: 2
+    }
+  }, React__default.createElement(FormLabel, {
+    htmlFor: "question_count",
+    className: "form-label"
+  }, t("page_to")), React__default.createElement(Field, {
+    name: path + ".pageTo",
+    render: function render(_ref7) {
+      var field = _ref7.field;
+      return React__default.createElement(TextField, Object.assign({
+        placeholder: t("page_to"),
+        type: "number"
+      }, field, {
+        size: "small",
+        onKeyDown: handleKeyDown,
+        disabled: disabled
+      }));
+    }
+  }), !!pageToError && React__default.createElement(Typography, {
+    fontWeight: 500,
+    fontSize: "10px",
+    lineHeight: "11.93px",
+    mt: 1,
+    color: !pageToError ? "#97A1AF" : "#F34B4B"
+  }, pageToError)))), isMath && React__default.createElement(Box, {
     sx: {
       display: "flex"
-    },
-    onClick: function onClick(e) {
-      open && e.stopPropagation();
     }
   }, React__default.createElement(Button, {
     variant: "contained",
@@ -29389,7 +29598,84 @@ var QuestionGroupBlock = function QuestionGroupBlock(_ref) {
     sx: {
       whiteSpace: "nowrap"
     }
-  }, t("category_copy")))) : React__default.createElement(Typography, {
+  }, t("category_copy")))), isMath && React__default.createElement(Stack, {
+    direction: "row",
+    flexWrap: "nowrap"
+  }, React__default.createElement(Grid, {
+    container: true,
+    flexGrow: 1,
+    direction: "row"
+  }, React__default.createElement(Grid, {
+    item: true,
+    xs: 3
+  }, React__default.createElement(FormGroup, {
+    sx: {
+      marginRight: 2
+    }
+  }, React__default.createElement(FormLabel, {
+    htmlFor: "question_count",
+    className: "form-label"
+  }, t("page_from")), React__default.createElement(Field, {
+    name: path + ".pageFrom",
+    render: function render(_ref8) {
+      var field = _ref8.field;
+      return React__default.createElement(TextField, Object.assign({
+        placeholder: t("page_from"),
+        type: "number"
+      }, field, {
+        size: "small",
+        onKeyDown: handleKeyDown,
+        disabled: disabled
+      }));
+    }
+  }), !!pageFromError && React__default.createElement(Typography, {
+    fontWeight: 500,
+    fontSize: "10px",
+    lineHeight: "11.93px",
+    mt: 1,
+    color: !pageFromError ? "#97A1AF" : "#F34B4B"
+  }, pageFromError))), React__default.createElement(Grid, {
+    item: true,
+    xs: 3
+  }, React__default.createElement(FormGroup, {
+    sx: {
+      marginRight: 2
+    }
+  }, React__default.createElement(FormLabel, {
+    htmlFor: "question_count",
+    className: "form-label"
+  }, t("page_to")), React__default.createElement(Field, {
+    name: path + ".pageTo",
+    render: function render(_ref9) {
+      var field = _ref9.field;
+      return React__default.createElement(TextField, Object.assign({
+        placeholder: t("page_to"),
+        type: "number"
+      }, field, {
+        size: "small",
+        onKeyDown: handleKeyDown,
+        disabled: disabled
+      }));
+    }
+  }), !!pageToError && React__default.createElement(Typography, {
+    fontWeight: 500,
+    fontSize: "10px",
+    lineHeight: "11.93px",
+    mt: 1,
+    color: !pageToError ? "#97A1AF" : "#F34B4B"
+  }, pageToError)))), React__default.createElement(Box, {
+    sx: {
+      display: "flex",
+      visibility: "hidden"
+    }
+  }, React__default.createElement(Button, {
+    variant: "contained",
+    color: "success",
+    disabled: true,
+    sx: {
+      whiteSpace: "nowrap"
+    }
+  }, t("category_copy"))))) : React__default.createElement(Typography, {
     fontWeight: 600,
     sx: {
       overflow: "hidden",
@@ -29411,6 +29697,7 @@ var QuestionGroupBlock = function QuestionGroupBlock(_ref) {
     isLoadingQuestionTypes: isLoadingQuestionTypes,
     optionKey: optionKey,
     disabled: disabled,
+    onQuestioStartOrderChange: handleChangeStartQuestionOrder,
     onDelete: onDelete,
     onOpenSubCategoryMenu: onOpenSubCategoryMenu,
     onOpenCategoryMenu: onOpenCategoryMenu,
@@ -29477,6 +29764,7 @@ var ChapterBlockBody = function ChapterBlockBody(_ref) {
     var questions = currentQuestionGroup.questions;
     var lastOrder = questions[questions.length - 1].questionOrder;
     var newQuestionGroups = questionGroups;
+    var isSequential = isSequentialQuestionGroups(questionGroups);
     if (questions.length < questionCount) {
       var additionalQuestions = Array.from({
         length: questionCount - questions.length
@@ -29489,7 +29777,7 @@ var ChapterBlockBody = function ChapterBlockBody(_ref) {
       newQuestionGroups = [].concat(prevQuestionGroups, [_extends({}, currentQuestionGroup, {
         questionCount: questionCount,
         questions: [].concat(currentQuestionGroup.questions, additionalQuestions)
-      })], nextQuestionGroups.map(function (i) {
+      })], isSequential ? nextQuestionGroups.map(function (i) {
         return _extends({}, i, {
           questions: i.questions.map(function (q) {
             return _extends({}, q, {
@@ -29497,14 +29785,14 @@ var ChapterBlockBody = function ChapterBlockBody(_ref) {
             });
           })
         });
-      }));
+      }) : nextQuestionGroups);
       setFieldValue(path + ".questionGroups", newQuestionGroups);
     } else {
       var remainQuestions = questions.slice(0, questionCount);
       newQuestionGroups = [].concat(prevQuestionGroups, [_extends({}, currentQuestionGroup, {
         questionCount: questionCount,
         questions: [].concat(remainQuestions)
-      })], nextQuestionGroups.map(function (i) {
+      })], isSequential ? nextQuestionGroups.map(function (i) {
         return _extends({}, i, {
           questions: i.questions.map(function (q) {
             return _extends({}, q, {
@@ -29512,7 +29800,7 @@ var ChapterBlockBody = function ChapterBlockBody(_ref) {
             });
           })
         });
-      }));
+      }) : nextQuestionGroups);
     }
     setFieldValue(path + ".questionGroups", newQuestionGroups);
   };
@@ -29619,7 +29907,7 @@ var ChapterBlockBody = function ChapterBlockBody(_ref) {
 };
 var _excluded$j = ["data", "expandedIndex", "open", "path", "paths", "isMath", "isLoadingCategories", "isLoadingQuestionTypes", "categories", "questionTypes", "optionKey", "disabled", "onToggle", "onDelete", "onCopiedPrevQuestionGroup", "onCloseCategoryMenu", "onOpenCategoryMenu", "onOpenSubCategoryMenu", "onOpenQuestionTypeMenu", "onCloseQuestionTypeMenu"];
-var _$2 = _$5;
+var _$3 = _$6;
 var ChapterBlock = function ChapterBlock(_ref) {
   var data = _ref.data,
     expandedIndex = _ref.expandedIndex,
@@ -29659,10 +29947,10 @@ var ChapterBlock = function ChapterBlock(_ref) {
       chapter: title
     }), title, path.replace(/\[(\d+)\]$/, ""), expandedIndex);
   };
-  var pageNameError = _$2.get(errors, path + ".name");
-  var pageFromError = _$2.get(errors, path + ".pageFrom");
-  var pageToError = _$2.get(errors, path + ".pageTo");
-  var blockErrors = _$2.get(errors, path);
+  var pageNameError = _$3.get(errors, path + ".name");
+  var pageFromError = _$3.get(errors, path + ".pageFrom");
+  var pageToError = _$3.get(errors, path + ".pageTo");
+  var blockErrors = _$3.get(errors, path);
   return React__default.createElement(Accordion, {
     expanded: open,
     onChange: handleToggle,
@@ -29839,13 +30127,13 @@ var QuestionTypeFilter = function QuestionTypeFilter(_ref) {
   });
   var gradeOptions = useMemo(function () {
     switch (filter === null || filter === void 0 ? void 0 : filter.schoolType) {
-      case SchoolType$1.Middle:
+      case SchoolType.Middle:
         return MIDDLE_GRADES.map(function (i) {
           return _extends({}, i, {
             label: typeof i.label === "string" ? t(i.label) : i.label
           });
         });
-      case SchoolType$1.High:
+      case SchoolType.High:
         return HIGH_GRADES.map(function (i) {
           return _extends({}, i, {
             label: t(i.label)
@@ -29891,7 +30179,7 @@ var QuestionTypeFilter = function QuestionTypeFilter(_ref) {
     options: gradeOptions,
     isClearable: false,
     onChange: handleGradeChange
-  })), (!(filter !== null && filter !== void 0 && filter.schoolType) || (filter === null || filter === void 0 ? void 0 : filter.schoolType) === SchoolType$1.Elementary) && React__default.createElement(FormGroup, {
+  })), (!(filter !== null && filter !== void 0 && filter.schoolType) || (filter === null || filter === void 0 ? void 0 : filter.schoolType) === SchoolType.Elementary) && React__default.createElement(FormGroup, {
     sx: {
       flexGrow: 1
     }
@@ -29900,7 +30188,7 @@ var QuestionTypeFilter = function QuestionTypeFilter(_ref) {
     options: semesterOptions,
     isClearable: false,
     onChange: handleSemesterChange
-  })), (!(filter !== null && filter !== void 0 && filter.schoolType) || (filter === null || filter === void 0 ? void 0 : filter.schoolType) === SchoolType$1.Elementary) && React__default.createElement(FormGroup, {
+  })), (!(filter !== null && filter !== void 0 && filter.schoolType) || (filter === null || filter === void 0 ? void 0 : filter.schoolType) === SchoolType.Elementary) && React__default.createElement(FormGroup, {
     sx: {
       flexGrow: 1
     }
@@ -29946,7 +30234,9 @@ var CATEGORY_URL$1 = BASE_URL + "/api/examcategory";
 var getCategoryListAdminApi$1 = function getCategoryListAdminApi(data) {
   try {
     return Promise.resolve(api.get("" + ADMIN_CATEGORY_URL$1, {
-      params: data
+      params: _extends({}, data, {
+        sortColumnName: "name"
+      })
     }));
   } catch (e) {
     return Promise.reject(e);
@@ -29955,7 +30245,9 @@ var getCategoryListAdminApi$1 = function getCategoryListAdminApi(data) {
 var getCategoryListApi$1 = function getCategoryListApi(data) {
   try {
     return Promise.resolve(api.get("" + CATEGORY_URL$1, {
-      params: data
+      params: _extends({}, data, {
+        sortColumnName: "name"
+      })
     }));
   } catch (e) {
     return Promise.reject(e);
@@ -29964,7 +30256,9 @@ var getCategoryListApi$1 = function getCategoryListApi(data) {
 var getCategoryQuestionTypeListApi = function getCategoryQuestionTypeListApi(isSuper, data) {
   try {
     return Promise.resolve(api.get((isSuper ? ADMIN_CATEGORY_URL$1 : CATEGORY_URL$1) + "/question-types", {
-      params: data
+      params: _extends({}, data, {
+        sortColumnName: "name"
+      })
     }));
   } catch (e) {
     return Promise.reject(e);
@@ -30004,7 +30298,7 @@ var useTextbookOptions = function useTextbookOptions(subjectId, isMath, filter,
     return state === null || state === void 0 ? void 0 : (_state$common2 = state.common) === null || _state$common2 === void 0 ? void 0 : (_state$common2$user = _state$common2.user) === null || _state$common2$user === void 0 ? void 0 : _state$common2$user.academyDomain;
   });
   var getOptionFilter = function getOptionFilter() {
-    var cloneFilter = _$5.clone(filter);
+    var cloneFilter = _$6.clone(filter);
     for (var key in cloneFilter) {
       if (Object.prototype.hasOwnProperty.call(cloneFilter, key)) {
         var element = cloneFilter[key];
@@ -30154,7 +30448,7 @@ var useTextbookOptions = function useTextbookOptions(subjectId, isMath, filter,
   };
 };
-var _$3 = _$5;
+var _$4 = _$6;
 var TextbookContentsTab = function TextbookContentsTab(props) {
   var disabled = props.disabled,
     values = props.values,
@@ -30197,7 +30491,7 @@ var TextbookContentsTab = function TextbookContentsTab(props) {
   };
   var handleConfirmDeleteBlock = function handleConfirmDeleteBlock() {
     if (!(openConfirmDelete !== null && openConfirmDelete !== void 0 && openConfirmDelete.path)) return;
-    var items = _$3.get(values, openConfirmDelete.path, []);
+    var items = _$4.get(values, openConfirmDelete.path, []);
     setFieldValue(openConfirmDelete.path, items.filter(function (_, i) {
       return i !== openConfirmDelete.itemIndex;
     }));
@@ -30237,12 +30531,12 @@ var TextbookContentsTab = function TextbookContentsTab(props) {
     if (!newParts.length) return;
     if (newParts.length < parts.length) {
       var _$get, _$get2, _$get3;
-      var subChapters = (_$get = _$3.get(values, newPath + ".subChapters")) != null ? _$get : [];
+      var subChapters = (_$get = _$4.get(values, newPath + ".subChapters")) != null ? _$get : [];
       var questionGroups = [];
-      if (!subChapters.length) questionGroups = (_$get2 = _$3.get(values, newPath + ".questionGroups")) != null ? _$get2 : [];else questionGroups = (_$get3 = _$3.get(values, newPath + ".subChapters[" + (subChapters.length - 1) + "].questionGroups")) != null ? _$get3 : [];
-      return _$3.last(questionGroups);
+      if (!subChapters.length) questionGroups = (_$get2 = _$4.get(values, newPath + ".questionGroups")) != null ? _$get2 : [];else questionGroups = (_$get3 = _$4.get(values, newPath + ".subChapters[" + (subChapters.length - 1) + "].questionGroups")) != null ? _$get3 : [];
+      return _$4.last(questionGroups);
     }
-    return _$3.get(values, newPath);
+    return _$4.get(values, newPath);
   };
   var handleOpenSubCategoryMenu = useCallback(function (key, categoryId) {
     setOptionKey(key);
@@ -30734,7 +31028,7 @@ var useSelect = function useSelect(_ref) {
     setLoading = _useState2[1];
   useEffect(function () {
     if (!email || !academy) return;
-    var fetchData = _$5.debounce(function () {
+    var fetchData = _$6.debounce(function () {
       try {
         var _temp2 = function _temp2() {
           setLoading(false);
@@ -30848,7 +31142,7 @@ var OwnerSelector = function OwnerSelector(_ref) {
   }, errors === null || errors === void 0 ? void 0 : errors.textbookOwners[index].courseId)));
 };
-var _$4 = _$5;
+var _$5 = _$6;
 var TextbookOwnersTab = function TextbookOwnersTab(_ref) {
   var errors = _ref.errors,
     values = _ref.values,
@@ -30921,12 +31215,12 @@ var TextbookOwnersTab = function TextbookOwnersTab(_ref) {
               disabled: disabled || !!val.academyId && val.academyId !== (academy === null || academy === void 0 ? void 0 : academy.id)
             }));
           }
-        }), _$4.get(errors, "textbookOwners[" + index + "].email") && React__default.createElement(Typography, {
+        }), _$5.get(errors, "textbookOwners[" + index + "].email") && React__default.createElement(Typography, {
           fontWeight: 500,
           fontSize: "10px",
           lineHeight: "11.93px",
           color: "#F34B4B"
-        }, _$4.get(errors, "textbookOwners[" + index + "].email"))), !!(values !== null && values !== void 0 && (_values$textbookOwner = values.textbookOwners) !== null && _values$textbookOwner !== void 0 && _values$textbookOwner[index].email) && React__default.createElement(OwnerSelector, {
+        }, _$5.get(errors, "textbookOwners[" + index + "].email"))), !!(values !== null && values !== void 0 && (_values$textbookOwner = values.textbookOwners) !== null && _values$textbookOwner !== void 0 && _values$textbookOwner[index].email) && React__default.createElement(OwnerSelector, {
           values: values,
           errors: errors,
           index: index,
@@ -31068,23 +31362,35 @@ var PreparedTextbookForm = function PreparedTextbookForm(_ref) {
     color: !(errors !== null && errors !== void 0 && errors.subjectId) ? "#97A1AF" : "#F34B4B"
   }, errors === null || errors === void 0 ? void 0 : errors.subjectId)), React__default.createElement(Stack, {
     flexDirection: "column",
-    justifyContent: "center",
     gap: 1
   }, React__default.createElement("label", {
+    htmlFor: "hidden",
+    style: {
+      visibility: "hidden"
+    }
+  }, "hidden"), React__default.createElement(Stack, {
+    flexDirection: "row",
+    justifyContent: "center",
+    alignItems: "center",
+    gap: 1
+  }, React__default.createElement(FormLabel, {
     htmlFor: "type",
     className: "text-center"
-  }, t$1(values.type !== 2 ? "korea" : "math")), React__default.createElement(Field, {
+  }, t$1("korea")), React__default.createElement(Field, {
     name: "type",
     render: function render(_ref4) {
       var field = _ref4.field;
       return React__default.createElement(Switch, Object.assign({}, field, {
         color: "success",
         disabled: !!textbookId || disabled,
-        checked: values.type === 2,
+        checked: values.type === TextbookEditorType.Math,
         onChange: handleChangeTextbookType
       }));
     }
-  }))), React__default.createElement(Box, null, React__default.createElement(Button, {
+  }), React__default.createElement(FormLabel, {
+    htmlFor: "type",
+    className: "text-center"
+  }, t$1("math"))))), React__default.createElement(Box, null, React__default.createElement(Button, {
     type: "submit",
     sx: {
       width: "fit-content"
@@ -31092,7 +31398,7 @@ var PreparedTextbookForm = function PreparedTextbookForm(_ref) {
     variant: "contained",
     disabled: disabled,
     onClick: function onClick() {
-      if (!_$5.isEmpty(errors)) {
+      if (!_$6.isEmpty(errors)) {
         toast.error(t$1("please_fill_in_the_blank_fields"));
       }
     },
@@ -31859,7 +32165,7 @@ var usePreparedExam = function usePreparedExam(_ref) {
       return Promise.reject(e);
     }
   };
-  var debounceSearch = _$5.debounce(function () {
+  var debounceSearch = _$6.debounce(function () {
     setTextbookFilter(_extends({}, textbookFilter, {
       currentPage: 1
     }));
@@ -32185,20 +32491,41 @@ var useTextbookDrawer = function useTextbookDrawer(_ref) {
     var arrOptions = [];
     var obj = {};
     textbook === null || textbook === void 0 ? void 0 : textbook.chapters.map(function (chapter) {
+      var _chapter$subChapters, _chapter$questionGrou;
       arrOptions.push({
         label: t("page_number", {
           number: chapter.pageFrom
         }),
         value: chapter.pageFrom
       });
-      if (chapter.subChapters) {
+      if ((_chapter$subChapters = chapter.subChapters) !== null && _chapter$subChapters !== void 0 && _chapter$subChapters.length) {
         chapter.subChapters.map(function (subChapter) {
+          var _subChapter$questionG;
           arrOptions.push({
             label: t("page_number", {
               number: subChapter.pageFrom
             }),
             value: subChapter.pageFrom
           });
+          if ((_subChapter$questionG = subChapter.questionGroups) !== null && _subChapter$questionG !== void 0 && _subChapter$questionG.length) {
+            subChapter.questionGroups.map(function (questionGroup) {
+              questionGroup.pageFrom && arrOptions.push({
+                label: t("page_number", {
+                  number: questionGroup.pageFrom
+                }),
+                value: questionGroup.pageFrom
+              });
+            });
+          }
+        });
+      } else if ((_chapter$questionGrou = chapter.questionGroups) !== null && _chapter$questionGrou !== void 0 && _chapter$questionGrou.length) {
+        chapter.questionGroups.map(function (questionGroup) {
+          questionGroup.pageFrom && arrOptions.push({
+            label: t("page_number", {
+              number: questionGroup.pageFrom
+            }),
+            value: questionGroup.pageFrom
+          });
         });
       }
     });
@@ -32881,7 +33208,7 @@ var TextbookDrawer = function TextbookDrawer(_ref) {
   }), React__default.createElement(Stack, {
     sx: {
       position: "absolute",
-      left: textbook !== null && textbook !== void 0 && textbook.progress && (textbook === null || textbook === void 0 ? void 0 : textbook.progress) > 7 ? (textbook === null || textbook === void 0 ? void 0 : textbook.progress) - 8 + "%" : ((textbook === null || textbook === void 0 ? void 0 : textbook.progress) || 0) + 3 + "%",
+      left: "max(" + (textbook !== null && textbook !== void 0 && textbook.progress && (textbook === null || textbook === void 0 ? void 0 : textbook.progress) > 7 ? (textbook === null || textbook === void 0 ? void 0 : textbook.progress) - 8 + "%" : ((textbook === null || textbook === void 0 ? void 0 : textbook.progress) || 0) + 3 + "%") + ", 16px)",
       height: "100%",
       justifyContent: "center"
     }
@@ -33568,7 +33895,7 @@ var PreparedItem = function PreparedItem(_ref) {
     });
     return React__default.createElement(Form, {
       style: {
-        height: !_$5.isEmpty(values) && !textbookList.length ? "100%" : "unset"
+        height: !_$6.isEmpty(values) && !textbookList.length ? "100%" : "unset"
       }
     }, React__default.createElement(Stack, null, React__default.createElement(Accordion, {
       sx: {
@@ -33974,7 +34301,7 @@ var PreparedItem = function PreparedItem(_ref) {
       open: openConfirmDialog,
       onClose: handleCloseConfirmDialog,
       onSubmit: handleResetFilter
-    }), !_$5.isEmpty(values) && !textbookList.length && React__default.createElement(Stack, {
+    }), !_$6.isEmpty(values) && !textbookList.length && React__default.createElement(Stack, {
       height: 1,
       justifyContent: "center",
       alignItems: "center"
@@ -35077,5 +35404,5 @@ var LayoutContext = function LayoutContext(_ref) {
   });else return React__default.createElement(Fragment$1, null, children);
 };
-export { ACADEMY_DOMAIN, ACCESS_TOKEN, AcademyHeaders, AcademyList, AcceptNoAcademy, ActionButtons, AnswerCountSelector, ArticleCategorySelector, ArticleDialog, ArticleGroupView, BASE_URL, BRIEF_GRADE_OPTIONS, _ChapterBox as ChapterBox, ChatContainer, types as ChatTypes, ClassDetail, ClassList, ClassNoteDialog, ClassSelector, CommonDialog, ConfirmDeleteDialog, ConfirmDialog, CustomAsyncSelect, CustomCreatable, CustomPagination, CustomSelect, CustomSelectOption, DATE_MIN_VALUE, DATE_TIME_MIN_VALUE, DEFAULT_NOTE_FILTER, DEFAULT_PAGING_RESPONSE, DefaultErrorMessage, EXAM_CHANNEL, EXAM_STUDENT_CHANNEL, ExamDetailView, ExamEvent, ExamNoteDialog, ExamResultV2, ExamStatus, GOOGLE_CLIENT_ID, GOOGLE_RECAPTCHA_ID, GOOGLE_RECAPTCHA_KEY, GOOGLE_RECAPTCHA_SECRET, GRADE_OPTIONS, Header, InputText, LANGUAGE, LEARNING_SPACE, Language, LanguageHeaders, LayoutContext, ListView, Loading, LoadingComponent, Login, LoginQRCode, LoginWithEmail, SignIn as LoginWithPassword, MathJaxContainer, MathTinyEditor, NewNoteButton, NoAcademyHeaders, NotFound, NotesContainer, NotificationDetail, NotificationList, OrderBy, OrderType, PRE_REDIRECT_URL, PUSHER_CONFIG, PassCodeCheck, PassCodeDialog, PreparedItem, PreparedTextbookList, PreparedTextbookView, PreparedType, PrintContainerClassName, PrintContentClassName, PrintExamResultView, PrintExamView2, PrintHeaderClassName, PrintTitleClassName, QRCodeConfirmation, QuestionAnswerType, QuestionCountSelector, REDIRECT_URL, RELEASE_DATE, RecentUserAction, RecentUserActionNames, RecentUserActionSortBy, ReleaseAlert, Role, SUPER_ADMIN_BASE_URL, SchoolType, ScoreSelector, SearchInput, ShareToTeacherDialog, StudentSelector, SubjectSelector, TextbookActionButtons, TextbookViewDetail as TextbookDetail, TextbookDrawer, TextbookList, TheAcademyDropdown, TheLanguageDropdown, TinyEditor, UserList, UserSortColumn, VirtualListView, VirtualTableView, api, apiUpload, canAccess as canAccessRoute, checkSuperUrl, convertHHMMSStoSeconds, createRecentUserActionListApi, diffFromNow, ellipsisText, encodeParams, formatDataMyAnswer, formatDateTime, formatRole, formatTextbookDataMyAnswer, formatTime, formatTimeSecond, getAcademyDomain, getAccessToken, getErrorMessage, getLanguage, getLearningSpace, getLocalDayOfWeek, getOrdinalSuffix, getRecentUserActionListApi, getRedirectUrl, getRemainTime, getRole, getUtcDayOfWeek, i18n, isLocalHost, minutesToTimeSpan, pushTo, reset, setAcademies, setAcademy, setAlert, setConcurrentConnectionPusher, setLanguage, setLoading, setReFetchUserAcademies, setReadyRegisterPusher, setUser, store, timAgo, timeSpanToLocalMoment, toISOString, toLocalTime, totalSolveTimeCategories, totalTextbookSolveTimeCategories, useAutoAcademyDomain, useChatContainer, useCountDownTimer, useGoogleSignOut, useLanguage, useList, useLoadMore, useLogin, useNotes, usePusherConversation, useSwitchAcademy, useVirtualizeList, utcToLocalTime };
+export { ACADEMY_DOMAIN, ACCESS_TOKEN, AcademyHeaders, AcademyList, AcceptNoAcademy, ActionButtons, AnswerCountSelector, ArticleCategorySelector, ArticleDialog, ArticleGroupView, BASE_URL, BRIEF_GRADE_OPTIONS, _ChapterBox as ChapterBox, ChatContainer, types as ChatTypes, ClassDetail, ClassList, ClassNoteDialog, ClassSelector, CommonDialog, ConfirmDeleteDialog, ConfirmDialog, CustomAsyncSelect, CustomCreatable, CustomPagination, CustomSelect, CustomSelectOption, DATE_MIN_VALUE, DATE_TIME_MIN_VALUE, DEFAULT_NOTE_FILTER, DEFAULT_PAGING_RESPONSE, DefaultErrorMessage, EXAM_CHANNEL, EXAM_STUDENT_CHANNEL, ExamDetailView, ExamEvent, ExamNoteDialog, ExamResultV2, ExamStatus, GOOGLE_CLIENT_ID, GOOGLE_RECAPTCHA_ID, GOOGLE_RECAPTCHA_KEY, GOOGLE_RECAPTCHA_SECRET, GRADE_OPTIONS, Header, InputText, LANGUAGE, LEARNING_SPACE, Language, LanguageHeaders, LayoutContext, ListView, Loading, LoadingComponent, Login, LoginQRCode, LoginWithEmail, SignIn as LoginWithPassword, MathJaxContainer, MathTinyEditor, NewNoteButton, NoAcademyHeaders, NotFound, NoteType, NotesContainer, NotificationDetail, NotificationList, OrderBy, OrderType, PRE_REDIRECT_URL, PUSHER_CONFIG, PassCodeCheck, PassCodeDialog, PreparedItem, PreparedTextbookList, PreparedTextbookView, PreparedType, PrintContainerClassName, PrintContentClassName, PrintExamResultView, PrintExamView2, PrintHeaderClassName, PrintTitleClassName, QRCodeConfirmation, QuestionAnswerType, QuestionCountSelector, REDIRECT_URL, RELEASE_DATE, RecentUserAction, RecentUserActionNames, RecentUserActionSortBy, ReleaseAlert, Role, SUPER_ADMIN_BASE_URL, SchoolType$1 as SchoolType, ScoreSelector, SearchInput, ShareToTeacherDialog, StudentSelector, SubjectSelector, TextbookActionButtons, TextbookViewDetail as TextbookDetail, TextbookDrawer, TextbookEditorType, TextbookList, TheAcademyDropdown, TheLanguageDropdown, TinyEditor, UserList, UserSortColumn, VirtualListView, VirtualTableView, api, apiUpload, canAccess as canAccessRoute, checkSuperUrl, convertHHMMSStoSeconds, createRecentUserActionListApi, diffFromNow, ellipsisText, encodeParams, formatDataMyAnswer, formatDateTime, formatRole, formatTextbookDataMyAnswer, formatTime, formatTimeSecond, getAcademyDomain, getAccessToken, getErrorMessage, getLanguage, getLearningSpace, getLocalDayOfWeek, getOrdinalSuffix, getRecentUserActionListApi, getRedirectUrl, getRemainTime, getRole, getUtcDayOfWeek, i18n, isLocalHost, minutesToTimeSpan, pushTo, reset, setAcademies, setAcademy, setAlert, setConcurrentConnectionPusher, setLanguage, setLoading, setReFetchUserAcademies, setReadyRegisterPusher, setUser, store, timAgo, timeSpanToLocalMoment, toISOString, toLocalTime, totalSolveTimeCategories, totalTextbookSolveTimeCategories, useAutoAcademyDomain, useChatContainer, useCountDownTimer, useGoogleSignOut, useLanguage, useList, useLoadMore, useLogin, useNotes, usePusherConversation, useSwitchAcademy, useVirtualizeList, utcToLocalTime };
 //# sourceMappingURL=index.modern.js.map