mario-teacher-student-client 2.0.3 → 2.0.6

package/dist/containers/ConductOneToOne/components/SimpleDialog.d.ts

@@ -0,0 +1,3 @@
+import React from "react";
+declare const _default: React.MemoExoticComponent<(props: any) => JSX.Element>;
+export default _default;

package/dist/containers/ConferenceRubric/components/SimpleDialog.d.ts

@@ -0,0 +1,3 @@
+import React from "react";
+declare const _default: React.MemoExoticComponent<(props: any) => JSX.Element>;
+export default _default;

package/dist/containers/MyOneToOne/components/dialog/DialogNodes.d.ts

@@ -1,3 +1,3 @@
-/// <reference types="react" />
-declare const DialogNodes: (props: any) => JSX.Element;
-export default DialogNodes;
+import React from "react";
+declare const _default: React.MemoExoticComponent<(props: any) => JSX.Element>;
+export default _default;

package/dist/index.js

@@ -153,7 +153,7 @@ var getUnreadNotification = function getUnreadNotification() {
 
 var NOTIFICATION_CHANNEL = "NOTIFICATION_CHANNEL";
 var NEW_NOTIFICATION = "NEW_NOTIFICATION";
-var drawerWidth = 240;
+var drawerWidth = 280;
 var headerHeightDesktop = 64;
 var headerHeightMobile = 55;
 var headerHeightScroll = 0;
@@ -5301,7 +5301,10 @@ var HeaderComponent = function HeaderComponent(_ref) {
   }, React__default.createElement(BiArrowBack, {
     className: styles["header-icon"]
   }), " ", text)), isShowButtonPageHeader && screenWidth > 600 && React__default.createElement("div", {
-    className: "styles[\"header-right\"]"
+    className: "styles[\"header-right\"]",
+    style: {
+      marginRight: "50px"
+    }
   }, React__default.createElement(core.Button, {
     variant: "contained",
     className: isShowButtonBackGround ? styles["btn-conduct-session"] : styles["btn-conduct-session-disabled"],
@@ -7042,6 +7045,7 @@ var CustomTabNote = function CustomTabNote(props) {
     return (_user$roles = user.roles) === null || _user$roles === void 0 ? void 0 : _user$roles.includes("Teacher");
   }, [user]);
   var indexTab = 0;
+  var privateInit = "";
 
   if (localStorage.getItem('activeTab') != null) {
     var activeTab = JSON.parse(localStorage.getItem('activeTab') || '{}');
@@ -7051,6 +7055,7 @@ var CustomTabNote = function CustomTabNote(props) {
 
     if (objectTab != null) {
       indexTab = objectTab.activeTab;
+      privateInit = objectTab.content;
     }
   }
 
@@ -7058,7 +7063,7 @@ var CustomTabNote = function CustomTabNote(props) {
       value = _useState[0],
       setValue = _useState[1];
 
-  var _useState2 = React.useState(),
+  var _useState2 = React.useState(privateInit),
       dataPrivate = _useState2[0],
       setDataPrivate = _useState2[1];
 
@@ -7074,9 +7079,6 @@ var CustomTabNote = function CustomTabNote(props) {
       widthItem = _useState5[0],
       setWidthItem = _useState5[1];
 
-  console.log({
-    value: value
-  });
   React.useEffect(function () {
     setDataPrivate(props.privateNoteData);
   }, [props.privateNoteData]);
@@ -7093,11 +7095,13 @@ var CustomTabNote = function CustomTabNote(props) {
     var objectTab = [{
       isTeacher: true,
       sessionId: props.sessionId,
-      activeTab: 0
+      activeTab: 0,
+      content: ""
     }, {
       isTeacher: false,
       sessionId: props.sessionId,
-      activeTab: 0
+      activeTab: 0,
+      content: ""
     }];
     var index = objectTab.findIndex(function (t) {
       return t.isTeacher == isTeacher;
@@ -7142,6 +7146,20 @@ var CustomTabNote = function CustomTabNote(props) {
       clearTimeout(inputSearch.current);
     }
 
+    if (localStorage.getItem('activeTab') != null) {
+      var _activeTab = JSON.parse(localStorage.getItem('activeTab') || '{}');
+
+      var indexTab = _activeTab === null || _activeTab === void 0 ? void 0 : _activeTab.findIndex(function (item) {
+        return item.sessionId == props.sessionId && item.isTeacher == isTeacher;
+      });
+
+      if (indexTab != -1) {
+        _activeTab[indexTab].content = inputValue;
+      }
+
+      localStorage.setItem('activeTab', JSON.stringify(_activeTab));
+    }
+
     inputSearch.current = setTimeout(function () {
       handleUpdatePrivateNote(inputValue);
     }, 500);
@@ -7927,17 +7945,9 @@ var DialogNodes = function DialogNodes(props) {
       deleteNoteConference = _useNoteSession.deleteNoteConference,
       updateConferenceRubricPrivateNote = _useNoteSession.updateConferenceRubricPrivateNote;
 
-  var _React$useState = React__default.useState(),
-      inputValue = _React$useState[0],
-      setInputValue = _React$useState[1];
-
-  var _React$useState2 = React__default.useState(),
-      recordValue = _React$useState2[0],
-      setRecordValue = _React$useState2[1];
-
-  var _React$useState3 = React__default.useState(false),
-      isShowQuestionList = _React$useState3[0],
-      setIsShowQuestionList = _React$useState3[1];
+  var _React$useState = React__default.useState(false),
+      isShowQuestionList = _React$useState[0],
+      setIsShowQuestionList = _React$useState[1];
 
   var user = reactRedux.useSelector(function (state) {
     return state.common.user;
@@ -7948,6 +7958,7 @@ var DialogNodes = function DialogNodes(props) {
     return (_user$roles = user.roles) === null || _user$roles === void 0 ? void 0 : _user$roles.includes("Teacher");
   }, [user]);
   var indexTab = 0;
+  var inputInitValue = "";
 
   if (localStorage.getItem('activeTab') != null) {
     var activeTab = JSON.parse(localStorage.getItem('activeTab') || '{}');
@@ -7957,14 +7968,58 @@ var DialogNodes = function DialogNodes(props) {
 
     if (objectTab != null) {
       indexTab = objectTab.activeTab;
+      inputInitValue = objectTab.content;
     }
   }
 
+  var _React$useState2 = React__default.useState(inputInitValue),
+      inputValue = _React$useState2[0],
+      setInputValue = _React$useState2[1];
+
+  var _React$useState3 = React__default.useState(),
+      recordValue = _React$useState3[0],
+      setRecordValue = _React$useState3[1];
+
   var _React$useState4 = React__default.useState(indexTab),
       tabProp = _React$useState4[0],
       setTabProp = _React$useState4[1];
 
   var handleChange = function handleChange(event) {
+    if (localStorage.getItem('activeTab') != null) {
+      var _activeTab = JSON.parse(localStorage.getItem('activeTab') || '{}');
+
+      var indexTab = _activeTab === null || _activeTab === void 0 ? void 0 : _activeTab.findIndex(function (item) {
+        return item.sessionId == props.sessionId && item.isTeacher == isTeacher;
+      });
+
+      if (indexTab != -1) {
+        _activeTab[indexTab].content = event.target.value;
+      }
+
+      localStorage.setItem('activeTab', JSON.stringify(_activeTab));
+    } else {
+      var objectTab = [{
+        isTeacher: true,
+        sessionId: props.sessionId,
+        activeTab: 0,
+        content: ""
+      }, {
+        isTeacher: false,
+        sessionId: props.sessionId,
+        activeTab: 0,
+        content: ""
+      }];
+      var index = objectTab.findIndex(function (t) {
+        return t.isTeacher == isTeacher;
+      });
+
+      if (index != -1) {
+        objectTab[index].content = event.target.value;
+      }
+
+      localStorage.setItem('activeTab', JSON.stringify(objectTab));
+    }
+
     setInputValue(event.target.value);
   };
 
@@ -7972,6 +8027,20 @@ var DialogNodes = function DialogNodes(props) {
     props.handleClose();
   };
 
+  React.useEffect(function () {
+    if (localStorage.getItem('activeTab') != null) {
+      var _activeTab2 = JSON.parse(localStorage.getItem('activeTab') || '{}');
+
+      var objectTab = _activeTab2 === null || _activeTab2 === void 0 ? void 0 : _activeTab2.find(function (item) {
+        return item.sessionId == props.sessionId && item.isTeacher == isTeacher;
+      });
+
+      if (objectTab != null) {
+        setInputValue(objectTab.content);
+      }
+    }
+  }, [tabProp]);
+
   var handleCreateNote = function handleCreateNote() {
     try {
       return Promise.resolve(_catch(function () {
@@ -7982,7 +8051,21 @@ var DialogNodes = function DialogNodes(props) {
           Text: inputValue
         }, props.sessionResultId, props.sessionId)).then(function (_createConferenceSing) {
           _createConferenceSing;
-          return Promise.resolve(setInputValue("")).then(function () {});
+          return Promise.resolve(setInputValue("")).then(function () {
+            if (localStorage.getItem('activeTab') != null) {
+              var _activeTab3 = JSON.parse(localStorage.getItem('activeTab') || '{}');
+
+              var indexTab = _activeTab3 === null || _activeTab3 === void 0 ? void 0 : _activeTab3.findIndex(function (item) {
+                return item.sessionId == props.sessionId && item.isTeacher == isTeacher;
+              });
+
+              if (indexTab != -1) {
+                _activeTab3[indexTab].content = "";
+              }
+
+              localStorage.setItem('activeTab', JSON.stringify(_activeTab3));
+            }
+          });
         });
       }, function (err) {
         dispatch(marioCore.setAlert({
@@ -8077,6 +8160,7 @@ var DialogNodes = function DialogNodes(props) {
     className: "" + stylesOto["footer-note-form"],
     value: inputValue,
     onChange: handleChange,
+    maxRows: 6,
     style: {
       border: "none"
     },
@@ -8116,6 +8200,55 @@ var DialogNodes = function DialogNodes(props) {
   }))))));
 };
 
+function areEqual(prevProps, nextProps) {
+  if (prevProps.checkOpenModal == nextProps.checkOpenModal) return false;
+  return true;
+}
+
+var DialogNodes$1 = React__default.memo(DialogNodes, areEqual);
+
+var SimpleDialog$2 = function SimpleDialog(props) {
+  var onClose = props.onClose,
+      selectedValue = props.selectedValue,
+      open = props.open,
+      checkOpenModal = props.checkOpenModal,
+      listLearningStrategoryCategory = props.listLearningStrategoryCategory,
+      currentSessionTypeId = props.currentSessionTypeId;
+
+  var handleClose = function handleClose() {
+    if (localStorage.getItem("activeTab") != null) {
+      localStorage.removeItem("activeTab");
+    }
+
+    onClose(selectedValue);
+  };
+
+  return React__default.createElement(core.Dialog, {
+    onClose: handleClose,
+    open: open,
+    fullWidth: true,
+    maxWidth: "sm",
+    style: {
+      maxHeight: "90%",
+      marginTop: "80px"
+    }
+  }, React__default.createElement(DialogNodes$1, {
+    handleClose: handleClose,
+    sessionId: props.sessionId,
+    sessionResultId: props.sessionResultId,
+    checkOpenModal: checkOpenModal,
+    listLearningStrategoryCategory: listLearningStrategoryCategory,
+    currentSessionTypeId: currentSessionTypeId
+  }));
+};
+
+function areEqual$1(prevProps, nextProps) {
+  if (prevProps.checkOpenModal == nextProps.checkOpenModal) return false;
+  return true;
+}
+
+var SimpleDialog$3 = React__default.memo(SimpleDialog$2, areEqual$1);
+
 function NodeDraggable(props) {
   var _useState = React.useState({
     xAxis: 0,
@@ -8192,41 +8325,6 @@ var ConductIndex = function ConductIndex() {
     setOpen(false);
   };
 
-  var SimpleDialog = function SimpleDialog(props) {
-    var onClose = props.onClose,
-        selectedValue = props.selectedValue,
-        open = props.open,
-        checkOpenModal = props.checkOpenModal,
-        listLearningStrategoryCategory = props.listLearningStrategoryCategory,
-        currentSessionTypeId = props.currentSessionTypeId;
-
-    var handleClose = function handleClose() {
-      if (localStorage.getItem("activeTab") != null) {
-        localStorage.removeItem("activeTab");
-      }
-
-      onClose(selectedValue);
-    };
-
-    return React__default.createElement(core.Dialog, {
-      onClose: handleClose,
-      open: open,
-      fullWidth: true,
-      maxWidth: "sm",
-      style: {
-        maxHeight: "90%",
-        marginTop: "80px"
-      }
-    }, React__default.createElement(DialogNodes, {
-      handleClose: handleClose,
-      sessionId: sessionId,
-      sessionResultId: sessionResultId,
-      checkOpenModal: checkOpenModal,
-      listLearningStrategoryCategory: listLearningStrategoryCategory,
-      currentSessionTypeId: currentSessionTypeId
-    }));
-  };
-
   var history = reactRouterDom.useHistory();
   var questionRatings = listQuestionStudents.filter(function (item) {
     return item.type == QuestionType.Rating && !!item.isBeforeSession;
@@ -8482,13 +8580,15 @@ var ConductIndex = function ConductIndex() {
     }
   }, React__default.createElement(NodeDraggable, {
     handleClickOpen: handleClickOpen
-  })), React__default.createElement(SimpleDialog, {
+  })), React__default.createElement(SimpleDialog$3, {
     selectedValue: "",
     open: open,
     onClose: handleClose,
     checkOpenModal: checkOpenModal,
     listLearningStrategoryCategory: listLearningStrategoryCategory,
-    currentSessionTypeId: sessionTypeCategoryId
+    currentSessionTypeId: sessionTypeCategoryId,
+    sessionId: sessionId,
+    sessionResultId: sessionResultId
   }), React__default.createElement(core.Dialog, {
     open: openModalSession,
     onClose: handleModalSessionClose,
@@ -17275,6 +17375,44 @@ var useConferenceRubric = function useConferenceRubric() {
   };
 };
 
+var SimpleDialog$4 = function SimpleDialog(props) {
+  var onClose = props.onClose,
+      selectedValue = props.selectedValue,
+      open = props.open,
+      checkOpenModal = props.checkOpenModal,
+      conferenceId = props.conferenceId,
+      isTeacher = props.isTeacher,
+      conferenceResult = props.conferenceResult;
+
+  var handleClose = function handleClose() {
+    if (localStorage.getItem("activeTab") != null) {
+      localStorage.removeItem("activeTab");
+    }
+
+    onClose(selectedValue);
+  };
+
+  return React__default.createElement(core.Dialog, {
+    onClose: handleClose,
+    open: open,
+    fullWidth: true,
+    maxWidth: "sm"
+  }, React__default.createElement(DialogNodes$1, {
+    handleClose: handleClose,
+    sessionId: conferenceId,
+    sessionResultId: isTeacher ? conferenceResult.teacherResultId : conferenceResult.studentResultId,
+    checkOpenModal: checkOpenModal,
+    isPageConference: true
+  }));
+};
+
+function areEqual$2(prevProps, nextProps) {
+  if (prevProps.checkOpenModal == nextProps.checkOpenModal) return false;
+  return true;
+}
+
+var SimpleDialog$5 = React__default.memo(SimpleDialog$4, areEqual$2);
+
 var QuestionType$1;
 
 (function (QuestionType) {
@@ -17432,38 +17570,6 @@ var ConferenceRubric = function ConferenceRubric() {
     document.title = "Start conference";
     !!foundId && getPartnerProfileSelector(foundId);
   }, [foundId]);
-
-  var SimpleDialog = function SimpleDialog(props) {
-    var onClose = props.onClose,
-        selectedValue = props.selectedValue,
-        open = props.open,
-        checkOpenModal = props.checkOpenModal,
-        conferenceId = props.conferenceId,
-        isTeacher = props.isTeacher,
-        conferenceResult = props.conferenceResult;
-
-    var handleClose = function handleClose() {
-      if (localStorage.getItem("activeTab") != null) {
-        localStorage.removeItem("activeTab");
-      }
-
-      onClose(selectedValue);
-    };
-
-    return React__default.createElement(core.Dialog, {
-      onClose: handleClose,
-      open: open,
-      fullWidth: true,
-      maxWidth: "sm"
-    }, React__default.createElement(DialogNodes, {
-      handleClose: handleClose,
-      sessionId: conferenceId,
-      sessionResultId: isTeacher ? conferenceResult.teacherResultId : conferenceResult.studentResultId,
-      checkOpenModal: checkOpenModal,
-      isPageConference: true
-    }));
-  };
-
   return React__default.createElement("div", {
     className: styles$7["block-conference"]
   }, React__default.createElement(HeaderComponent, {
@@ -17586,7 +17692,7 @@ var ConferenceRubric = function ConferenceRubric() {
     }
   }, React__default.createElement(NodeDraggable, {
     handleClickOpen: handleClickOpen
-  })), React__default.createElement(ScrollToTopBtn, null), React__default.createElement(SimpleDialog, {
+  })), React__default.createElement(ScrollToTopBtn, null), React__default.createElement(SimpleDialog$5, {
     selectedValue: "",
     open: open,
     onClose: handleClose,
@@ -21824,6 +21930,10 @@ function NotificationsPage() {
   var updateSetting = React.useCallback(function () {
     return updateSettingPage(dataSetting);
   }, [dataSetting]);
+  var roles = reactRedux.useSelector(function (state) {
+    return state.common.user;
+  }).roles;
+  console.log(roles.includes('Teacher'));
   return React__default.createElement("div", {
     id: "setting-page",
     className: classes.paddindNotificationsPage
@@ -21865,7 +21975,7 @@ function NotificationsPage() {
     }
   }, React__default.createElement("p", {
     className: classes.textNotifications
-  }, "Send notification when a student quick start a session/conference"), React__default.createElement(core.Switch, {
+  }, "Send notification when a ", roles.includes('Teacher') ? "student" : "teacher", "  quick start a session/conference"), React__default.createElement(core.Switch, {
     color: "primary",
     name: "IsReceiveNotificationBookedSession",
     onChange: onChangeDataSettingPage,
@@ -21881,7 +21991,7 @@ function NotificationsPage() {
     }
   }, React__default.createElement("p", {
     className: classes.textNotifications
-  }, "Send notification when a student books a session/conference"), React__default.createElement(core.Switch, {
+  }, "Send notification when a ", roles.includes('Teacher') ? "student" : "teacher", " books a session/conference"), React__default.createElement(core.Switch, {
     color: "primary",
     name: "IsReceiveNotificationPrebookedSession",
     onChange: onChangeDataSettingPage,