mario-teacher-student-client 2.1.72-beta → 2.1.73-beta

package/dist/containers/ConductOneToOne/hooks/useConductOne.d.ts

@@ -38,7 +38,7 @@ declare const useConductOne: () => {
     setLearningSupportCategoryId: import("react").Dispatch<import("react").SetStateAction<number>>;
     isConversation: boolean;
     setConversation: import("react").Dispatch<import("react").SetStateAction<boolean>>;
-    onChangeConversationSession: (isOneToOneConversation: boolean) => Promise<void>;
+    onChangeConversationSession: () => Promise<void>;
     isConversationOneToOne: any;
 };
 export default useConductOne;

package/dist/index.js

@@ -8197,7 +8197,7 @@ var ConductTop = function ConductTop(_ref) {
     listItem: [].concat(listConduct, [objectRequest], sessionResultTitle)
   }))), isTeacher && isConversationOneToOne && React__default.createElement("div", {
     className: "" + styles$4["title-right"]
-  }, React__default.createElement(core.FormControlLabel, {
+  }, !isResultSession ? React__default.createElement(core.FormControlLabel, {
     control: React__default.createElement(core.Switch, {
       checked: isConversation,
       color: "primary",
@@ -8207,6 +8207,13 @@ var ConductTop = function ConductTop(_ref) {
     }),
     label: "1-1 Conversation",
     labelPlacement: "start"
+  }) : React__default.createElement(core.FormControlLabel, {
+    control: React__default.createElement(core.Switch, {
+      checked: isConversation,
+      color: "primary"
+    }),
+    label: "1-1 Conversation",
+    labelPlacement: "start"
   })));
 };
 
@@ -9171,7 +9178,7 @@ var useConductOne = function useConductOne() {
       minute = _useCountDown.minute,
       second = _useCountDown.second;
 
-  var getDataQuestion = React.useCallback(function () {
+  var getDataQuestion = function getDataQuestion() {
     try {
       var _temp6 = function _temp6() {
         dispatch(marioCore.setLoading(false));
@@ -9229,12 +9236,7 @@ var useConductOne = function useConductOne() {
             }
 
             setInformationUser(body);
-
-            if (isConversationOneToOne) {
-              setConversation(res.data.isOneToOneConversation);
-            } else {
-              setConversation(true);
-            }
+            setConversation(res.data.isOneToOneConversation);
           }
 
           if (isStudent && (_res$data10 = res.data) !== null && _res$data10 !== void 0 && (_res$data10$studentRe = _res$data10.studentResult) !== null && _res$data10$studentRe !== void 0 && _res$data10$studentRe.isDone) {
@@ -9288,7 +9290,8 @@ var useConductOne = function useConductOne() {
     } catch (e) {
       return Promise.reject(e);
     }
-  }, [isTeacher]);
+  };
+
   var updateQuestionAnswer = React.useCallback(function (questionId, text) {
     if (!localStorage.getItem(rollBackQuestionList)) {
       localStorage.setItem(rollBackQuestionList, JSON.stringify(listQuestionStudents));
@@ -9479,10 +9482,9 @@ var useConductOne = function useConductOne() {
       return Promise.reject(e);
     }
   }, [sessionId]);
-  var onChangeConversationSession = React.useCallback(function (isOneToOneConversation) {
+  var onChangeConversationSession = React.useCallback(function () {
     try {
       var _temp23 = _catch(function () {
-        setConversation(isOneToOneConversation);
         return Promise.resolve(toggleConversationQuestionSession(parseInt(sessionId))).then(function () {});
       }, function (err) {
         var _err$response6, _err$response6$data;
@@ -12016,6 +12018,7 @@ var ConductIndex = function ConductIndex() {
       learningSupportCategoryId = _useConductOne.learningSupportCategoryId,
       setLearningSupportCategoryId = _useConductOne.setLearningSupportCategoryId,
       isConversation = _useConductOne.isConversation,
+      setConversation = _useConductOne.setConversation,
       onChangeConversationSession = _useConductOne.onChangeConversationSession,
       isConversationOneToOne = _useConductOne.isConversationOneToOne;
 
@@ -12125,6 +12128,11 @@ var ConductIndex = function ConductIndex() {
     (_refConduct$current = refConduct.current) === null || _refConduct$current === void 0 ? void 0 : _refConduct$current.openModal();
   };
 
+  var onChangeOneToOneConversation = function onChangeOneToOneConversation(isConversation) {
+    setConversation(isConversation);
+    onChangeConversationSession();
+  };
+
   var screenWidth = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
 
   var _useState3 = React.useState(false),
@@ -12179,7 +12187,7 @@ var ConductIndex = function ConductIndex() {
     gradeLevel: informationUser.gradeLevel,
     clickOpenProfileDialog: clickOpenProfileDialog,
     isConversation: isConversation,
-    onChangeConversationSession: onChangeConversationSession,
+    onChangeConversationSession: onChangeOneToOneConversation,
     isTeacher: isTeacher,
     isUserChangeSession: isUserChangeSession,
     isConversationOneToOne: isConversationOneToOne
@@ -12210,7 +12218,7 @@ var ConductIndex = function ConductIndex() {
       return onChangeQuestionAnswer(questionSummarize[0].id, event.target.value);
     },
     value: (_questionSummarize$4 = questionSummarize[0]) === null || _questionSummarize$4 === void 0 ? void 0 : _questionSummarize$4.answer
-  })))), isConversation && React__default.createElement(React__default.Fragment, null, React__default.createElement("div", {
+  })))), isConversation && React__default.createElement("div", {
     className: styles$4["block-question"]
   }, React__default.createElement("div", {
     className: styles$4["title-strategories"]
@@ -12270,7 +12278,7 @@ var ConductIndex = function ConductIndex() {
       overflow: "hidden"
     },
     disabled: true
-  }))))), isTeacher && React__default.createElement("div", {
+  }))))), isTeacher && isConversation && React__default.createElement("div", {
     className: styles$4["block-question"]
   }, React__default.createElement("div", {
     className: styles$4["title-strategories"]
@@ -12295,7 +12303,7 @@ var ConductIndex = function ConductIndex() {
     valueText: listQuestionTeachers === null || listQuestionTeachers === void 0 ? void 0 : listQuestionTeachers.answer,
     isUserChangeSession: false,
     isTeacher: isTeacher
-  }))), React__default.createElement("div", {
+  })), React__default.createElement("div", {
     className: styles$4["block-question"]
   }, isUserChangeSession ? React__default.createElement(QuestionConduct, {
     questionName: "How are you feeling about each area right now?",
@@ -41945,14 +41953,6 @@ var UpdateStudentProfile = function UpdateStudentProfile() {
       });
     }
 
-    if (!!errors.firstNameParent1 && touched.firstNameParent1 || !!errors.lastNameParent1 && touched.lastNameParent1) {
-      handleOpenParentModal1();
-    }
-
-    if (!!errors.firstNameParent2 && touched.firstNameParent2 || !!errors.lastNameParent2 && touched.lastNameParent2) {
-      handleOpenParentModal2();
-    }
-
     var existParentProfile1 = !!(values !== null && values !== void 0 && values.secondaryFirstName) || !!(values !== null && values !== void 0 && values.secondaryLastName) || !!(values !== null && values !== void 0 && values.secondaryEmail) || !!(values !== null && values !== void 0 && values.secondaryPhone);
     var existParentProfile2 = !!(values !== null && values !== void 0 && values.thirdFirstName) || !!(values !== null && values !== void 0 && values.thirdLastName) || !!(values !== null && values !== void 0 && values.thirdEmail) || !!(values !== null && values !== void 0 && values.thirdPhone);
     return React__default.createElement(core.Grid, {