mario-teacher-student-client 1.9.8 → 2.0.1

package/dist/containers/MyConferences/hooks/useUpComing.d.ts

@@ -17,5 +17,6 @@ declare const useUpComing: () => {
     nextSession: any;
     nextTimeMeeting: () => Promise<void>;
     getStudentSelector: () => Promise<void>;
+    studentNameReq: string | null;
 };
 export default useUpComing;

package/dist/containers/MyOneToOne/hooks/useUpComing.d.ts

@@ -20,5 +20,6 @@ declare const useUpComing: () => {
     getAllNoteConference: (sessionId: any) => Promise<void>;
     updateConferenceRubricPrivateNote: (privateNote: any, conferenceId: any) => Promise<void>;
     deleteNoteConference: (noteId: any, sessionId: any) => Promise<void>;
+    studentNameReq: string | null;
 };
 export default useUpComing;

package/dist/index.js

@@ -28,6 +28,8 @@ var Tabs = _interopDefault(require('@material-ui/core/Tabs'));
 var Tab = _interopDefault(require('@material-ui/core/Tab'));
 var Box = _interopDefault(require('@material-ui/core/Box'));
 var AddBoxIcon = _interopDefault(require('@material-ui/icons/AddBox'));
+var _ = require('lodash');
+var ___default = _interopDefault(_);
 var Autocomplete = _interopDefault(require('@material-ui/lab/Autocomplete'));
 var SearchIcon = _interopDefault(require('@material-ui/icons/Search'));
 var ArrowDropDownIcon = _interopDefault(require('@material-ui/icons/ArrowDropDown'));
@@ -45,7 +47,6 @@ var TableRow = _interopDefault(require('@material-ui/core/TableRow'));
 var FilterListIcon = _interopDefault(require('@material-ui/icons/FilterList'));
 var StarBorderIcon = _interopDefault(require('@material-ui/icons/StarBorder'));
 var StarIcon = _interopDefault(require('@material-ui/icons/Star'));
-var _ = _interopDefault(require('lodash'));
 var styled = _interopDefault(require('@emotion/styled'));
 var TimelineIcon = _interopDefault(require('@material-ui/icons/Timeline'));
 var CloseIcon = _interopDefault(require('@material-ui/icons/Close'));
@@ -1376,6 +1377,10 @@ var useUpComing = function useUpComing() {
     return (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
   });
   var isTeacher = currentUser.roles.includes("Teacher");
+  var search = location.search;
+  var params = new URLSearchParams(search);
+  var studentNameReq = params.get('studentNameReq');
+  var startDateReq = params.get('startDateReq');
   var filters = null;
   var setFilters = null;
 
@@ -1394,11 +1399,11 @@ var useUpComing = function useUpComing() {
     setFilters = _useState3[1];
   } else {
     var _useState4 = React.useState({
-      startDate: Date.now(),
-      endDate: moment().add(7, "days").valueOf(),
+      startDate: startDateReq != null ? _.parseInt(startDateReq) : Date.now(),
+      endDate: startDateReq != null ? _.parseInt(startDateReq) : moment().add(7, "days").valueOf(),
       currentPage: 1,
       pageSize: 10,
-      searchString: "",
+      searchString: studentNameReq != null ? studentNameReq : "",
       sortBy: "StartTime",
       sortOrder: "ASC"
     });
@@ -1792,7 +1797,8 @@ var useUpComing = function useUpComing() {
     createConferenceSingleNote: createConferenceSingleNote,
     getAllNoteConference: getAllNoteConference,
     updateConferenceRubricPrivateNote: updateConferenceRubricPrivateNote,
-    deleteNoteConference: deleteNoteConference
+    deleteNoteConference: deleteNoteConference,
+    studentNameReq: studentNameReq
   };
 };
 
@@ -2206,7 +2212,8 @@ var UpComing = function UpComing() {
       filters = _useUpComing.filters,
       changeFilters = _useUpComing.changeFilters,
       nextSession = _useUpComing.nextSession,
-      changRouteQuestion = _useUpComing.changRouteQuestion;
+      changRouteQuestion = _useUpComing.changRouteQuestion,
+      studentNameReq = _useUpComing.studentNameReq;
 
   var handleSort = function handleSort(e) {
     if (e === "StartTime") {
@@ -2387,7 +2394,8 @@ var UpComing = function UpComing() {
       "aria-label": "search"
     },
     onChange: handleChangeInputSearch,
-    ref: inputSearch
+    ref: inputSearch,
+    defaultValue: studentNameReq != null ? studentNameReq : ""
   }))), isTeacher && screenWidth <= 600 && React__default.createElement(core.Grid, {
     item: true,
     className: "" + stylesOto["gr-action"]
@@ -2404,7 +2412,8 @@ var UpComing = function UpComing() {
       "aria-label": "search"
     },
     onChange: handleChangeInputSearch,
-    ref: inputSearch
+    ref: inputSearch,
+    defaultValue: studentNameReq != null ? studentNameReq : ""
   })), React__default.createElement("div", {
     className: stylesOto["gr-date-time-mobile"] + " icon-custom"
   }, React__default.createElement(EventIcon, {
@@ -2778,7 +2787,7 @@ var useSessionCompleted = function useSessionCompleted() {
       var _temp10 = _catch(function () {
         return Promise.resolve(updateItemFavourite(itemID)).then(function (res) {
           if (!!res) {
-            var clonedData = _.cloneDeep(sessionDataHistory);
+            var clonedData = ___default.cloneDeep(sessionDataHistory);
 
             clonedData.items.map(function (row) {
               if (row.id == itemID && isTeacher) {
@@ -3666,12 +3675,17 @@ var useUpComing$1 = function useUpComing() {
       studentData = _useState2[0],
       setStudentData = _useState2[1];
 
+  var search = location.search;
+  var params = new URLSearchParams(search);
+  var studentNameReq = params.get('studentNameReq');
+  var startDateReq = params.get('startDateReq');
+
   var _useState3 = React.useState({
-    startDate: Date.now(),
-    endDate: moment().add(7, "days").valueOf(),
+    startDate: startDateReq != null ? parseInt(startDateReq) : Date.now(),
+    endDate: startDateReq != null ? parseInt(startDateReq) : moment().add(7, "days").valueOf(),
     currentPage: 1,
     pageSize: 10,
-    searchString: "",
+    searchString: studentNameReq != null ? studentNameReq : "",
     sortBy: "StartTime",
     sortOrder: "DESC"
   }),
@@ -3941,7 +3955,8 @@ var useUpComing$1 = function useUpComing() {
     updatePrivateNote: updatePrivateNote,
     nextSession: nextSession,
     nextTimeMeeting: nextTimeMeeting,
-    getStudentSelector: getStudentSelector
+    getStudentSelector: getStudentSelector,
+    studentNameReq: studentNameReq
   };
 };
 
@@ -4154,7 +4169,8 @@ var UpComing$1 = function UpComing() {
       changeFilters = _useUpComing.changeFilters,
       nextSession = _useUpComing.nextSession,
       nextTimeMeeting = _useUpComing.nextTimeMeeting,
-      changRouteQuestion = _useUpComing.changRouteQuestion;
+      changRouteQuestion = _useUpComing.changRouteQuestion,
+      studentNameReq = _useUpComing.studentNameReq;
 
   var renderUrlImage = function renderUrlImage(row) {
     var url = isTeacher ? row.studentAvatar : row.teacherAvatar;
@@ -4330,7 +4346,8 @@ var UpComing$1 = function UpComing() {
       "aria-label": "search"
     },
     onChange: handleChangeInputSearch,
-    ref: inputSearch
+    ref: inputSearch,
+    defaultValue: studentNameReq != null ? studentNameReq : ""
   }))), isTeacher && screenWidth <= 600 && React__default.createElement(core.Grid, {
     item: true,
     className: "" + styles$1["gr-action"]
@@ -4344,7 +4361,8 @@ var UpComing$1 = function UpComing() {
     placeholder: "Search Student",
     className: "" + styles$1["inputInput"],
     onChange: handleChangeInputSearch,
-    ref: inputSearch
+    ref: inputSearch,
+    defaultValue: studentNameReq != null ? studentNameReq : ""
   })), React__default.createElement("div", {
     className: "" + styles$1["gr-date-time-mobile"]
   }, React__default.createElement(EventIcon, {
@@ -4665,7 +4683,7 @@ var useSessionCompleted$1 = function useSessionCompleted() {
       var _temp8 = _catch(function () {
         return Promise.resolve(updateItemFavourite(itemID)).then(function (res) {
           if (!!res) {
-            var clonedData = _.cloneDeep(sessionDataHistory);
+            var clonedData = ___default.cloneDeep(sessionDataHistory);
 
             clonedData.items.map(function (row) {
               if (row.id == itemID && isTeacher) {
@@ -6225,6 +6243,10 @@ var useConductOne = function useConductOne() {
         getAnswerStudent(parseInt(sessionId), data.userId);
       });
       channel.bind("TOGGLE_LOCK_STATUS", function (data) {
+        if (data.isCheckResultDone && !!data.sessionResultId && isStudent) {
+          history.push("/start-question/" + sessionId + "/" + data.sessionResultId);
+        }
+
         setIsUnclocked(data.IsUnlocked);
       });
     }
@@ -8632,7 +8654,7 @@ var BookSession = function BookSession() {
             type: "success",
             message: "Book session successfully"
           }));
-          history.push("/my-one-to-one/up-coming");
+          history.push("/my-one-to-one/up-coming?startDateReq=" + time + "&studentNameReq=" + studentFullName);
         });
       }, function (err) {
         var _err$response, _err$response$data;
@@ -16908,6 +16930,10 @@ var useConferenceRubric = function useConferenceRubric() {
       });
       channel.bind("TOGGLE_LOCK_STATUS", function (data) {
         if (isStudent) {
+          if (data.isCheckResultDone) {
+            history.push("/start-conference/" + studentId + "/" + conferenceId + "/conferenceRubric");
+          }
+
           setIsUnclocked(data.IsUnlocked);
         }
       });
@@ -18174,7 +18200,7 @@ var BookSessionConferences = function BookSessionConferences() {
             type: "success",
             message: "Book conferences successfully"
           }));
-          history.push("/my-conferences/up-coming");
+          history.push("/my-conferences/up-coming?startDateReq=" + time + "&studentNameReq=" + studentFullName);
         });
       }, function (err) {
         dispatch(marioCore.setAlert({