touchstudy-core 0.1.116 → 0.1.118

package/dist/index.js

@@ -433,7 +433,7 @@ var save_and_exit = "저장 및 종료";
 var update_exam = "시험 업데이트";
 var create_exam = "새 시험 만들기";
 var enter_title = "시험 제목을 입력하세요";
-var select_placeholder = "선택하다...";
+var select_placeholder = "선택...";
 var view_exam = "시험 보기";
 var back = "뒤로 가기";
 var edit = "편집하기";
@@ -1370,6 +1370,7 @@ var back_month = "이전 달";
 var today_schedule = "오늘 스케줄";
 var schedule_achieved = "달성한 스케줄";
 var i_dont_have_my_phone_number_yet = "휴대폰 번호가 없어요";
+var duplicate_passcode_for_siblings_please_contact_admin_for_assistance = "형제자매의 중복된 비밀번호. 도움이 필요하면 관리자에게 문의하세요";
 var lang_ko = {
 	problem_solving: problem_solving,
 	my_story: my_story,
@@ -2383,7 +2384,8 @@ var lang_ko = {
 	back_month: back_month,
 	today_schedule: today_schedule,
 	schedule_achieved: schedule_achieved,
-	i_dont_have_my_phone_number_yet: i_dont_have_my_phone_number_yet
+	i_dont_have_my_phone_number_yet: i_dont_have_my_phone_number_yet,
+	duplicate_passcode_for_siblings_please_contact_admin_for_assistance: duplicate_passcode_for_siblings_please_contact_admin_for_assistance
 };
 
 var problem_solving$1 = "Problem Solving";
@@ -3416,6 +3418,7 @@ var back_month$1 = "Back Month";
 var today_schedule$1 = "Today's schedule";
 var schedule_achieved$1 = "Schedule achieved";
 var i_dont_have_my_phone_number_yet$1 = "I don't have my phone number yet";
+var duplicate_passcode_for_siblings_please_contact_admin_for_assistance$1 = "Duplicate passcode for siblings. Please contact admin for assistance";
 var lang_en = {
 	problem_solving: problem_solving$1,
 	my_story: my_story$1,
@@ -4431,7 +4434,8 @@ var lang_en = {
 	back_month: back_month$1,
 	today_schedule: today_schedule$1,
 	schedule_achieved: schedule_achieved$1,
-	i_dont_have_my_phone_number_yet: i_dont_have_my_phone_number_yet$1
+	i_dont_have_my_phone_number_yet: i_dont_have_my_phone_number_yet$1,
+	duplicate_passcode_for_siblings_please_contact_admin_for_assistance: duplicate_passcode_for_siblings_please_contact_admin_for_assistance$1
 };
 
 i18n__default.use(reactI18next.initReactI18next).init({
@@ -4755,8 +4759,10 @@ var timeSpanToLocalMoment = function timeSpanToLocalMoment(time, date) {
   var times = time.split(":");
   if (times.length !== 3) return null;
   var totalSeconds = +times[0] * 60 * 60 + +times[1] * 60 + +times[2];
-  var value = date ? moment.utc(date).startOf("day").add(totalSeconds, "seconds").local() : moment().startOf("day").add(totalSeconds, "seconds");
-  return value;
+  var startOfDay = moment.utc(date).startOf("day");
+  var dateTime = date ? startOfDay.add(totalSeconds, "seconds") : moment().startOf("day");
+  if (date && dateTime.isBefore(moment.utc(date))) dateTime = dateTime.add(1, "day");
+  return dateTime.local();
 };
 var convertHHMMSStoSeconds = function convertHHMMSStoSeconds(time) {
   var times = time.split(":");
@@ -9947,7 +9953,8 @@ var useLoginPhoneNumber = function useLoginPhoneNumber(props) {
           setPhoneNumber("");
         });
       }, function (error) {
-        reactToastify.toast.error(getErrorMessage(t, error));
+        var _error$response, _error$response2, _error$response2$data;
+        if ((error === null || error === void 0 ? void 0 : (_error$response = error.response) === null || _error$response === void 0 ? void 0 : _error$response.status) === 500 && (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) === "PhoneNumberIsDuplicated") reactToastify.toast.error(t("duplicate_passcode_for_siblings_please_contact_admin_for_assistance"));else reactToastify.toast.error(getErrorMessage(t, error));
       });
       return Promise.resolve(_temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp));
     } catch (e) {
@@ -12374,7 +12381,7 @@ var SelectDialog = function SelectDialog(_ref) {
   }))), React__default.createElement(material.TableBody, null, isStudent ? userList.map(function (i, index) {
     var isItemSelected = isSelected(i.studentId);
     return React__default.createElement(material.TableRow, {
-      key: i.id
+      key: i.studentId
     }, React__default.createElement(material.TableCell, {
       padding: "checkbox"
     }, React__default.createElement(material.Checkbox, {
@@ -21318,6 +21325,7 @@ var UserDialog = function UserDialog(_ref) {
     var isDefaultPassCode = !(data !== null && data !== void 0 && data.passCode);
     setUseDefaultPassCode(isDefaultPassCode);
     setDefaultPassCodeChanged(false);
+    setPassCode(data === null || data === void 0 ? void 0 : data.passCode);
   };
   React.useEffect(function () {
     resetData();
@@ -21863,6 +21871,7 @@ var useUserList = function useUserList(role) {
       var _temp8 = function _temp8() {
         dispatch(setLoading(false));
       };
+      setUserDetail(undefined);
       if (!id) return Promise.resolve();
       dispatch(setLoading(true));
       var _temp7 = _catch(function () {
@@ -21920,7 +21929,7 @@ var useUserList = function useUserList(role) {
   };
   var handleOpenUserDialog = function handleOpenUserDialog(user) {
     try {
-      setUserDetail(undefined);
+      setUserDetail(user);
       setSelectedUser(user);
       setOpenUserDialog(true);
       return Promise.resolve(_catch(function () {
@@ -21944,6 +21953,7 @@ var useUserList = function useUserList(role) {
   };
   var handleCloseUserDialog = function handleCloseUserDialog() {
     setOpenUserDialog(false);
+    setUserDetail(undefined);
     setSelectedUser({
       id: 0,
       fullName: "",