touchstudy-core 0.1.144 → 0.1.146

package/dist/index.js

@@ -21,7 +21,7 @@ var Select = require('react-select');
 var Select__default = _interopDefault(Select);
 var CreatableSelect = _interopDefault(require('react-select/creatable'));
 var axios = _interopDefault(require('axios'));
-var _$5 = _interopDefault(require('lodash'));
+var _$6 = _interopDefault(require('lodash'));
 var reactGoogleLogin = require('@leecheuk/react-google-login');
 require('moment/locale/ko.js');
 require('moment/locale/en-au.js');
@@ -1461,6 +1461,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,
@@ -2559,7 +2563,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";
@@ -3681,6 +3689,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,
@@ -4781,7 +4793,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__default.use(reactI18next.initReactI18next).init({
@@ -6151,6 +6167,41 @@ function _finally(body, finalizer) {
   UserSortColumn["Grade"] = "Grade";
 })(exports.UserSortColumn || (exports.UserSortColumn = {}));
 
+var NoteSortColumn;
+(function (NoteSortColumn) {
+  NoteSortColumn["Content"] = "Content";
+  NoteSortColumn["CreatedAt"] = "CreatedAt";
+  NoteSortColumn["Question"] = "Question";
+})(NoteSortColumn || (NoteSortColumn = {}));
+(function (NoteType) {
+  NoteType[NoteType["Default"] = 0] = "Default";
+  NoteType[NoteType["StudentReadable"] = 1] = "StudentReadable";
+})(exports.NoteType || (exports.NoteType = {}));
+
+var SchoolType;
+(function (SchoolType) {
+  SchoolType[SchoolType["Default"] = 0] = "Default";
+  SchoolType[SchoolType["Elementary"] = 1] = "Elementary";
+  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 = {}));
+(function (TextbookEditorType) {
+  TextbookEditorType[TextbookEditorType["Default"] = 0] = "Default";
+  TextbookEditorType[TextbookEditorType["Korea"] = 1] = "Korea";
+  TextbookEditorType[TextbookEditorType["Math"] = 2] = "Math";
+})(exports.TextbookEditorType || (exports.TextbookEditorType = {}));
+
 (function (SchoolType) {
   SchoolType[SchoolType["Default"] = 0] = "Default";
   SchoolType[SchoolType["Elementary"] = 1] = "Elementary";
@@ -6330,7 +6381,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();
@@ -6827,7 +6878,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,
@@ -7763,11 +7814,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(material.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",
@@ -7779,11 +7832,11 @@ var SearchInput = function SearchInput(_ref) {
           return theme.palette.primary.main;
         }
       }
-    }
+    }, sx)
   }, React__default.createElement(material.Box, {
-    sx: {
+    sx: _extends({
       p: "10px"
-    },
+    }, searchSx),
     "aria-label": "search"
   }, React__default.createElement(io5.IoSearch, {
     size: 24,
@@ -10684,6 +10737,8 @@ var useLoginPhoneNumber = function useLoginPhoneNumber(props) {
   var _useState5 = React.useState(false),
     refreshReCaptcha = _useState5[0],
     setRefreshReCaptcha = _useState5[1];
+  var passwordRef = React.useRef(null);
+  var submitBtnRef = React.useRef(null);
   var dispatch = reactRedux.useDispatch();
   var handleClickShowPassword = function handleClickShowPassword() {
     setShowPassword(!showPassword);
@@ -10741,6 +10796,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,
@@ -10748,6 +10815,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,
@@ -10764,6 +10835,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,
@@ -10797,8 +10872,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(material.TextField, {
+    inputRef: passwordRef,
     label: t("password"),
     type: showPassword ? "text" : "password",
     fullWidth: true,
@@ -10825,12 +10902,14 @@ var LoginPhone = function LoginPhone(props) {
     size: "small",
     value: password,
     onChange: handleChangePassword,
+    onKeyDown: handlePasswordKeyDown,
     InputLabelProps: {
       style: {
         color: "#349056"
       }
     }
   }), React__default.createElement(material.Button, {
+    ref: submitBtnRef,
     variant: "outlined",
     sx: {
       color: "#349056"
@@ -11214,13 +11293,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
@@ -12619,7 +12691,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"));
@@ -12655,7 +12727,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"));
@@ -12690,11 +12762,11 @@ var ClassForm = function ClassForm(_ref) {
   }, [JSON.stringify(data)]);
   var minDate = React.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 = React.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"
@@ -12711,7 +12783,7 @@ var ClassForm = function ClassForm(_ref) {
     });
   }, [JSON.stringify(formikProp.values.courseWeeklyDays)]);
   var courseWeeklyDays = React.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"
@@ -12862,7 +12934,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);
       },
@@ -12892,7 +12964,7 @@ var ClassForm = function ClassForm(_ref) {
       components: ["TimePicker"]
     }, React__default.createElement(xDatePickers.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) {
@@ -13517,7 +13589,7 @@ var useStudentClassList = function useStudentClassList(courseId) {
       currentPage: 1
     }));
   };
-  var debounceSearch = _$5.debounce(function () {
+  var debounceSearch = _$6.debounce(function () {
     setFilter(_extends({}, filter, {
       currentPage: 1
     }));
@@ -13653,7 +13725,7 @@ var useTeacherClassList = function useTeacherClassList(courseId) {
       currentPage: 1
     }));
   };
-  var debounceSearch = _$5.debounce(function () {
+  var debounceSearch = _$6.debounce(function () {
     setFilter(_extends({}, filter, {
       currentPage: 1
     }));
@@ -13961,7 +14033,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),
@@ -14210,13 +14282,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
     }));
@@ -14234,7 +14306,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() {
@@ -14269,7 +14341,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
@@ -14347,8 +14419,8 @@ var LessonFormBody = function LessonFormBody(_ref) {
   React.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(React.Fragment, null, React__default.createElement(material.DialogContent, {
     sx: {
       overflowY: "unset"
@@ -14928,7 +15000,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
     }));
@@ -17371,13 +17443,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: exports.OrderType.DESC,
   sortColumnName: NoteSortColumn.CreatedAt,
@@ -19613,6 +19678,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 = reactI18next.useTranslation(),
@@ -19656,7 +19722,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, {
+  }, t(selectedNote ? "edit_student_note" : "student_note_taking"), tip)), React__default.createElement(IconButton, {
     "aria-label": "close",
     sx: {
       position: "absolute",
@@ -20028,7 +20094,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);
         });
@@ -20051,7 +20117,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) {
@@ -20082,6 +20148,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,
@@ -20092,6 +20159,11 @@ var NoteItem = function NoteItem(_ref) {
     onLoad = _ref.onLoad;
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
+  var user = reactRedux.useSelector(function (state) {
+    var _state$common;
+    return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.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(exports.Role.Admin));
   var handleMoreClick = function handleMoreClick(e) {
     e.preventDefault();
     e.stopPropagation();
@@ -20114,7 +20186,7 @@ var NoteItem = function NoteItem(_ref) {
     gap: 1
   }, React__default.createElement(material.Typography, Object.assign({}, NoteItemStyles.text.left), data.examSessionId ? t("article") + " " + data.articleNumber : "" + data.fullName), React__default.createElement(material.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(material.Typography, Object.assign({}, NoteItemStyles.text.right), data.categoryName)), React__default.createElement(material.Typography, Object.assign({}, NoteItemStyles.contentText), data.content)), React__default.createElement(material.Box, null, React__default.createElement(material.ClickAwayListener, {
+  }) : "" + utcToLocalTime(data.createdAt, t("date_format") + " HH:mm")), data.examSessionId && React__default.createElement(material.Typography, Object.assign({}, NoteItemStyles.text.right), data.categoryName)), React__default.createElement(material.Typography, Object.assign({}, NoteItemStyles.contentText), data.content)), React__default.createElement(material.Box, null, (isAdmin || data.isOwned) && React__default.createElement(material.ClickAwayListener, {
     onClickAway: onClose
   }, React__default.createElement(material.Box, null, React__default.createElement(CustomTooltip, {
     onClose: onClose,
@@ -20512,7 +20584,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) {
@@ -20522,7 +20594,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) {
@@ -22778,7 +22850,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() {
@@ -22936,7 +23008,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
     }));
@@ -24192,8 +24264,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: exports.QuestionAnswerType.SingleChoice,
@@ -24241,7 +24313,7 @@ var useExamDetailView = function useExamDetailView(props) {
   var examGroupByArticle = React.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;
@@ -24251,13 +24323,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 = React.useMemo(function () {
     var options = DURATION_OPTIONS.map(function (i) {
@@ -26678,11 +26750,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) {
@@ -26690,7 +26762,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) {
@@ -26949,7 +27021,7 @@ var TextbookList = function TextbookList(props) {
     handleUpdateSharedTextbook = _useTextbookShare.handleUpdateSharedTextbook,
     currentModel = _useTextbookShare.currentModel;
   var textbookHeaders = React.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"
     });
@@ -27544,7 +27616,7 @@ var useNotificationList = function useNotificationList(_ref) {
       currentPage: 1
     }));
   };
-  var debounceSearch = _$5.debounce(function () {
+  var debounceSearch = _$6.debounce(function () {
     setNotificationFilter(_extends({}, notificationFilter, {
       currentPage: 1
     }));
@@ -27970,31 +28042,6 @@ var useTextbookManagement = function useTextbookManagement(_ref) {
   };
 };
 
-var SchoolType;
-(function (SchoolType) {
-  SchoolType[SchoolType["Default"] = 0] = "Default";
-  SchoolType[SchoolType["Elementary"] = 1] = "Elementary";
-  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 TextbookSortBy$1;
 (function (TextbookSortBy) {
   TextbookSortBy["Name"] = "Name";
@@ -28147,6 +28194,12 @@ var preparedTextbookSchema = function preparedTextbookSchema(t) {
       }),
       name: yup.string().required(t("name_required")),
       questionGroups: yup.array().of(yup.object().shape({
+        pageFrom: yup.number().notRequired().integer().notRequired().min(1, t("min_is_1")),
+        pageTo: yup.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: yup.array().of(yup.object().shape({
           categories: yup.array().of(yup.number()).min(1, t("category_required")),
           title: yup.string().notRequired(),
@@ -28168,12 +28221,18 @@ var preparedTextbookSchema = function preparedTextbookSchema(t) {
       subChapters: yup.array().of(yup.object().shape({
         pageFrom: yup.number().required(t("page_from_required")).integer().typeError(t("must_be_number")).min(1, t("min_is_1")),
         pageTo: yup.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: yup.string().required(t("name_required")),
         questionGroups: yup.array().of(yup.object().shape({
+          pageFrom: yup.number().notRequired().integer().notRequired().min(1, t("min_is_1")),
+          pageTo: yup.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: yup.array().of(yup.object().shape({
             categories: yup.array().of(yup.number()).min(1, t("category_required")),
             title: yup.string().notRequired(),
@@ -28210,7 +28269,7 @@ var DEFAULT_TEXTBOOK_REQUEST = {
   grade: "",
   textbookOwners: [],
   isPrepared: true,
-  type: TextbookEditorType.Korea
+  type: exports.TextbookEditorType.Korea
 };
 var DEFAULT_CHAPTER = {
   name: "",
@@ -28261,7 +28320,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)) {
@@ -28276,7 +28335,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;
@@ -28338,6 +28397,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, {
@@ -28381,6 +28442,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, {
@@ -28424,9 +28487,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,
@@ -28460,13 +28535,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(material.Stack, {
     direction: "row",
     alignItems: "center",
@@ -28518,7 +28602,7 @@ var ArticleBlock = function ArticleBlock(_ref) {
   }, t("category")), React__default.createElement(formik.Field, {
     name: path + ".categories[0]",
     render: function render() {
-      var _data$categoryOptions;
+      var _data$categoryOptions2;
       return React__default.createElement(ArticleCategorySelector, {
         style: {
           "div:has(&)": {
@@ -28526,7 +28610,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,
@@ -28538,7 +28622,13 @@ var ArticleBlock = function ArticleBlock(_ref) {
         placeholder: t("select_category")
       });
     }
-  }))), React__default.createElement(material.Grid, {
+  }), !!categoryError && React__default.createElement(material.Typography, {
+    fontWeight: 500,
+    fontSize: "10px",
+    lineHeight: "11.93px",
+    mt: 1,
+    color: !categoryError ? "#97A1AF" : "#F34B4B"
+  }, categoryError))), React__default.createElement(material.Grid, {
     item: true,
     xs: 12 / 5
   }, React__default.createElement(material.FormGroup, {
@@ -28555,7 +28645,7 @@ var ArticleBlock = function ArticleBlock(_ref) {
   }, t("sub_category")), React__default.createElement(formik.Field, {
     name: path + ".categories[1]",
     render: function render() {
-      var _data$categoryOptions2;
+      var _data$categoryOptions3;
       return React__default.createElement(ArticleCategorySelector, {
         style: {
           "div:has(&)": {
@@ -28563,7 +28653,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,
@@ -28668,7 +28758,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 = React.memo(ArticleBlock, isEqual);
 
@@ -28954,10 +29046,10 @@ var isEqual$1 = function isEqual(prev, next) {
 };
 var QuestionBlock$1 = React.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,
@@ -28968,6 +29060,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,
@@ -28976,14 +29069,30 @@ var QuestionGroupBlockBody = function QuestionGroupBlockBody(_ref) {
     onOpenQuestionTypeMenu = _ref.onOpenQuestionTypeMenu,
     formikProps = _objectWithoutPropertiesLoose(_ref, _excluded$g);
   var errors = formikProps.errors;
-  var theme = material.useTheme();
+  var startOrderRef = React.useRef(null);
   var articles = data.articles,
     questions = data.questions;
-  var blockErrors = _.get(errors, path);
+  var blockErrors = _$1.get(errors, path);
   var handleOpenQuestionTypeMenu = React.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);
+  };
+  React.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(formik.FieldArray, {
     name: path + ".articles",
     render: function render(arrayHelpers) {
@@ -28997,7 +29106,7 @@ var QuestionGroupBlockBody = function QuestionGroupBlockBody(_ref) {
         gap: 2
       }, !isMath && React__default.createElement(material.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,
@@ -29035,7 +29144,20 @@ var QuestionGroupBlockBody = function QuestionGroupBlockBody(_ref) {
       }, i18n.t("article")))), React__default.createElement(material.Stack, {
         gap: 1,
         direction: "column"
-      }, React__default.createElement(ListView, {
+      }, React__default.createElement(material.Box, null, React__default.createElement(material.FormControl, {
+        sx: {
+          display: "flex",
+          flexDirection: "row",
+          alignItems: "center",
+          gap: 1
+        }
+      }, React__default.createElement(material.FormLabel, null, i18n.t("start_order")), React__default.createElement(material.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({
@@ -29061,8 +29183,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;
@@ -29082,9 +29204,9 @@ var isEqual$2 = function isEqual(prev, next) {
 var QuestionGroupBlockBody$1 = React.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,
@@ -29129,6 +29251,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);
@@ -29172,16 +29304,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) {
@@ -29189,12 +29329,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(material.Accordion, {
     expanded: open,
     onChange: handleToggle,
     sx: {
-      border: "1.5px solid " + (blockErrors ? open ? error.main : error.light : open ? colors.yellow[900] : colors.yellow[500])
+      border: (open ? "5px" : "1.5px") + " solid " + (blockErrors ? open ? error.main : error.light : open ? colors.yellow[900] : colors.yellow[500])
     }
   }, React__default.createElement(material.AccordionSummary, {
     expandIcon: React__default.createElement(md.MdExpandMore, {
@@ -29228,24 +29371,28 @@ var QuestionGroupBlock = function QuestionGroupBlock(_ref) {
     whiteSpace: "nowrap"
   }, title, !open && ":")), React__default.createElement(material.Box, {
     sx: {
-      flexGrow: 1
+      flexGrow: 1,
+      cursor: "default"
+    },
+    onClick: function onClick(e) {
+      open && e.stopPropagation();
     }
   }, open ? React__default.createElement(material.Stack, {
-    direction: "row",
-    flexWrap: "nowrap",
+    direction: "column",
     gap: 2
+  }, React__default.createElement(material.Stack, {
+    direction: "row",
+    flexWrap: "nowrap"
   }, React__default.createElement(material.Grid, {
     container: true,
     flexGrow: 1,
-    direction: "row",
-    flexWrap: "nowrap",
-    gap: 2
+    direction: "row"
   }, React__default.createElement(material.Grid, {
     item: true,
     xs: 3
   }, React__default.createElement(material.FormGroup, {
-    onClick: function onClick(e) {
-      open && e.stopPropagation();
+    sx: {
+      marginRight: 2
     }
   }, React__default.createElement(material.FormLabel, {
     htmlFor: "question_count",
@@ -29267,10 +29414,8 @@ var QuestionGroupBlock = function QuestionGroupBlock(_ref) {
       maxWidth: "100%",
       "& div": {
         maxWidth: "100%"
-      }
-    },
-    onClick: function onClick(e) {
-      open && e.stopPropagation();
+      },
+      marginRight: 2
     }
   }, React__default.createElement(material.FormLabel, {
     htmlFor: "category",
@@ -29298,7 +29443,13 @@ var QuestionGroupBlock = function QuestionGroupBlock(_ref) {
         placeholder: t("select_category")
       });
     }
-  }))), isMath && React__default.createElement(material.Grid, {
+  }), !!categoryError && React__default.createElement(material.Typography, {
+    fontWeight: 500,
+    fontSize: "10px",
+    lineHeight: "11.93px",
+    mt: 1,
+    color: !categoryError ? "#97A1AF" : "#F34B4B"
+  }, categoryError))), isMath && React__default.createElement(material.Grid, {
     item: true,
     xs: 3
   }, React__default.createElement(material.FormGroup, {
@@ -29306,10 +29457,8 @@ var QuestionGroupBlock = function QuestionGroupBlock(_ref) {
       maxWidth: "100%",
       "& div": {
         maxWidth: "100%"
-      }
-    },
-    onClick: function onClick(e) {
-      open && e.stopPropagation();
+      },
+      marginRight: 2
     }
   }, React__default.createElement(material.FormLabel, {
     htmlFor: "category",
@@ -29317,7 +29466,7 @@ var QuestionGroupBlock = function QuestionGroupBlock(_ref) {
   }, t("sub_category")), React__default.createElement(formik.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: {
@@ -29335,7 +29484,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")
       });
     }
@@ -29345,6 +29494,9 @@ var QuestionGroupBlock = function QuestionGroupBlock(_ref) {
   }, React__default.createElement(material.FormGroup, {
     onClick: function onClick(e) {
       open && e.stopPropagation();
+    },
+    sx: {
+      marginRight: 2
     }
   }, React__default.createElement(material.FormLabel, {
     htmlFor: "question_count",
@@ -29358,12 +29510,67 @@ var QuestionGroupBlock = function QuestionGroupBlock(_ref) {
         isDisabled: disabled
       }));
     }
-  })))), isMath && React__default.createElement(material.Box, {
+  }))), !isMath && React__default.createElement(material.Grid, {
+    item: true,
+    xs: 3
+  }, React__default.createElement(material.FormGroup, {
+    sx: {
+      marginRight: 2
+    }
+  }, React__default.createElement(material.FormLabel, {
+    htmlFor: "question_count",
+    className: "form-label"
+  }, t("page_from")), React__default.createElement(formik.Field, {
+    name: path + ".pageFrom",
+    render: function render(_ref6) {
+      var field = _ref6.field;
+      return React__default.createElement(material.TextField, Object.assign({
+        placeholder: t("page_from"),
+        type: "number"
+      }, field, {
+        size: "small",
+        onKeyDown: handleKeyDown,
+        disabled: disabled
+      }));
+    }
+  }), !!pageFromError && React__default.createElement(material.Typography, {
+    fontWeight: 500,
+    fontSize: "10px",
+    lineHeight: "11.93px",
+    mt: 1,
+    color: !pageFromError ? "#97A1AF" : "#F34B4B"
+  }, pageFromError))), !isMath && React__default.createElement(material.Grid, {
+    item: true,
+    xs: 3
+  }, React__default.createElement(material.FormGroup, {
+    sx: {
+      marginRight: 2
+    }
+  }, React__default.createElement(material.FormLabel, {
+    htmlFor: "question_count",
+    className: "form-label"
+  }, t("page_to")), React__default.createElement(formik.Field, {
+    name: path + ".pageTo",
+    render: function render(_ref7) {
+      var field = _ref7.field;
+      return React__default.createElement(material.TextField, Object.assign({
+        placeholder: t("page_to"),
+        type: "number"
+      }, field, {
+        size: "small",
+        onKeyDown: handleKeyDown,
+        disabled: disabled
+      }));
+    }
+  }), !!pageToError && React__default.createElement(material.Typography, {
+    fontWeight: 500,
+    fontSize: "10px",
+    lineHeight: "11.93px",
+    mt: 1,
+    color: !pageToError ? "#97A1AF" : "#F34B4B"
+  }, pageToError)))), isMath && React__default.createElement(material.Box, {
     sx: {
       display: "flex"
-    },
-    onClick: function onClick(e) {
-      open && e.stopPropagation();
     }
   }, React__default.createElement(material.Button, {
     variant: "contained",
@@ -29373,7 +29580,84 @@ var QuestionGroupBlock = function QuestionGroupBlock(_ref) {
     sx: {
       whiteSpace: "nowrap"
     }
-  }, t("category_copy")))) : React__default.createElement(material.Typography, {
+  }, t("category_copy")))), isMath && React__default.createElement(material.Stack, {
+    direction: "row",
+    flexWrap: "nowrap"
+  }, React__default.createElement(material.Grid, {
+    container: true,
+    flexGrow: 1,
+    direction: "row"
+  }, React__default.createElement(material.Grid, {
+    item: true,
+    xs: 3
+  }, React__default.createElement(material.FormGroup, {
+    sx: {
+      marginRight: 2
+    }
+  }, React__default.createElement(material.FormLabel, {
+    htmlFor: "question_count",
+    className: "form-label"
+  }, t("page_from")), React__default.createElement(formik.Field, {
+    name: path + ".pageFrom",
+    render: function render(_ref8) {
+      var field = _ref8.field;
+      return React__default.createElement(material.TextField, Object.assign({
+        placeholder: t("page_from"),
+        type: "number"
+      }, field, {
+        size: "small",
+        onKeyDown: handleKeyDown,
+        disabled: disabled
+      }));
+    }
+  }), !!pageFromError && React__default.createElement(material.Typography, {
+    fontWeight: 500,
+    fontSize: "10px",
+    lineHeight: "11.93px",
+    mt: 1,
+    color: !pageFromError ? "#97A1AF" : "#F34B4B"
+  }, pageFromError))), React__default.createElement(material.Grid, {
+    item: true,
+    xs: 3
+  }, React__default.createElement(material.FormGroup, {
+    sx: {
+      marginRight: 2
+    }
+  }, React__default.createElement(material.FormLabel, {
+    htmlFor: "question_count",
+    className: "form-label"
+  }, t("page_to")), React__default.createElement(formik.Field, {
+    name: path + ".pageTo",
+    render: function render(_ref9) {
+      var field = _ref9.field;
+      return React__default.createElement(material.TextField, Object.assign({
+        placeholder: t("page_to"),
+        type: "number"
+      }, field, {
+        size: "small",
+        onKeyDown: handleKeyDown,
+        disabled: disabled
+      }));
+    }
+  }), !!pageToError && React__default.createElement(material.Typography, {
+    fontWeight: 500,
+    fontSize: "10px",
+    lineHeight: "11.93px",
+    mt: 1,
+    color: !pageToError ? "#97A1AF" : "#F34B4B"
+  }, pageToError)))), React__default.createElement(material.Box, {
+    sx: {
+      display: "flex",
+      visibility: "hidden"
+    }
+  }, React__default.createElement(material.Button, {
+    variant: "contained",
+    color: "success",
+    disabled: true,
+    sx: {
+      whiteSpace: "nowrap"
+    }
+  }, t("category_copy"))))) : React__default.createElement(material.Typography, {
     fontWeight: 600,
     sx: {
       overflow: "hidden",
@@ -29395,6 +29679,7 @@ var QuestionGroupBlock = function QuestionGroupBlock(_ref) {
     isLoadingQuestionTypes: isLoadingQuestionTypes,
     optionKey: optionKey,
     disabled: disabled,
+    onQuestioStartOrderChange: handleChangeStartQuestionOrder,
     onDelete: onDelete,
     onOpenSubCategoryMenu: onOpenSubCategoryMenu,
     onOpenCategoryMenu: onOpenCategoryMenu,
@@ -29461,6 +29746,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
@@ -29473,7 +29759,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, {
@@ -29481,14 +29767,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, {
@@ -29496,7 +29782,7 @@ var ChapterBlockBody = function ChapterBlockBody(_ref) {
             });
           })
         });
-      }));
+      }) : nextQuestionGroups);
     }
     setFieldValue(path + ".questionGroups", newQuestionGroups);
   };
@@ -29603,7 +29889,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,
@@ -29643,10 +29929,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(material.Accordion, {
     expanded: open,
     onChange: handleToggle,
@@ -29930,7 +30216,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);
@@ -29939,7 +30227,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);
@@ -29948,7 +30238,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);
@@ -29988,7 +30280,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];
@@ -30138,12 +30430,12 @@ 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,
     setFieldValue = props.setFieldValue;
-  var isMath = values.type === TextbookEditorType.Math;
+  var isMath = values.type === exports.TextbookEditorType.Math;
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
   var _useState = React.useState(""),
@@ -30181,7 +30473,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;
     }));
@@ -30221,12 +30513,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 = React.useCallback(function (key, categoryId) {
     setOptionKey(key);
@@ -30718,7 +31010,7 @@ var useSelect = function useSelect(_ref) {
     setLoading = _useState2[1];
   React.useEffect(function () {
     if (!email || !academy) return;
-    var fetchData = _$5.debounce(function () {
+    var fetchData = _$6.debounce(function () {
       try {
         var _temp2 = function _temp2() {
           setLoading(false);
@@ -30832,7 +31124,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,
@@ -30905,12 +31197,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(material.Typography, {
+        }), _$5.get(errors, "textbookOwners[" + index + "].email") && React__default.createElement(material.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,
@@ -30982,7 +31274,7 @@ var PreparedTextbookForm = function PreparedTextbookForm(_ref) {
     };
   }, [dirty, i18n.t]);
   var handleChangeTextbookType = function handleChangeTextbookType() {
-    var isMath = values.type === TextbookEditorType.Math ? TextbookEditorType.Korea : TextbookEditorType.Math;
+    var isMath = values.type === exports.TextbookEditorType.Math ? exports.TextbookEditorType.Korea : exports.TextbookEditorType.Math;
     var newValues = _reduceToMathArticles(values, isMath);
     setValues(newValues);
   };
@@ -31052,23 +31344,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(material.Stack, {
     flexDirection: "column",
-    justifyContent: "center",
     gap: 1
   }, React__default.createElement("label", {
+    htmlFor: "hidden",
+    style: {
+      visibility: "hidden"
+    }
+  }, "hidden"), React__default.createElement(material.Stack, {
+    flexDirection: "row",
+    justifyContent: "center",
+    alignItems: "center",
+    gap: 1
+  }, React__default.createElement(material.FormLabel, {
     htmlFor: "type",
     className: "text-center"
-  }, i18n.t(values.type !== 2 ? "korea" : "math")), React__default.createElement(formik.Field, {
+  }, i18n.t("korea")), React__default.createElement(formik.Field, {
     name: "type",
     render: function render(_ref4) {
       var field = _ref4.field;
       return React__default.createElement(material.Switch, Object.assign({}, field, {
         color: "success",
         disabled: !!textbookId || disabled,
-        checked: values.type === 2,
+        checked: values.type === exports.TextbookEditorType.Math,
         onChange: handleChangeTextbookType
       }));
     }
-  }))), React__default.createElement(material.Box, null, React__default.createElement(material.Button, {
+  }), React__default.createElement(material.FormLabel, {
+    htmlFor: "type",
+    className: "text-center"
+  }, i18n.t("math"))))), React__default.createElement(material.Box, null, React__default.createElement(material.Button, {
     type: "submit",
     sx: {
       width: "fit-content"
@@ -31076,7 +31380,7 @@ var PreparedTextbookForm = function PreparedTextbookForm(_ref) {
     variant: "contained",
     disabled: disabled,
     onClick: function onClick() {
-      if (!_$5.isEmpty(errors)) {
+      if (!_$6.isEmpty(errors)) {
         reactToastify.toast.error(i18n.t("please_fill_in_the_blank_fields"));
       }
     },
@@ -31843,7 +32147,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
     }));
@@ -32169,20 +32473,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
+          });
         });
       }
     });
@@ -32865,7 +33190,7 @@ var TextbookDrawer = function TextbookDrawer(_ref) {
   }), React__default.createElement(material.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"
     }
@@ -33552,7 +33877,7 @@ var PreparedItem = function PreparedItem(_ref) {
     });
     return React__default.createElement(formik.Form, {
       style: {
-        height: !_$5.isEmpty(values) && !textbookList.length ? "100%" : "unset"
+        height: !_$6.isEmpty(values) && !textbookList.length ? "100%" : "unset"
       }
     }, React__default.createElement(material.Stack, null, React__default.createElement(material.Accordion, {
       sx: {
@@ -33958,7 +34283,7 @@ var PreparedItem = function PreparedItem(_ref) {
       open: openConfirmDialog,
       onClose: handleCloseConfirmDialog,
       onSubmit: handleResetFilter
-    }), !_$5.isEmpty(values) && !textbookList.length && React__default.createElement(material.Stack, {
+    }), !_$6.isEmpty(values) && !textbookList.length && React__default.createElement(material.Stack, {
       height: 1,
       justifyContent: "center",
       alignItems: "center"