mario-teacher-student-client 1.9.9 → 2.0.2

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/containers/MyStudent/configs/createStudentSchema.d.ts

@@ -1,10 +1,15 @@
+import * as yup from "yup";
 declare const schema: import("yup/lib/object").OptionalObjectSchema<{
     firstName: import("yup/lib/string").RequiredStringSchema<string | undefined, Record<string, any>>;
     lastName: import("yup/lib/string").RequiredStringSchema<string | undefined, Record<string, any>>;
     email: import("yup/lib/string").RequiredStringSchema<string | undefined, Record<string, any>>;
+    secondaryEmail: yup.StringSchema<string | undefined, Record<string, any>, string | undefined>;
+    thirdEmail: yup.StringSchema<string | undefined, Record<string, any>, string | undefined>;
 }, Record<string, any>, import("yup/lib/object").TypeOfShape<{
     firstName: import("yup/lib/string").RequiredStringSchema<string | undefined, Record<string, any>>;
     lastName: import("yup/lib/string").RequiredStringSchema<string | undefined, Record<string, any>>;
     email: import("yup/lib/string").RequiredStringSchema<string | undefined, Record<string, any>>;
+    secondaryEmail: yup.StringSchema<string | undefined, Record<string, any>, string | undefined>;
+    thirdEmail: yup.StringSchema<string | undefined, Record<string, any>, string | undefined>;
 }>>;
 export default schema;

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) {
@@ -5252,7 +5270,7 @@ function BiArrowBack (props) {
 }
 
 var _templateObject;
-var Header = styled.div(_templateObject || (_templateObject = _taggedTemplateLiteralLoose(["\n    position: fixed;\n    top: 64px;\n    display: flex;\n    height: 76px;\n    justify-content: space-between;\n    align-items: center;\n    padding: 20px 16px;\n    border-bottom: 1px solid #a3a2a2;\n    background: #fff;\n    z-index: 99;\n    width: ", "px;\n    transition: width 200ms;\n    @media (max-width: 600px) {\n        width: 100%;\n        top: 56px;\n    }\n"])), function (props) {
+var Header = styled.div(_templateObject || (_templateObject = _taggedTemplateLiteralLoose(["\n    position: fixed;\n    top: 64px;\n    width: 100%;\n    display: flex;\n    height: 76px;\n    justify-content: space-between;\n    align-items: center;\n    padding: 20px 16px;\n    border-bottom: 1px solid #a3a2a2;\n    background: #fff;\n    z-index: 99;\n    width: ", "px;\n    transition: width 200ms;\n    @media (max-width: 600px) {\n        width: 100%;\n        top: 56px;\n    }\n"])), function (props) {
   return props.width;
 });
 
@@ -8636,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;
@@ -17306,18 +17324,18 @@ var ConferenceRubric = function ConferenceRubric() {
       id: "outlined-age-native-simple"
     }
   }, React__default.createElement("option", {
+    value: 10
+  }, "10 min"), React__default.createElement("option", {
+    value: 20
+  }, "20 min"), React__default.createElement("option", {
+    value: 30
+  }, "30 min"), React__default.createElement("option", {
+    value: 40
+  }, "40 min"), React__default.createElement("option", {
+    value: 50
+  }, "50 min"), React__default.createElement("option", {
     value: 60
-  }, "1h"), React__default.createElement("option", {
-    value: 120
-  }, "2h"), React__default.createElement("option", {
-    value: 180
-  }, "3h"), React__default.createElement("option", {
-    value: 240
-  }, "4h"), React__default.createElement("option", {
-    value: 300
-  }, "5h"), React__default.createElement("option", {
-    value: 360
-  }, "6h")))) : React__default.createElement(React__default.Fragment, null, React__default.createElement("h4", {
+  }, "1 hour")))) : React__default.createElement(React__default.Fragment, null, React__default.createElement("h4", {
     className: styles$7["tite-body"]
   }, "Be sure to check with your teacher that you have completed all that is required")))), React__default.createElement(core.DialogActions, null, React__default.createElement(core.Button, {
     onClick: handleModalConferenceClose,
@@ -18182,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({
@@ -20292,7 +20310,9 @@ var useUpdateProfile = function useUpdateProfile(studentId) {
 var schema$1 = yup.object({
   firstName: yup.string().required("First name is required"),
   lastName: yup.string().required("Last name is required"),
-  email: yup.string().email('Invalid email').required("Email is required")
+  email: yup.string().email('Invalid email').required("Email is required"),
+  secondaryEmail: yup.string().email('Invalid email'),
+  thirdEmail: yup.string().email('Invalid email')
 });
 
 var DEFAULT_USER_AVATAR$f = "/images/image-default.png";
@@ -20841,13 +20861,16 @@ var CreateStudent = function CreateStudent() {
     }, errors.email) : null, React__default.createElement(core.Typography, {
       className: "" + styles$9["profile-label"]
     }, "Secondary Email (optional)"), React__default.createElement(core.TextField, {
+      name: "email",
       variant: "outlined",
       value: values === null || values === void 0 ? void 0 : values.secondaryEmail,
       className: "" + styles$9["input-field"],
       onChange: function onChange(e) {
         return setFieldValue("secondaryEmail", e.target.value);
       }
-    }), React__default.createElement(core.Typography, {
+    }), errors.secondaryEmail && touched.secondaryEmail ? React__default.createElement("div", {
+      className: "" + styles$9["input-error"]
+    }, errors.secondaryEmail) : null, React__default.createElement(core.Typography, {
       className: "" + styles$9["profile-label"]
     }, "Secondary Email Owner"), React__default.createElement(core.TextField, {
       select: true,
@@ -20865,13 +20888,16 @@ var CreateStudent = function CreateStudent() {
     })), React__default.createElement(core.Typography, {
       className: "" + styles$9["profile-label"]
     }, "Third Email (optional)"), React__default.createElement(core.TextField, {
+      name: "email",
       variant: "outlined",
       value: values === null || values === void 0 ? void 0 : values.thirdEmail,
       className: "" + styles$9["input-field"],
       onChange: function onChange(e) {
         return setFieldValue("thirdEmail", e.target.value);
       }
-    }), React__default.createElement(core.Typography, {
+    }), errors.thirdEmail && touched.thirdEmail ? React__default.createElement("div", {
+      className: "" + styles$9["input-error"]
+    }, errors.thirdEmail) : null, React__default.createElement(core.Typography, {
       className: "" + styles$9["profile-label"]
     }, "Third Email Owner"), React__default.createElement(core.TextField, {
       select: true,
@@ -21538,7 +21564,7 @@ function NotificationsPage() {
     }
   }, React__default.createElement("p", {
     className: classes.textNotifications
-  }, "Send notification when students quick start a session/conference"), React__default.createElement(core.Switch, {
+  }, "Send notification when a student quick start a session/conference"), React__default.createElement(core.Switch, {
     color: "primary",
     name: "IsReceiveNotificationBookedSession",
     onChange: onChangeDataSettingPage,
@@ -21554,7 +21580,7 @@ function NotificationsPage() {
     }
   }, React__default.createElement("p", {
     className: classes.textNotifications
-  }, "Send notification when students books a session/conference"), React__default.createElement(core.Switch, {
+  }, "Send notification when a student books a session/conference"), React__default.createElement(core.Switch, {
     color: "primary",
     name: "IsReceiveNotificationPrebookedSession",
     onChange: onChangeDataSettingPage,
@@ -21568,7 +21594,7 @@ function NotificationsPage() {
     style: {
       fontSize: "18px"
     }
-  }, "Time to mute notifications (Over Night)"), screenWidth$3 < 600 ? React__default.createElement(pickers.MuiPickersUtilsProvider, {
+  }, "Mute notifications over night"), screenWidth$3 < 600 ? React__default.createElement(pickers.MuiPickersUtilsProvider, {
     utils: MomentUtils
   }, React__default.createElement(pickers.KeyboardDateTimePicker, {
     disablePast: true,
@@ -21577,6 +21603,8 @@ function NotificationsPage() {
     margin: "normal",
     id: "date-picker-inline",
     label: "From",
+    error: false,
+    helperText: null,
     value: dataSetting.MuteNotificationStartTime,
     onChange: handleDateChangeStart,
     KeyboardButtonProps: {
@@ -21589,6 +21617,8 @@ function NotificationsPage() {
     margin: "normal",
     id: "date-picker-inline",
     label: "To",
+    error: false,
+    helperText: null,
     value: dataSetting.MuteNotificationEndTime,
     onChange: handleDateChangeEnd,
     KeyboardButtonProps: {
@@ -21603,6 +21633,8 @@ function NotificationsPage() {
     margin: "normal",
     id: "date-picker-inline",
     label: "From",
+    error: false,
+    helperText: null,
     value: dataSetting.MuteNotificationStartTime,
     onChange: handleDateChangeStart,
     KeyboardButtonProps: {
@@ -21615,6 +21647,8 @@ function NotificationsPage() {
     margin: "normal",
     id: "date-picker-inline",
     label: "To",
+    error: false,
+    helperText: null,
     style: {
       marginLeft: "20px"
     },