touchstudy-core 0.1.90 → 0.1.92

package/dist/containers/ExamResult/configs/types.d.ts

@@ -74,8 +74,11 @@ export declare type ExamResult = {
     totalStudent: number;
     totalTime: any;
     type: string;
-    courseId?: number;
-    courseName?: string;
+    courses?: CourtInfo[];
+};
+export declare type CourtInfo = {
+    id: number;
+    name: string;
 };
 export declare type EffectSize = {
     id: number;

package/dist/index.js

@@ -1228,9 +1228,7 @@ var useLanguage = function useLanguage(history) {
     moment.locale(languageItem.momentLangCode);
     localStorage.setItem(LANGUAGE, languageItem.code);
     dispatch(setLanguage(languageItem.code));
-    if (window.location.pathname === LOGIN_URL) {
-      if (RELEASE_DATE) return;else searchParams["delete"]("lang");
-    } else searchParams.set("lang", languageItem.code);
+    if (window.location.pathname === LOGIN_URL) searchParams["delete"]("lang");else searchParams.set("lang", languageItem.code);
     pushTo(history, _extends({}, window.location, {
       search: searchParams.toString()
     }), true);
@@ -2253,6 +2251,7 @@ var weekly_day = "주간";
 var weekly_days = "주간";
 var enter_class_name = "수업 이름을 입력하세요";
 var class_required = "수업 이름은 필수 항목입니다";
+var class_name_must_be_at_least_N_characters = "클래스 이름은 {{length}}자 이상이어야 합니다";
 var total_teachers = "총 교사 수";
 var start_date_required = "시작일은 필수 항목입니다";
 var end_date_required = "종료일은 필수 항목입니다";
@@ -2490,6 +2489,7 @@ var manage_textbooks = "교과서 관리";
 var my_question = "내 질문";
 var update_class = "수업 업데이트";
 var create_class = "수업 만들기";
+var view_class = "수업 보기";
 var problem_number = "문제 번호";
 var answer = "정답";
 var correct = "정답";
@@ -2660,6 +2660,7 @@ var update_exam_successfully = "시험을 성공적으로 업데이트했습니
 var create_exam_successfully = "시험을 성공적으로 만들었습니다.";
 var create_notification = "알림 생성";
 var update_notification = "업데이트 알림";
+var view_notification = "알림 보기";
 var new_notification = "새로운 알림";
 var are_you_sure_to_delete_notification = "알림을 삭제하시겠습니까:";
 var answer_list = "답변 목록";
@@ -3066,6 +3067,7 @@ var lang_ko = {
 	weekly_days: weekly_days,
 	enter_class_name: enter_class_name,
 	class_required: class_required,
+	class_name_must_be_at_least_N_characters: class_name_must_be_at_least_N_characters,
 	total_teachers: total_teachers,
 	start_date_required: start_date_required,
 	end_date_required: end_date_required,
@@ -3289,6 +3291,7 @@ var lang_ko = {
 	my_question: my_question,
 	update_class: update_class,
 	create_class: create_class,
+	view_class: view_class,
 	problem_number: problem_number,
 	answer: answer,
 	correct: correct,
@@ -3464,6 +3467,7 @@ var lang_ko = {
 	create_exam_successfully: create_exam_successfully,
 	create_notification: create_notification,
 	update_notification: update_notification,
+	view_notification: view_notification,
 	new_notification: new_notification,
 	are_you_sure_to_delete_notification: are_you_sure_to_delete_notification,
 	answer_list: answer_list,
@@ -3870,6 +3874,7 @@ var weekly_day$1 = "Weekly day";
 var weekly_days$1 = "Weekly days";
 var enter_class_name$1 = "Enter class name";
 var class_required$1 = "Class name is required";
+var class_name_must_be_at_least_N_characters$1 = "Class name must be at least {{length}} characters";
 var total_teachers$1 = "Total teachers";
 var start_date_required$1 = "Start date is required";
 var end_date_required$1 = "End date is required";
@@ -4125,6 +4130,7 @@ var teachers$1 = "Teachers";
 var lessons$1 = "Lessons";
 var update_class$1 = "Update class";
 var create_class$1 = "Create class";
+var view_class$1 = "View class";
 var new_test$1 = "New Test";
 var manage_saved_exams$1 = "Manage saved exams";
 var manage_textbooks$1 = "Manage Textbooks";
@@ -4294,6 +4300,7 @@ var update_exam_successfully$1 = "Update exam successfully";
 var create_exam_successfully$1 = "Create exam successfully";
 var create_notification$1 = "Create Notification";
 var update_notification$1 = "Update Notification";
+var view_notification$1 = "View Notification";
 var new_notification$1 = "New Notification";
 var are_you_sure_to_delete_notification$1 = "Are you sure to delete notification:";
 var answer_list$1 = "Answer List";
@@ -4528,7 +4535,7 @@ var delete_action$1 = "Delete";
 var edit_action$1 = "Edit";
 var view_action$1 = "View";
 var de_select$1 = "Deselect";
-var select_output$1 = "Select output";
+var select_output$1 = "Select";
 var print_pdf$1 = "Print PDF";
 var completed$1 = "Completed";
 var in_progress$1 = "In Progress";
@@ -4684,6 +4691,7 @@ var lang_en = {
 	weekly_days: weekly_days$1,
 	enter_class_name: enter_class_name$1,
 	class_required: class_required$1,
+	class_name_must_be_at_least_N_characters: class_name_must_be_at_least_N_characters$1,
 	total_teachers: total_teachers$1,
 	start_date_required: start_date_required$1,
 	end_date_required: end_date_required$1,
@@ -4925,6 +4933,7 @@ var lang_en = {
 	lessons: lessons$1,
 	update_class: update_class$1,
 	create_class: create_class$1,
+	view_class: view_class$1,
 	new_test: new_test$1,
 	manage_saved_exams: manage_saved_exams$1,
 	manage_textbooks: manage_textbooks$1,
@@ -5099,6 +5108,7 @@ var lang_en = {
 	create_exam_successfully: create_exam_successfully$1,
 	create_notification: create_notification$1,
 	update_notification: update_notification$1,
+	view_notification: view_notification$1,
 	new_notification: new_notification$1,
 	are_you_sure_to_delete_notification: are_you_sure_to_delete_notification$1,
 	answer_list: answer_list$1,
@@ -10719,10 +10729,7 @@ var useAutoAcademyDomain = function useAutoAcademyDomain(logout, history, superU
     var isSuperUrl = checkSuperUrl(superUrls, pathname);
     if (!academyDomain) {
       if (!isSuperUrl) {
-        if (isLoginPage) {
-          if (RELEASE_DATE) return;else searchParams["delete"]("domain");
-        }
-        !paramAcademyDomain && domain && searchParams.set("domain", domain);
+        if (isLoginPage) searchParams["delete"]("domain");else if (!paramAcademyDomain && domain) searchParams.set("domain", domain);
         pushTo(history, {
           pathname: homeUrl,
           search: searchParams.toString()
@@ -10750,10 +10757,7 @@ var useAutoAcademyDomain = function useAutoAcademyDomain(logout, history, superU
         return;
       }
       if (!paramAcademyDomain) {
-        if (isLoginPage) {
-          if (RELEASE_DATE) return;else searchParams["delete"]("domain");
-        }
-        searchParams.set("domain", academyDomain);
+        if (isLoginPage) searchParams["delete"]("domain");else searchParams.set("domain", academyDomain);
         pushTo(history, _extends({}, window.location, {
           search: searchParams.toString()
         }), true);
@@ -15323,6 +15327,7 @@ var studentNameStyle = {
   lineHeight: 1
 };
 var PrintExamResult = function PrintExamResult(_ref) {
+  var _resultData$courses;
   var resultData = _ref.resultData,
     examTime = _ref.examTime,
     status = _ref.status,
@@ -15341,6 +15346,9 @@ var PrintExamResult = function PrintExamResult(_ref) {
     var _state$common;
     return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.academy;
   });
+  var courses = resultData === null || resultData === void 0 ? void 0 : (_resultData$courses = resultData.courses) === null || _resultData$courses === void 0 ? void 0 : _resultData$courses.map(function (c) {
+    return c.name;
+  }).join(', ');
   return React__default.createElement(material.Box, {
     sx: {
       minWidth: "768px",
@@ -15379,9 +15387,9 @@ var PrintExamResult = function PrintExamResult(_ref) {
     sx: _extends({}, studentNameStyle, {
       textAlign: "end"
     })
-  }, academy.name)), resultData.courseName && React__default.createElement(material.Stack, null, React__default.createElement(material.Typography, {
+  }, academy.name)), courses && React__default.createElement(material.Stack, null, React__default.createElement(material.Typography, {
     sx: courseNameStyle
-  }, resultData.courseName)), React__default.createElement(material.Box, {
+  }, courses)), React__default.createElement(material.Box, {
     display: "flex",
     gap: "16px",
     flexDirection: "column"
@@ -15530,6 +15538,7 @@ var PrintExamResult = function PrintExamResult(_ref) {
 };
 
 var ExamResultV2 = function ExamResultV2(_ref) {
+  var _resultData$courses;
   var searchParams = _ref.searchParams,
     history = _ref.history,
     _ref$examSessionId = _ref.examSessionId,
@@ -15580,6 +15589,9 @@ var ExamResultV2 = function ExamResultV2(_ref) {
     handlePrintPdf = _usePrintExamResult.handlePrintPdf,
     setRenderedChart = _usePrintExamResult.setRenderedChart;
   var isTabletUp = material.useMediaQuery('(min-width:900px)');
+  var courses = resultData === null || resultData === void 0 ? void 0 : (_resultData$courses = resultData.courses) === null || _resultData$courses === void 0 ? void 0 : _resultData$courses.map(function (c) {
+    return c.name;
+  }).join(', ');
   return React__default.createElement(React.Fragment, null, React__default.createElement(LoadingComponent, {
     isLoading: !!isLoading
   }), timelyOrderQuestions[dataChartIndex] && longTimeSpend && resultData && effectSize ? React__default.createElement("div", {
@@ -15591,13 +15603,13 @@ var ExamResultV2 = function ExamResultV2(_ref) {
     padding: "24px"
   }, React__default.createElement(material.Grid, {
     item: true
-  }, resultData.courseName && React__default.createElement(material.Stack, null, React__default.createElement(material.Typography, {
+  }, courses && React__default.createElement(material.Stack, null, React__default.createElement(material.Typography, {
     sx: {
       fontSize: "14px",
       fontWeight: 600,
       color: styles.less_dark
     }
-  }, resultData.courseName)), React__default.createElement(material.Box, {
+  }, courses)), React__default.createElement(material.Box, {
     display: "flex",
     gap: "16px",
     flexDirection: "column"
@@ -17783,7 +17795,9 @@ var DEFAULT_LESSON_REQUEST = {
 };
 var ClassSchema = function ClassSchema(t) {
   return yup.object({
-    name: yup.string().required(t("class_required")),
+    name: yup.string().required(t("class_required")).trim().min(2, t("class_name_must_be_at_least_N_characters", {
+      length: 2
+    })),
     startDate: yup.date().required(t("start_date_required")),
     endDate: yup.date().required(t("end_date_required")),
     mainTeacherId: yup.number().required(t("main_teacher_required")),
@@ -20357,7 +20371,7 @@ var ClassDetail = function ClassDetail(_ref) {
     pt: !!id ? "12px" : "0px"
   }, React__default.createElement(material.Typography, {
     variant: "h4"
-  }, t(!id ? "create_class" : "update_class"))), React__default.createElement(formik.Formik, {
+  }, t(!id ? "create_class" : isAdmin ? "update_class" : "view_class"))), React__default.createElement(formik.Formik, {
     initialValues: DEFAULT_CLASS_REQUEST,
     validationSchema: schema,
     onSubmit: handleSubmit
@@ -22273,7 +22287,7 @@ var NotificationDetail = function NotificationDetail(_ref) {
     mb: 2
   }, React__default.createElement(material.Typography, {
     variant: "h4"
-  }, t(!id ? "create_notification" : "update_notification"))), React__default.createElement(formik.Formik, {
+  }, t(!id ? "create_notification" : !isAdmin && (!(detailNotification !== null && detailNotification !== void 0 && detailNotification.isOwned) || isTeacherAdmin) ? "view_notification" : "update_notification"))), React__default.createElement(formik.Formik, {
     initialValues: DEFAULT_NOTIFICATION_REQUEST,
     validationSchema: schema,
     onSubmit: handleSubmit
@@ -22567,11 +22581,13 @@ var NotificationList = function NotificationList(_ref) {
       className: "d-flex"
     }, React__default.createElement(material.IconButton, {
       color: "default",
-      className: "bg-warning text-white me-1",
+      className: "bg-" + (!isAdmin && (isTeacherAdmin || !i.isOwned) ? "primary" : "warning") + " text-white me-1",
       onClick: function onClick() {
         return handleUpdateNotification(i);
       }
-    }, React__default.createElement(hi.HiOutlinePencilAlt, {
+    }, !isAdmin && (isTeacherAdmin || !i.isOwned) ? React__default.createElement(fa.FaEye, {
+      size: 12
+    }) : React__default.createElement(hi.HiOutlinePencilAlt, {
       size: 12
     })), React__default.createElement(material.IconButton, {
       color: "error",