mario-teacher-student-client 2.1.88-admin → 2.1.89-admin

package/dist/containers/MyStudent/hooks/useClassReflectionList.d.ts

@@ -1,9 +1,15 @@
 import { FILTER_SESSION } from "../constants/types";
+interface STUDENT_INFO {
+    fullName: string;
+    email: string;
+}
 declare const useClassReflectionList: () => {
     changeFilters: (updatedFilters: any) => void;
     filters: FILTER_SESSION;
     getDataClassReflections: (filters: any, studentId: any) => Promise<void>;
     classReflectionData: any;
     classFontSize: string;
+    getStudentInfo: (studentId: number) => Promise<void>;
+    studentInfo: STUDENT_INFO | undefined;
 };
 export default useClassReflectionList;

package/dist/index.js

@@ -4046,6 +4046,9 @@ var getAllDesginations = function getAllDesginations() {
 var downloadTemplateFile = function downloadTemplateFile() {
   return marioCore.api.get(TEACHER_URL$1 + "/download-template-file");
 };
+var getStudentName = function getStudentName(studentId) {
+  return marioCore.api.get(STUDENT_URL + "/info/" + studentId);
+};
 
 var useChangeRoteQuestion = function useChangeRoteQuestion() {
   var dispatch = reactRedux.useDispatch();
@@ -12227,7 +12230,6 @@ var ConductIndex = function ConductIndex() {
       listQuestionStudents = _useConductOne.listQuestionStudents,
       listQuestionTeachers = _useConductOne.listQuestionTeachers,
       listLearningStrategory = _useConductOne.listLearningStrategory,
-      listLearningStrategoryCategory = _useConductOne.listLearningStrategoryCategory,
       updateQuestionAnswer = _useConductOne.updateQuestionAnswer,
       isUnlocked = _useConductOne.isUnlocked,
       setIsUnclocked = _useConductOne.setIsUnclocked,
@@ -12249,7 +12251,6 @@ var ConductIndex = function ConductIndex() {
       isUserChangeSession = _useConductOne.isUserChangeSession,
       numberOfEdit = _useConductOne.numberOfEdit,
       learningSupportCategoryId = _useConductOne.learningSupportCategoryId,
-      setLearningSupportCategoryId = _useConductOne.setLearningSupportCategoryId,
       isConversation = _useConductOne.isConversation,
       setConversation = _useConductOne.setConversation,
       onChangeConversationSession = _useConductOne.onChangeConversationSession,
@@ -12293,11 +12294,6 @@ var ConductIndex = function ConductIndex() {
     updateQuestionAnswer(questionId, value);
   };
 
-  var onChangeSessionCategory = function onChangeSessionCategory(event) {
-    var value = event.target.value;
-    setLearningSupportCategoryId(parseInt(value));
-  };
-
   var onChangeAfterSession = function onChangeAfterSession(checkedAfter) {
     setIsUnclocked(checkedAfter);
     onChangeToogleAfterSession();
@@ -12380,19 +12376,6 @@ var ConductIndex = function ConductIndex() {
     setOpenScaffolding(false);
   };
 
-  var compare = function compare(a, b) {
-    if (a.name < b.name) {
-      return -1;
-    }
-
-    if (a.name > b.name) {
-      return 1;
-    }
-
-    return 0;
-  };
-
-  var listSorted = !!listLearningStrategoryCategory && listLearningStrategoryCategory.sort(compare);
   return React__default.createElement("div", {
     className: styles$4["page-conduct"] + " " + styles$4[classFontSize]
   }, React__default.createElement(HeaderComponent, {
@@ -12451,67 +12434,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("div", {
-    className: styles$4["block-question"]
-  }, React__default.createElement("div", {
-    className: styles$4["title-strategories"]
-  }, React__default.createElement("div", {
-    className: styles$4["strategories-title"]
-  }, React__default.createElement("h2", {
-    className: styles$4["font-title"]
-  }, "Session Type"))), React__default.createElement("div", {
-    className: styles$4["block-session-type"]
-  }, React__default.createElement("div", {
-    className: styles$4["session-text"]
-  }, React__default.createElement("h2", null, "What is this session type?")), React__default.createElement("div", {
-    className: styles$4["session-select"]
-  }, React__default.createElement(core.FormControl, {
-    variant: "outlined",
-    style: {
-      minWidth: 300
-    }
-  }, React__default.createElement(core.InputLabel, {
-    htmlFor: "outlined-age-native-simple"
-  }, "Session type"), isUserChangeSession ? React__default.createElement(core.Select, {
-    "native": true,
-    value: learningSupportCategoryId,
-    onChange: function onChange(event) {
-      return onChangeSessionCategory(event);
-    },
-    label: "Session type",
-    inputProps: {
-      name: "age",
-      id: "outlined-age-native-simple"
-    },
-    style: {
-      borderRadius: "12px",
-      overflow: "hidden"
-    }
-  }, React__default.createElement("option", {
-    "aria-label": "None",
-    value: ""
-  }), listSorted === null || listSorted === void 0 ? void 0 : listSorted.map(function (item) {
-    return React__default.createElement("option", {
-      value: item.id,
-      style: {
-        color: "black"
-      },
-      key: item.id
-    }, item.name);
-  })) : React__default.createElement(core.Select, {
-    "native": true,
-    value: setLearningSupportCategoryId,
-    label: "Session type",
-    inputProps: {
-      name: "age",
-      id: "outlined-age-native-simple"
-    },
-    style: {
-      borderRadius: "12px",
-      overflow: "hidden"
-    },
-    disabled: true
-  }))))), isTeacher && isConversation && React__default.createElement("div", {
+  })))), isTeacher && isConversation && React__default.createElement("div", {
     className: styles$4["block-question"]
   }, React__default.createElement("div", {
     className: styles$4["title-strategories"]
@@ -17337,7 +17260,8 @@ var StudentTabs = function StudentTabs(props) {
   var history = reactRouterDom.useHistory();
   var location = reactRouterDom.useLocation();
   var pathname = location.pathname;
-  var tabs = props.tabs;
+  var tabs = props.tabs,
+      studentInfo = props.studentInfo;
 
   var toggle = function toggle(path) {
     history.push(path);
@@ -17347,10 +17271,6 @@ var StudentTabs = function StudentTabs(props) {
       defaultFont = _useFontStyles.defaultFont;
 
   var studentId = location.pathname.replace(/[^0-9]/g, "");
-
-  var _useStudentInfo = useStudentInfo(parseInt(studentId)),
-      studentInfo = _useStudentInfo.studentInfo;
-
   var user = reactRedux.useSelector(function (state) {
     var _state$common;
 
@@ -17468,7 +17388,7 @@ var StudentTabs = function StudentTabs(props) {
       onClick: function onClick() {
         return goBack();
       }
-    }), " ", studentInfo && studentInfo.name ? studentInfo.name : "")), React__default.createElement(core.Grid, {
+    }), " ", !!studentInfo && !!(studentInfo !== null && studentInfo !== void 0 && studentInfo.fullName) ? studentInfo === null || studentInfo === void 0 ? void 0 : studentInfo.fullName : "")), React__default.createElement(core.Grid, {
       item: true,
       xs: 12,
       style: {
@@ -30937,6 +30857,10 @@ var useClassReflectionList = function useClassReflectionList() {
       classReflectionData = _useState[0],
       setClassReflectionData = _useState[1];
 
+  var _useState2 = React.useState(),
+      studentInfo = _useState2[0],
+      setStudentInfo = _useState2[1];
+
   var defaultFont = reactRedux.useSelector(function (state) {
     var _state$common;
 
@@ -30954,15 +30878,15 @@ var useClassReflectionList = function useClassReflectionList() {
     return '';
   }, [defaultFont]);
 
-  var _useState2 = React.useState({
+  var _useState3 = React.useState({
     currentPage: 1,
     pageSize: 10,
     searchString: "",
     sortBy: "classType",
     sortOrder: "DESC"
   }),
-      filters = _useState2[0],
-      setFilters = _useState2[1];
+      filters = _useState3[0],
+      setFilters = _useState3[1];
 
   var changeFilters = function changeFilters(updatedFilters) {
     return setFilters(_extends({}, filters, updatedFilters));
@@ -30994,12 +30918,42 @@ var useClassReflectionList = function useClassReflectionList() {
       return Promise.reject(e);
     }
   }, [filters]);
+
+  var getStudentInfo = function getStudentInfo(studentId) {
+    try {
+      var _temp7 = function _temp7() {
+        dispatch(marioCore.setLoading(false));
+      };
+
+      dispatch(marioCore.setLoading(true));
+
+      var _temp8 = _catch(function () {
+        return Promise.resolve(getStudentName(studentId)).then(function (res) {
+          setStudentInfo(res.data);
+        });
+      }, function (err) {
+        var _err$response, _err$response$data;
+
+        dispatch(marioCore.setAlert({
+          type: "danger",
+          message: ((_err$response = err.response) === null || _err$response === void 0 ? void 0 : (_err$response$data = _err$response.data) === null || _err$response$data === void 0 ? void 0 : _err$response$data.title) || err.message
+        }));
+      });
+
+      return Promise.resolve(_temp8 && _temp8.then ? _temp8.then(_temp7) : _temp7(_temp8));
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
+
   return {
     changeFilters: changeFilters,
     filters: filters,
     getDataClassReflections: getDataClassReflections,
     classReflectionData: classReflectionData,
-    classFontSize: classFontSize
+    classFontSize: classFontSize,
+    getStudentInfo: getStudentInfo,
+    studentInfo: studentInfo
   };
 };
 
@@ -34414,7 +34368,7 @@ var remove = function remove(studentId, friendId) {
 var getTotalFriends = function getTotalFriends(studentId) {
   return marioCore.api.get(CIRCLE_FRIEND_URL + "/friendCircleAllStudent/" + studentId);
 };
-var getStudentName = function getStudentName(studentId) {
+var getStudentName$1 = function getStudentName(studentId) {
   return marioCore.api.get(CIRCLE_FRIEND_URL + "/" + studentId + "/name");
 };
 
@@ -34616,7 +34570,7 @@ var update$1 = function update(studentId, activityId, data) {
 var remove$1 = function remove(studentId, activityId) {
   return marioCore.api["delete"](ACTIVITY_CIRCLE + "/" + studentId + "/studentActivities/" + activityId);
 };
-var getStudentName$1 = function getStudentName(studentId) {
+var getStudentName$2 = function getStudentName(studentId) {
   return marioCore.api.get(ACTIVITY_CIRCLE + "/" + studentId + "/name");
 };
 
@@ -35542,6 +35496,11 @@ var tabConversation = {
 };
 
 var StudentDetail = function StudentDetail() {
+  var _useClassReflectionLi = useClassReflectionList(),
+      getStudentInfo = _useClassReflectionLi.getStudentInfo,
+      studentInfo = _useClassReflectionLi.studentInfo;
+
+  var studentId = location.pathname.replace(/[^0-9]/g, "");
   var isEnableIEP = reactRedux.useSelector(function (state) {
     var _state$common;
 
@@ -35562,8 +35521,12 @@ var StudentDetail = function StudentDetail() {
     tabLists = [].concat(tabLists, [tabConversation]);
   }
 
+  React.useEffect(function () {
+    getStudentInfo === null || getStudentInfo === void 0 ? void 0 : getStudentInfo(parseInt(studentId));
+  }, []);
   return React__default.createElement(Box, null, React__default.createElement(StudentTabs, {
-    tabs: tabLists
+    tabs: tabLists,
+    studentInfo: studentInfo
   }));
 };
 
@@ -50293,7 +50256,7 @@ var useListFriend = function useListFriend() {
       dispatch(marioCore.setLoading(true));
 
       var _temp4 = _catch(function () {
-        return Promise.resolve(getStudentName(parseInt(studentId))).then(function (res) {
+        return Promise.resolve(getStudentName$1(parseInt(studentId))).then(function (res) {
           setNameStudent(res.data);
         });
       }, function (err) {
@@ -51631,7 +51594,7 @@ var useListActivity = function useListActivity() {
       dispatch(marioCore.setLoading(true));
 
       var _temp8 = _catch(function () {
-        return Promise.resolve(getStudentName$1(parseInt(studentId))).then(function (res) {
+        return Promise.resolve(getStudentName$2(parseInt(studentId))).then(function (res) {
           setNameStudent(res.data);
         });
       }, function (err) {