mario-teacher-student-client 1.9.9 → 2.0.0

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"
     });
@@ -2778,7 +2783,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 +3671,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"
   }),
@@ -4665,7 +4675,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) {
@@ -8636,7 +8646,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;
@@ -18182,7 +18192,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({