touchstudy-core 0.1.30 → 0.1.31

package/dist/containers/ExamResult/apiClients/index.d.ts

@@ -3,10 +3,10 @@ export declare const getResultsLongTimeSpend: (code: string) => Promise<import("
 export declare const getResultsEffectSize: (code: string) => Promise<import("axios").AxiosResponse<any, any>>;
 export declare const getResultsTimeOrderQuestion: (code: string) => Promise<import("axios").AxiosResponse<any, any>>;
 export declare const getResultsCategories: (code: string) => Promise<import("axios").AxiosResponse<any, any>>;
-export declare const getResultsTeacher: (id: string, studentId: string) => Promise<import("axios").AxiosResponse<any, any>>;
-export declare const getResultsLongTimeSpendTeacher: (id: string, studentId: string) => Promise<import("axios").AxiosResponse<any, any>>;
-export declare const getResultsEffectSizeTeacher: (id: string, studentId: string) => Promise<import("axios").AxiosResponse<any, any>>;
-export declare const getResultsTimeOrderQuestionTeacher: (id: string, studentId: string) => Promise<import("axios").AxiosResponse<any, any>>;
-export declare const getResultsCategoriesTeacher: (id: string, studentId: string) => Promise<import("axios").AxiosResponse<any, any>>;
+export declare const getResultsTeacher: (id: number, studentId: number) => Promise<import("axios").AxiosResponse<any, any>>;
+export declare const getResultsLongTimeSpendTeacher: (id: number, studentId: number) => Promise<import("axios").AxiosResponse<any, any>>;
+export declare const getResultsEffectSizeTeacher: (id: number, studentId: number) => Promise<import("axios").AxiosResponse<any, any>>;
+export declare const getResultsTimeOrderQuestionTeacher: (id: number, studentId: number) => Promise<import("axios").AxiosResponse<any, any>>;
+export declare const getResultsCategoriesTeacher: (id: number, studentId: number) => Promise<import("axios").AxiosResponse<any, any>>;
 export declare const createConversationApi: (data: any) => Promise<import("axios").AxiosResponse<any, any>>;
 export declare const getCheckStatusExam: (examCode?: string | undefined) => Promise<import("axios").AxiosResponse<any, any>>;

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

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { CategoryResponse, EffectSize, ExamResult, LongTimeSpendQuestion, TimelyOrderQuestion } from "../configs/types";
-declare const useExamResult: (searchParam: string, navigate: Function) => {
+declare const useExamResult: (searchParam: string, navigate: Function, examSessionId?: number, studentId?: number, code?: string) => {
     series: {
         name: string;
         data: (number | null)[];

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

@@ -2,6 +2,9 @@ import { FC } from "react";
 declare type Props = {
     searchParams: string;
     onNavigate: Function;
+    examSessionId?: number;
+    studentId?: number;
+    code?: string;
 };
 declare const ExamResultV2: FC<Props>;
 export default ExamResultV2;

package/dist/index.js

@@ -1546,6 +1546,7 @@ var users = "사용자";
 var new_user = "새로운 사용자";
 var academy_admin = "아카데미 관리자";
 var switch_academy_admin = "스위치 아카데미 관리자";
+var switch_academy = "스위치 아카데미";
 var there_are_no_lessons_this_week = "이번주는 수업이 없습니다";
 var update_message = "업데이트 메시지";
 var attachment = "첨부 파일";
@@ -1564,6 +1565,12 @@ var number_of_classes = "{{ number }} 개";
 var complete_conversation_successfully = "대화를 성공적으로 완료했습니다";
 var fail_to_complete_conversation = "대화를 완료하지 못했습니다";
 var are_you_sure_you_want_to_complete_this_conversation = "정말로 이 채팅 베팅을 완료하시겠습니까?";
+var switch_academy_fail = "아카데미 전환 실패";
+var no_academy_available = "이용 가능한 아카데미가 없습니다";
+var my_classes_calendar = "내 수업 캘린더";
+var enter_exam_code = "시험 코드 입력";
+var my_score = "내 점수";
+var exam_date = "시험 날짜";
 var lang_ko = {
 	problem_solving: problem_solving,
 	my_story: my_story,
@@ -1822,6 +1829,7 @@ var lang_ko = {
 	new_user: new_user,
 	academy_admin: academy_admin,
 	switch_academy_admin: switch_academy_admin,
+	switch_academy: switch_academy,
 	there_are_no_lessons_this_week: there_are_no_lessons_this_week,
 	update_message: update_message,
 	attachment: attachment,
@@ -1839,7 +1847,13 @@ var lang_ko = {
 	number_of_classes: number_of_classes,
 	complete_conversation_successfully: complete_conversation_successfully,
 	fail_to_complete_conversation: fail_to_complete_conversation,
-	are_you_sure_you_want_to_complete_this_conversation: are_you_sure_you_want_to_complete_this_conversation
+	are_you_sure_you_want_to_complete_this_conversation: are_you_sure_you_want_to_complete_this_conversation,
+	switch_academy_fail: switch_academy_fail,
+	no_academy_available: no_academy_available,
+	my_classes_calendar: my_classes_calendar,
+	enter_exam_code: enter_exam_code,
+	my_score: my_score,
+	exam_date: exam_date
 };
 
 var problem_solving$1 = "Problem Solving";
@@ -2135,6 +2149,7 @@ var users$1 = "Users";
 var new_user$1 = "New user";
 var academy_admin$1 = "Academy Admin";
 var switch_academy_admin$1 = "Switch Academy Admin";
+var switch_academy$1 = "Switch Academy";
 var there_are_no_lessons_this_week$1 = "There are no lessons this week";
 var today_lessons$1 = "Today lessons";
 var update_message$1 = "Update message";
@@ -2153,6 +2168,12 @@ var number_of_classes$1 = "{{ number }} classes";
 var complete_conversation_successfully$1 = "Complete conversation successfully";
 var fail_to_complete_conversation$1 = "Fail to complete conversation";
 var are_you_sure_you_want_to_complete_this_conversation$1 = "Are you sure you want to complete this conversation?";
+var switch_academy_fail$1 = "Academy conversion failed";
+var no_academy_available$1 = "No academy available";
+var my_classes_calendar$1 = "My classes calendar";
+var enter_exam_code$1 = "Enter exam code";
+var my_score$1 = "My score";
+var exam_date$1 = "Exam date";
 var lang_en = {
 	problem_solving: problem_solving$1,
 	my_story: my_story$1,
@@ -2446,6 +2467,7 @@ var lang_en = {
 	new_user: new_user$1,
 	academy_admin: academy_admin$1,
 	switch_academy_admin: switch_academy_admin$1,
+	switch_academy: switch_academy$1,
 	there_are_no_lessons_this_week: there_are_no_lessons_this_week$1,
 	today_lessons: today_lessons$1,
 	update_message: update_message$1,
@@ -2463,7 +2485,13 @@ var lang_en = {
 	number_of_classes: number_of_classes$1,
 	complete_conversation_successfully: complete_conversation_successfully$1,
 	fail_to_complete_conversation: fail_to_complete_conversation$1,
-	are_you_sure_you_want_to_complete_this_conversation: are_you_sure_you_want_to_complete_this_conversation$1
+	are_you_sure_you_want_to_complete_this_conversation: are_you_sure_you_want_to_complete_this_conversation$1,
+	switch_academy_fail: switch_academy_fail$1,
+	no_academy_available: no_academy_available$1,
+	my_classes_calendar: my_classes_calendar$1,
+	enter_exam_code: enter_exam_code$1,
+	my_score: my_score$1,
+	exam_date: exam_date$1
 };
 
 i18n.use(reactI18next.initReactI18next).init({
@@ -2710,7 +2738,8 @@ var useSwitchAcademy = function useSwitchAcademy(role, navigate, homeAcademyUrl,
         });
       }, function (error) {
         var _error$response2, _error$response2$data;
-        reactToastify.toast.error((error === null || error === void 0 ? void 0 : (_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : (_error$response2$data = _error$response2.data) === null || _error$response2$data === void 0 ? void 0 : _error$response2$data.title) || t("switch_academy_admin"));
+        academyDomain && localStorage.removeItem(ACADEMY_DOMAIN);
+        reactToastify.toast.error((error === null || error === void 0 ? void 0 : (_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : (_error$response2$data = _error$response2.data) === null || _error$response2$data === void 0 ? void 0 : _error$response2$data.title) || t("switch_academy_fail"));
       });
       return Promise.resolve(_temp4 && _temp4.then ? _temp4.then(_temp5) : _temp5(_temp4));
     } catch (e) {
@@ -2792,7 +2821,7 @@ var TheAcademyDropdown = function TheAcademyDropdown(_ref) {
       color: "#5458D5",
       minWidth: 150
     }
-  }, (selectedAcademy === null || selectedAcademy === void 0 ? void 0 : selectedAcademy.name) || t("switch_academy_admin")), React__default.createElement("div", {
+  }, (selectedAcademy === null || selectedAcademy === void 0 ? void 0 : selectedAcademy.name) || t(role === exports.Role.Admin ? "switch_academy_admin" : "switch_academy")), React__default.createElement("div", {
     className: "" + stylesGlobal["switch-icon"]
   }, React__default.createElement(go.GoArrowSwitch, {
     size: 14
@@ -8324,7 +8353,16 @@ var CATEGORY_RESPONSES = [{
   "percentageAmongStudents": 40
 }];
 
-var useExamResult = function useExamResult(searchParam, navigate) {
+var useExamResult = function useExamResult(searchParam, navigate, examSessionId, studentId, code) {
+  if (examSessionId === void 0) {
+    examSessionId = 0;
+  }
+  if (studentId === void 0) {
+    studentId = 0;
+  }
+  if (code === void 0) {
+    code = "";
+  }
   var query = new URLSearchParams(searchParam);
   var dispatch = reactRedux.useDispatch();
   var roles = reactRedux.useSelector(function (state) {
@@ -8333,7 +8371,6 @@ var useExamResult = function useExamResult(searchParam, navigate) {
   });
   var isStudent = roles === null || roles === void 0 ? void 0 : roles.includes(Roles$2.Student);
   var examCode = query.get("examCode") || "";
-  var studentId = query.get("studentId") || "";
   var language = reactRedux.useSelector(function (state) {
     var _state$common2;
     return state === null || state === void 0 ? void 0 : (_state$common2 = state.common) === null || _state$common2 === void 0 ? void 0 : _state$common2.language;
@@ -8366,14 +8403,14 @@ var useExamResult = function useExamResult(searchParam, navigate) {
     setOpenProblem = _useState7[1];
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
-  var getData = function getData(examCode) {
+  var getStudentData = function getStudentData(examCode) {
     try {
       var _temp4 = function _temp4() {
         function _temp2() {
           dispatch(setLoading(false));
         }
         var _temp = _catch(function () {
-          return Promise.resolve(isStudent ? Promise.all([getResults(examCode), getResultsLongTimeSpend(examCode), getResultsEffectSize(examCode), getResultsTimeOrderQuestion(examCode), getResultsCategories(examCode)]) : Promise.all([getResultsTeacher(examCode, studentId), getResultsLongTimeSpendTeacher(examCode, studentId), getResultsEffectSizeTeacher(examCode, studentId), getResultsTimeOrderQuestionTeacher(examCode, studentId), getResultsCategoriesTeacher(examCode, studentId)])).then(function (result) {
+          return Promise.resolve(Promise.all([getResults(examCode), getResultsLongTimeSpend(examCode), getResultsEffectSize(examCode), getResultsTimeOrderQuestion(examCode), getResultsCategories(examCode)])).then(function (result) {
             var _result$0$data, _result$1$data, _result$2$data, _result$3$data, _result$4$data;
             setResultDatas((_result$0$data = result[0].data) === null || _result$0$data === void 0 ? void 0 : _result$0$data.data);
             setLongTimeSpend((_result$1$data = result[1].data) === null || _result$1$data === void 0 ? void 0 : _result$1$data.data);
@@ -8400,6 +8437,40 @@ var useExamResult = function useExamResult(searchParam, navigate) {
       return Promise.reject(e);
     }
   };
+  var getStudentDataByTeacher = function getStudentDataByTeacher(examCode, examSessionId, studentId) {
+    try {
+      var _temp8 = function _temp8() {
+        function _temp6() {
+          dispatch(setLoading(false));
+        }
+        var _temp5 = _catch(function () {
+          return Promise.resolve(Promise.all([getResultsTeacher(examSessionId, studentId), getResultsLongTimeSpendTeacher(examSessionId, studentId), getResultsEffectSizeTeacher(examSessionId, studentId), getResultsTimeOrderQuestionTeacher(examSessionId, studentId), getResultsCategoriesTeacher(examSessionId, studentId)])).then(function (result) {
+            var _result$0$data2, _result$1$data2, _result$2$data2, _result$3$data2, _result$4$data2;
+            setResultDatas((_result$0$data2 = result[0].data) === null || _result$0$data2 === void 0 ? void 0 : _result$0$data2.data);
+            setLongTimeSpend((_result$1$data2 = result[1].data) === null || _result$1$data2 === void 0 ? void 0 : _result$1$data2.data);
+            setEffectSize((_result$2$data2 = result[2].data) === null || _result$2$data2 === void 0 ? void 0 : _result$2$data2.data);
+            setTimelyOrderQuestion((_result$3$data2 = result[3].data) === null || _result$3$data2 === void 0 ? void 0 : _result$3$data2.data);
+            setCategoryResponses(((_result$4$data2 = result[4].data) === null || _result$4$data2 === void 0 ? void 0 : _result$4$data2.data) || []);
+          });
+        }, function (error) {
+          var _error$response2;
+          reactToastify.toast.error((error === null || error === void 0 ? void 0 : (_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : _error$response2.data) || error.message);
+        });
+        return _temp5 && _temp5.then ? _temp5.then(_temp6) : _temp6(_temp5);
+      };
+      dispatch(setLoading(true));
+      var _temp7 = _catch(function () {
+        return Promise.resolve(getCheckStatusExam(examCode)).then(function () {});
+      }, function (error) {
+        console.log({
+          error: error
+        });
+      });
+      return Promise.resolve(_temp7 && _temp7.then ? _temp7.then(_temp8) : _temp8(_temp7));
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
   var setExampleData = function setExampleData() {
     setResultDatas(EXAM_RESULT);
     setLongTimeSpend(LONGTIME_SPEND_QUESTIONS);
@@ -8408,8 +8479,12 @@ var useExamResult = function useExamResult(searchParam, navigate) {
     setCategoryResponses(CATEGORY_RESPONSES);
   };
   React.useEffect(function () {
-    examCode === "example-code" ? setExampleData() : getData(examCode || "");
-  }, [examCode]);
+    var getData = function getData() {
+      isStudent && getStudentData(examCode);
+      !isStudent && getStudentDataByTeacher(code, examSessionId, studentId);
+    };
+    examCode === "example-code" ? setExampleData() : getData();
+  }, [examCode, isStudent, code, examSessionId, studentId]);
   var handlePrevChart = function handlePrevChart() {
     if (dataChartIndex > 0) {
       setDataChartIndex(dataChartIndex - 1);
@@ -10920,8 +10995,11 @@ var useTab = function useTab() {
 
 var ExamResultV2 = function ExamResultV2(_ref) {
   var searchParams = _ref.searchParams,
-    onNavigate = _ref.onNavigate;
-  var _useExamResult = useExamResult(searchParams, onNavigate),
+    onNavigate = _ref.onNavigate,
+    examSessionId = _ref.examSessionId,
+    studentId = _ref.studentId,
+    code = _ref.code;
+  var _useExamResult = useExamResult(searchParams, onNavigate, examSessionId, studentId, code),
     series = _useExamResult.series,
     chartOptions = _useExamResult.chartOptions,
     dataChartIndex = _useExamResult.dataChartIndex,
@@ -10980,7 +11058,7 @@ var ExamResultV2 = function ExamResultV2(_ref) {
       fontWeight: 600,
       color: "#97A1AF"
     }
-  }, "\uB0B4 \uC810\uC218"), React__default.createElement(material.Typography, {
+  }, t("my_score")), React__default.createElement(material.Typography, {
     sx: {
       fontSize: "14px",
       fontWeight: 600,
@@ -10994,7 +11072,7 @@ var ExamResultV2 = function ExamResultV2(_ref) {
       fontWeight: 600,
       color: "#97A1AF"
     }
-  }, "\uC2DC\uD5D8 \uB0A0\uC9DC"), React__default.createElement(material.Typography, {
+  }, t("exam_date")), React__default.createElement(material.Typography, {
     sx: {
       fontSize: "14px",
       fontWeight: 600,
@@ -11006,7 +11084,7 @@ var ExamResultV2 = function ExamResultV2(_ref) {
       fontWeight: 600,
       color: "#97A1AF"
     }
-  }, "\uC2DC\uD5D8 \uC2DC\uAC04"), React__default.createElement(material.Typography, {
+  }, t("exam_time")), React__default.createElement(material.Typography, {
     sx: {
       fontSize: "14px",
       fontWeight: 600,
@@ -11018,7 +11096,7 @@ var ExamResultV2 = function ExamResultV2(_ref) {
       fontWeight: 600,
       color: "#97A1AF"
     }
-  }, "\uCD1D \uD559\uC0DD\uC218"), React__default.createElement(material.Typography, {
+  }, t("total_students")), React__default.createElement(material.Typography, {
     sx: {
       fontSize: "14px",
       fontWeight: 600,
@@ -11032,7 +11110,7 @@ var ExamResultV2 = function ExamResultV2(_ref) {
       fontWeight: 600,
       color: "#97A1AF"
     }
-  }, "\uB2F4\uB2F9 \uC120\uC0DD\uB2D8"), React__default.createElement(material.Typography, {
+  }, t("teacher_in_charge")), React__default.createElement(material.Typography, {
     sx: {
       fontSize: "14px",
       fontWeight: 600,