mario-teacher-student-client 1.9.2 → 1.9.6

package/dist/components/Input/InputComponent.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="react" />
+interface Props {
+    valueText: string;
+    onChange: Function;
+    name?: string;
+}
+declare const InputComponent: ({ valueText, onChange, name }: Props) => JSX.Element;
+export default InputComponent;

package/dist/components/Input/TextAreaComponent.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="react" />
+interface Props {
+    label?: string;
+    valueText: string;
+    onChange: Function;
+}
+declare const TextAreaComponent: ({ valueText, onChange, label }: Props) => JSX.Element;
+export default TextAreaComponent;

package/dist/containers/LearningPlan/views/LearningPlan.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const LearningPlan: () => JSX.Element;
+export default LearningPlan;

package/dist/index.css

@@ -62,6 +62,8 @@
   display: flex;
   flex-direction: row;
   align-items: center; }
+  ._1bTW5 ._2T6Ym {
+    margin-right: 10px; }
   ._1bTW5 ._1gs0Z {
     font-size: 14px;
     font-weight: bold;
@@ -2664,10 +2666,14 @@ h2._1OAmb {
   position: absolute;
   align-items: center;
   top: 19px;
-  left: 20%; }
+  left: 22%; }
   ._1clLN ._1RV8f {
     display: flex;
-    align-items: center; }
+    align-items: center;
+    margin-top: -7px; }
+    @media only screen and (max-width: 1600px) {
+      ._1clLN ._1RV8f {
+        margin-left: -9px; } }
     ._1clLN ._1RV8f span {
       font-weight: bold;
       font-size: 14px;
@@ -2851,7 +2857,7 @@ h2._1OAmb {
 ._2-3s2 ._3xdp_ {
   display: inline;
   float: left;
-  margin-top: 3px; }
+  margin-top: 6px; }
 
 ._1m4nA:nth-of-type(odd) {
   background-color: #f9f9f9; }
@@ -4610,7 +4616,8 @@ h2._1KpSK {
   ._1WNMT ._3BU0L {
     display: flex;
     align-items: center;
-    margin-right: 25px; }
+    margin-right: 25px;
+    margin-left: 18px; }
     ._1WNMT ._3BU0L ._1N_R5 {
       margin-right: 10px;
       margin-top: -4px; }

package/dist/index.js

@@ -102,7 +102,7 @@ var getStudentSimpleProfile = function getStudentSimpleProfile() {
   return marioCore.api.get("" + STUDENT_PROFILE);
 };
 
-var styles = {"reset-the-content":"_1zJw3","header-left":"_11kCD","header-icon":"_dqAoB","header-right":"_1jTMg","btn-conduct-session":"_2K2FJ","btn-conduct-session-disabled":"_3ae8F","box-slider":"_1bTW5","slider-text":"_1gs0Z","font-question-name":"_13S5D","font-question":"_t-JhH","font-question-description":"_1YLGi","question-block":"_2gqE-","question-text":"_337MJ","question-slider":"_k_dl-","question-block-mobile":"_p-cUG","emotion-list":"_1M6M1","emotion-item":"_1wmi8","emotion-active":"_3JT39","block-learning-strategories":"_KKK4u","item-learning-strategories":"_1k7-R","question-today":"_WkaIn","block-button":"_275AS","talk-conduct":"_28jd3","box-talk":"_3zlbc","box-p":"_IXk4X","form-upload":"_1spIR","form-title":"_qDlsm","title":"_g-p72","description":"_2U60d","form-upload-image-box":"_2xZUq","form-upload-image":"_3C-Xm","form-upload-icon":"_2zIn5","form-upload-title":"_yNCgm","form-upload-description":"_35Wqq","header-right-download":"_27SXJ","download-title":"_1EWKg"};
+var styles = {"reset-the-content":"_1zJw3","header-left":"_11kCD","header-icon":"_dqAoB","header-right":"_1jTMg","btn-conduct-session":"_2K2FJ","btn-conduct-session-disabled":"_3ae8F","box-slider":"_1bTW5","margin-right":"_2T6Ym","slider-text":"_1gs0Z","font-question-name":"_13S5D","font-question":"_t-JhH","font-question-description":"_1YLGi","question-block":"_2gqE-","question-text":"_337MJ","question-slider":"_k_dl-","question-block-mobile":"_p-cUG","emotion-list":"_1M6M1","emotion-item":"_1wmi8","emotion-active":"_3JT39","block-learning-strategories":"_KKK4u","item-learning-strategories":"_1k7-R","question-today":"_WkaIn","block-button":"_275AS","talk-conduct":"_28jd3","box-talk":"_3zlbc","box-p":"_IXk4X","form-upload":"_1spIR","form-title":"_qDlsm","title":"_g-p72","description":"_2U60d","form-upload-image-box":"_2xZUq","form-upload-image":"_3C-Xm","form-upload-icon":"_2zIn5","form-upload-title":"_yNCgm","form-upload-description":"_35Wqq","header-right-download":"_27SXJ","download-title":"_1EWKg"};
 
 function toVal(mix) {
 	var k, y, str='';
@@ -155,6 +155,7 @@ var NEW_NOTIFICATION = "NEW_NOTIFICATION";
 var drawerWidth = 240;
 var headerHeightDesktop = 64;
 var headerHeightMobile = 55;
+var headerHeightScroll = 0;
 var LOGO = "/images/logo-new.png";
 var ICON_NAV = [{
   name: "Home",
@@ -322,7 +323,7 @@ var HeaderSideBar = function HeaderSideBar(_ref) {
     className: classes.sectionDesktop
   }, React__default.createElement("a", {
     className: classes.textPrivacy,
-    href: 'https://marioframework.com/privacy-policy',
+    href: 'https://marioframework.com/mario-for-me-privacy-policy/',
     target: "blank"
   }, "Privacy Policy"), React__default.createElement(IconButton, {
     "aria-label": "show 17 new notifications",
@@ -368,13 +369,15 @@ var HeaderSideBar = function HeaderSideBar(_ref) {
   }, !!navigations && navigations.map(function (navigation) {
     var _ICON_NAV$find;
 
+    console.log(navigation.to);
+    console.log(urlActive);
     return React__default.createElement(core.ListItem, {
       button: true,
       key: navigation === null || navigation === void 0 ? void 0 : navigation.name,
       onClick: function onClick() {
         return history.push(navigation.to);
       },
-      className: classes.drawerItem + " " + (urlActive != '' && (navigation.to.includes(urlActive) || navigation.to.includes('my-student') && urlActive == 'student-detail') ? classes.drawerActive : "")
+      className: classes.drawerItem + " " + (urlActive != '' && (navigation.to.includes(urlActive) || navigation.to.includes('my-student') && urlActive == 'student-detail' || navigation.to.includes('my-one-to-one') && urlActive == 'start-question' || navigation.to.includes('my-conferences') && urlActive == 'start-conference') ? classes.drawerActive : "")
     }, React__default.createElement(core.ListItemIcon, null, (_ICON_NAV$find = ICON_NAV.find(function (nav) {
       return nav.name == navigation.name;
     })) === null || _ICON_NAV$find === void 0 ? void 0 : _ICON_NAV$find.icon), React__default.createElement(core.ListItemText, null, React__default.createElement("span", {
@@ -409,7 +412,7 @@ var HeaderSideBar = function HeaderSideBar(_ref) {
   }, children));
 };
 var useStyles = styles$b.makeStyles(function (theme) {
-  var _drawer, _drawerPaper, _drawerPaperMobile, _content, _contentShift;
+  var _drawer, _textPrivacy, _drawerPaper, _drawerPaperMobile, _content, _contentShift;
 
   return {
     grow: {
@@ -441,7 +444,7 @@ var useStyles = styles$b.makeStyles(function (theme) {
     }, _drawer[theme.breakpoints.down(600)] = {
       display: "none"
     }, _drawer),
-    textPrivacy: {
+    textPrivacy: (_textPrivacy = {
       display: 'flex',
       alignItems: 'center',
       color: '#fff',
@@ -451,7 +454,9 @@ var useStyles = styles$b.makeStyles(function (theme) {
         color: '#fff',
         textDecoration: 'none'
       }
-    },
+    }, _textPrivacy[theme.breakpoints.down(415)] = {
+      marginRight: '0px'
+    }, _textPrivacy),
     drawerItem: {
       height: "70px",
       display: "flex",
@@ -480,11 +485,15 @@ var useStyles = styles$b.makeStyles(function (theme) {
       zIndex: 900
     }, _drawerPaper[theme.breakpoints.down(600)] = {
       paddingTop: headerHeightMobile
+    }, _drawerPaper[theme.breakpoints.down(415)] = {
+      paddingTop: headerHeightScroll
     }, _drawerPaper),
     drawerPaperMobile: (_drawerPaperMobile = {
       paddingTop: headerHeightDesktop
     }, _drawerPaperMobile[theme.breakpoints.down(600)] = {
       paddingTop: headerHeightMobile
+    }, _drawerPaperMobile[theme.breakpoints.down(415)] = {
+      paddingTop: headerHeightScroll
     }, _drawerPaperMobile),
     drawerActive: {
       background: "#156DA1",
@@ -2239,10 +2248,6 @@ var UpComing = function UpComing() {
       showDate = _useState[0],
       setShowDate = _useState[1];
 
-  var _useState2 = React.useState(new Date()),
-      disableDate = _useState2[0],
-      setDisableDate = _useState2[1];
-
   var handleShowDate = function handleShowDate() {
     setShowDate(!showDate);
   };
@@ -2253,7 +2258,6 @@ var UpComing = function UpComing() {
       startDate: date.valueOf(),
       currentPage: 1
     });
-    setDisableDate(new Date(date.valueOf()));
   };
 
   var handleChangeEndDate = function handleChangeEndDate(date) {
@@ -2295,9 +2299,9 @@ var UpComing = function UpComing() {
     setOpenMobile(false);
   };
 
-  var _useState3 = React.useState(0),
-      studentId = _useState3[0],
-      setStudentId = _useState3[1];
+  var _useState2 = React.useState(0),
+      studentId = _useState2[0],
+      setStudentId = _useState2[1];
 
   var onClickStartQuestion = React.useCallback(function () {
     changRouteQuestion(studentId);
@@ -2331,9 +2335,10 @@ var UpComing = function UpComing() {
     },
     KeyboardButtonProps: {
       "aria-label": "change date"
-    }
+    },
+    maxDate: filters.endDate
   }), React__default.createElement(pickers.KeyboardDatePicker, {
-    minDate: disableDate,
+    minDate: filters.startDate,
     inputVariant: "outlined",
     format: "Do MMM YYYY",
     id: "time-picker",
@@ -2400,9 +2405,10 @@ var UpComing = function UpComing() {
     },
     KeyboardButtonProps: {
       "aria-label": "change date"
-    }
+    },
+    maxDate: filters.endDate
   }), React__default.createElement(pickers.KeyboardDatePicker, {
-    minDate: disableDate,
+    minDate: filters.startDate,
     inputVariant: "outlined",
     format: "Do MMM YYYY",
     id: "time-picker",
@@ -2802,10 +2808,6 @@ var SessionCompleted = function SessionCompleted() {
       selectFavourite = _useSessionCompleted.selectFavourite,
       changRouteQuestion = _useSessionCompleted.changRouteQuestion;
 
-  var _useState = React.useState(new Date()),
-      disableDate = _useState[0],
-      setDisableDate = _useState[1];
-
   var roles = reactRedux.useSelector(function (state) {
     var _state$common, _state$common$user;
 
@@ -2882,7 +2884,6 @@ var SessionCompleted = function SessionCompleted() {
       startDate: date.valueOf(),
       currentPage: 1
     });
-    setDisableDate(new Date(date.valueOf()));
   };
 
   var handleChangeEndDate = function handleChangeEndDate(date) {
@@ -2899,17 +2900,17 @@ var SessionCompleted = function SessionCompleted() {
     });
   };
 
-  var _useState2 = React.useState(false),
-      showDate = _useState2[0],
-      setShowDate = _useState2[1];
+  var _useState = React.useState(false),
+      showDate = _useState[0],
+      setShowDate = _useState[1];
 
   var handleShowDate = function handleShowDate() {
     setShowDate(!showDate);
   };
 
-  var _useState3 = React.useState(false),
-      anchorEl = _useState3[0],
-      setAnchorEl = _useState3[1];
+  var _useState2 = React.useState(false),
+      anchorEl = _useState2[0],
+      setAnchorEl = _useState2[1];
 
   var handleShowBtnFavourite = function handleShowBtnFavourite(event) {
     setAnchorEl(event.currentTarget);
@@ -2940,9 +2941,9 @@ var SessionCompleted = function SessionCompleted() {
     setOpenMobile(false);
   };
 
-  var _useState4 = React.useState(0),
-      studentId = _useState4[0],
-      setStudentId = _useState4[1];
+  var _useState3 = React.useState(0),
+      studentId = _useState3[0],
+      setStudentId = _useState3[1];
 
   var onClickStartQuestion = React.useCallback(function () {
     changRouteQuestion(studentId);
@@ -2976,9 +2977,10 @@ var SessionCompleted = function SessionCompleted() {
     },
     KeyboardButtonProps: {
       "aria-label": "change date"
-    }
+    },
+    maxDate: filters.endDate
   }), React__default.createElement(pickers.KeyboardDatePicker, {
-    minDate: disableDate,
+    minDate: filters.startDate,
     inputVariant: "outlined",
     format: "Do MMM YYYY",
     id: "time-picker",
@@ -3060,9 +3062,10 @@ var SessionCompleted = function SessionCompleted() {
     },
     KeyboardButtonProps: {
       "aria-label": "change date"
-    }
+    },
+    maxDate: filters.endDate
   }), React__default.createElement(pickers.KeyboardDatePicker, {
-    minDate: disableDate,
+    minDate: filters.startDate,
     inputVariant: "outlined",
     format: "Do MMM YYYY",
     id: "time-picker",
@@ -4275,7 +4278,8 @@ var UpComing$1 = function UpComing() {
     },
     KeyboardButtonProps: {
       "aria-label": "change date"
-    }
+    },
+    maxDate: filters.endDate
   }), React__default.createElement(pickers.KeyboardDatePicker, {
     inputVariant: "outlined",
     format: "Do MMM YYYY",
@@ -4288,7 +4292,8 @@ var UpComing$1 = function UpComing() {
     },
     KeyboardButtonProps: {
       "aria-label": "change date"
-    }
+    },
+    minDate: filters.startDate
   })), React__default.createElement(core.Grid, {
     className: "" + styles$1["btn-favorite"]
   })), React__default.createElement("div", {
@@ -4340,8 +4345,10 @@ var UpComing$1 = function UpComing() {
     },
     KeyboardButtonProps: {
       "aria-label": "change date"
-    }
+    },
+    maxDate: filters.endDate
   }), React__default.createElement(pickers.KeyboardDatePicker, {
+    minDate: filters.startDate,
     inputVariant: "outlined",
     format: "Do MMM YYYY",
     id: "time-picker",
@@ -4823,8 +4830,10 @@ var SessionCompleted$1 = function SessionCompleted() {
     },
     KeyboardButtonProps: {
       "aria-label": "change date"
-    }
+    },
+    maxDate: filters.endDate
   }), React__default.createElement(pickers.KeyboardDatePicker, {
+    minDate: filters.startDate,
     inputVariant: "outlined",
     format: "Do MMM YYYY",
     id: "time-picker",
@@ -4890,7 +4899,8 @@ var SessionCompleted$1 = function SessionCompleted() {
     },
     KeyboardButtonProps: {
       "aria-label": "change date"
-    }
+    },
+    maxDate: filters.endDate
   }), React__default.createElement(pickers.KeyboardDatePicker, {
     inputVariant: "outlined",
     format: "Do MMM YYYY",
@@ -4903,7 +4913,8 @@ var SessionCompleted$1 = function SessionCompleted() {
     },
     KeyboardButtonProps: {
       "aria-label": "change date"
-    }
+    },
+    minDate: filters.startDate
   }))))), screenWidth > 600 ? React__default.createElement(React__default.Fragment, null, React__default.createElement(core.TableContainer, {
     style: {
       marginTop: 20
@@ -5678,7 +5689,7 @@ var SliderComponent = function SliderComponent(_ref) {
   return React__default.createElement("div", {
     className: styles["box-slider"]
   }, React__default.createElement("p", {
-    className: styles["slider-text"]
+    className: styles["slider-text"] + " " + styles["margin-right"]
   }, minText), React__default.createElement(PrettoSlider, {
     valueLabelDisplay: "auto",
     "aria-label": "pretto slider",
@@ -7512,7 +7523,6 @@ var SelectQuestionNodes = function SelectQuestionNodes(props) {
     }
   }, React__default.createElement(lab.Autocomplete, {
     className: "" + stylesOto["select-category"],
-    freeSolo: true,
     id: "free-solo-2-demo",
     disableClearable: true,
     options: categories,
@@ -7535,12 +7545,6 @@ var SelectQuestionNodes = function SelectQuestionNodes(props) {
         })
       }));
     }
-  }), React__default.createElement(ArrowDropDownIcon, {
-    style: {
-      position: "absolute",
-      right: "10px",
-      top: "35px"
-    }
   }))), React__default.createElement("div", null, React__default.createElement("div", {
     className: "" + stylesOto["section-header"]
   }, "Select question"), React__default.createElement("div", {
@@ -12479,7 +12483,7 @@ var Overview = function Overview(props) {
     } else {
       dispatch(marioCore.setAlert({
         type: "danger",
-        message: "Time To must be more than time From"
+        message: "Invalid date range"
       }));
     }
   };
@@ -12498,7 +12502,7 @@ var Overview = function Overview(props) {
     } else {
       dispatch(marioCore.setAlert({
         type: "danger",
-        message: "Time To must be more than time From"
+        message: "Invalid date range"
       }));
     }
   };
@@ -12855,7 +12859,8 @@ var OneToOne = function OneToOne() {
     },
     KeyboardButtonProps: {
       "aria-label": "change date"
-    }
+    },
+    maxDate: filter.endDate
   }), React__default.createElement(pickers.KeyboardDatePicker, {
     inputVariant: "outlined",
     format: "Do MMM YYYY",
@@ -12868,7 +12873,8 @@ var OneToOne = function OneToOne() {
     },
     KeyboardButtonProps: {
       "aria-label": "change date"
-    }
+    },
+    minDate: filter.startDate
   })))), screenWidth > 600 ? React__default.createElement(React__default.Fragment, null, React__default.createElement(core.TableContainer, {
     style: {
       marginTop: 20
@@ -12987,7 +12993,7 @@ var OneToOne = function OneToOne() {
       marginLeft: "5px"
     }
   }) : ""))), React__default.createElement(core.TableBody, null, !!sessionData && (sessionData === null || sessionData === void 0 ? void 0 : sessionData.items).length > 0 ? sessionData === null || sessionData === void 0 ? void 0 : (_sessionData$items = sessionData.items) === null || _sessionData$items === void 0 ? void 0 : _sessionData$items.map(function (row) {
-    var _row$studentProfile;
+    var _row$studentProfile, _row$studentProfile2;
 
     var timeStart = marioCore.utcToLocalTime(row === null || row === void 0 ? void 0 : row.startTime, "Do MMMM yyyy - hh:mm A").toString();
     var timeSplitArray = timeStart.split(" - ");
@@ -13006,7 +13012,7 @@ var OneToOne = function OneToOne() {
       align: "left",
       className: "" + styles$4["row_name"]
     }, React__default.createElement("img", {
-      src: !!row.studentProfile.avatar ? marioCore.getFileUrl(row === null || row === void 0 ? void 0 : (_row$studentProfile = row.studentProfile) === null || _row$studentProfile === void 0 ? void 0 : _row$studentProfile.avatar) : DEFAULT_USER_AVATAR$7,
+      src: !!((_row$studentProfile = row.studentProfile) !== null && _row$studentProfile !== void 0 && _row$studentProfile.avatar) ? marioCore.getFileUrl(row === null || row === void 0 ? void 0 : (_row$studentProfile2 = row.studentProfile) === null || _row$studentProfile2 === void 0 ? void 0 : _row$studentProfile2.avatar) : DEFAULT_USER_AVATAR$7,
       alt: "",
       className: "" + styles$4["avatar_user"]
     }), (row === null || row === void 0 ? void 0 : row.studentProfile.name).length > 12 ? (row === null || row === void 0 ? void 0 : row.studentProfile.name).slice(0, 12).concat("...") : row === null || row === void 0 ? void 0 : row.studentProfile.name), React__default.createElement(core.TableCell, {
@@ -13053,7 +13059,7 @@ var OneToOne = function OneToOne() {
   }, React__default.createElement("div", {
     className: "" + styles$4["list-title"]
   }, "All"), !!sessionData && (sessionData === null || sessionData === void 0 ? void 0 : sessionData.items).length > 0 ? sessionData === null || sessionData === void 0 ? void 0 : (_sessionData$items2 = sessionData.items) === null || _sessionData$items2 === void 0 ? void 0 : _sessionData$items2.map(function (row) {
-    var _row$studentProfile2, _row$studentProfile3;
+    var _row$studentProfile3, _row$studentProfile4;
 
     var timeStart = marioCore.utcToLocalTime(row.startTime, "Do MMMM yyyy - hh:mm A").toString();
     var timeSplitArray = timeStart.split(" - ");
@@ -13062,7 +13068,7 @@ var OneToOne = function OneToOne() {
     }, React__default.createElement("div", {
       className: "" + styles$4["avatar"]
     }, React__default.createElement("img", {
-      src: !!row.studentProfile.avatar ? marioCore.getFileUrl(row === null || row === void 0 ? void 0 : (_row$studentProfile2 = row.studentProfile) === null || _row$studentProfile2 === void 0 ? void 0 : _row$studentProfile2.avatar) : DEFAULT_USER_AVATAR$7,
+      src: !!row.studentProfile.avatar ? marioCore.getFileUrl(row === null || row === void 0 ? void 0 : (_row$studentProfile3 = row.studentProfile) === null || _row$studentProfile3 === void 0 ? void 0 : _row$studentProfile3.avatar) : DEFAULT_USER_AVATAR$7,
       alt: "",
       className: "" + styles$4["avatar_user"]
     })), React__default.createElement("div", {
@@ -13075,7 +13081,7 @@ var OneToOne = function OneToOne() {
       className: "" + styles$4["time-Hours-Minute"]
     }, " ", "-", " ", timeSplitArray[1]))), React__default.createElement("div", null, React__default.createElement("p", {
       className: "" + styles$4["name"]
-    }, row === null || row === void 0 ? void 0 : (_row$studentProfile3 = row.studentProfile) === null || _row$studentProfile3 === void 0 ? void 0 : _row$studentProfile3.name), React__default.createElement("p", {
+    }, row === null || row === void 0 ? void 0 : (_row$studentProfile4 = row.studentProfile) === null || _row$studentProfile4 === void 0 ? void 0 : _row$studentProfile4.name), React__default.createElement("p", {
       className: "" + styles$4["classes"]
     }, !!row.gradeLevel && row.gradeLevel), React__default.createElement("div", {
       style: {
@@ -13306,7 +13312,8 @@ var Conferences = function Conferences() {
     },
     KeyboardButtonProps: {
       "aria-label": "change date"
-    }
+    },
+    maxDate: filter.endDate
   }), React__default.createElement(pickers.KeyboardDatePicker, {
     inputVariant: "outlined",
     format: "Do MMM YYYY",
@@ -13319,7 +13326,8 @@ var Conferences = function Conferences() {
     },
     KeyboardButtonProps: {
       "aria-label": "change date"
-    }
+    },
+    minDate: filter.startDate
   })))), screenWidth > 600 ? React__default.createElement(React__default.Fragment, null, React__default.createElement(core.TableContainer, {
     style: {
       marginTop: 20
@@ -13883,7 +13891,7 @@ var ClassReflection = function ClassReflection() {
         marginRight: "10px"
       },
       className: myStudent["reflection-avatar"] + " " + myStudent["avatar_user"],
-      src: !!row.teacherAvatar ? row.teacherAvatar : DEFAULT_USER_AVATAR$9
+      src: !!(row !== null && row !== void 0 && row.teacherAvatar) ? row === null || row === void 0 ? void 0 : row.teacherAvatar : DEFAULT_USER_AVATAR$9
     }), row.teacherName)), React__default.createElement(core.TableCell, {
       align: "left",
       style: {
@@ -13943,7 +13951,7 @@ var ClassReflection = function ClassReflection() {
         marginRight: "10px"
       },
       className: myStudent["reflection-avatar"] + " " + myStudent["avatar_user"],
-      src: !!row.teacherAvatar ? row.teacherAvatar : DEFAULT_USER_AVATAR$9
+      src: !!(row !== null && row !== void 0 && row.teacherAvatar) ? row === null || row === void 0 ? void 0 : row.teacherAvatar : DEFAULT_USER_AVATAR$9
     }), React__default.createElement(core.Typography, {
       className: "" + myStudent["reflection-name"]
     }, row.teacherName)), React__default.createElement(core.Grid, {
@@ -14055,17 +14063,12 @@ var LearningPlan = function LearningPlan() {
       filters = _useLearningPlanList.filters,
       learningData = _useLearningPlanList.learningData;
 
-  var _useState = React.useState(new Date()),
-      disableDate = _useState[0],
-      setDisableDate = _useState[1];
-
   var handleChangeStartDate = function handleChangeStartDate(date) {
     if (!date) return;
     changeFilters({
       startDate: date.valueOf(),
       currentPage: 1
     });
-    setDisableDate(new Date(date.valueOf()));
   };
 
   var handleChangeEndDate = function handleChangeEndDate(date) {
@@ -14150,9 +14153,10 @@ var LearningPlan = function LearningPlan() {
     },
     KeyboardButtonProps: {
       "aria-label": "change date"
-    }
+    },
+    maxDate: filters.endDate
   }), React__default.createElement(pickers.KeyboardDatePicker, {
-    minDate: disableDate,
+    minDate: filters.startDate,
     inputVariant: "outlined",
     format: "Do MMM YYYY",
     id: "time-picker",
@@ -21300,9 +21304,13 @@ var useSettingPage = function useSettingPage() {
 
   var getSettingPage = function getSettingPage() {
     try {
+      var _temp3 = function _temp3() {
+        dispatch(marioCore.setLoading(false));
+      };
+
       dispatch(marioCore.setLoading(true));
 
-      var _temp2 = _catch(function () {
+      var _temp4 = _catch(function () {
         return Promise.resolve(getApiSettingPage()).then(function (res) {
           var _res$data, _res$data2, _res$data3, _res$data4, _res$data5, _res$data6, _res$data7;
 
@@ -21313,7 +21321,6 @@ var useSettingPage = function useSettingPage() {
             IsReceiveNotificationBookedSession: (_res$data6 = res.data) === null || _res$data6 === void 0 ? void 0 : _res$data6.isReceiveNotificationBookedSession,
             IsReceiveNotificationPrebookedSession: (_res$data7 = res.data) === null || _res$data7 === void 0 ? void 0 : _res$data7.isReceiveNotificationPrebookedSession
           });
-          dispatch(marioCore.setLoading(false));
         });
       }, function (err) {
         var _err$response, _err$response$data;
@@ -21324,7 +21331,7 @@ var useSettingPage = function useSettingPage() {
         }));
       });
 
-      return Promise.resolve(_temp2 && _temp2.then ? _temp2.then(function () {}) : void 0);
+      return Promise.resolve(_temp4 && _temp4.then ? _temp4.then(_temp3) : _temp3(_temp4));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -21350,26 +21357,43 @@ var useSettingPage = function useSettingPage() {
 
   var updateSettingPage = function updateSettingPage(data) {
     try {
-      dispatch(marioCore.setLoading(true));
+      var timeStart = new Date(dataSetting.MuteNotificationStartTime).getTime();
+      var timeEnd = new Date(dataSetting.MuteNotificationEndTime).getTime();
 
-      var _temp4 = _catch(function () {
-        return Promise.resolve(updateApiSettingPage(data)).then(function () {
-          dispatch(marioCore.setLoading(false));
+      var _temp8 = function () {
+        if (timeStart >= timeEnd) {
           dispatch(marioCore.setAlert({
-            type: "success",
-            message: "Setting is updated successfully"
+            type: "danger",
+            message: "Invalid date range"
           }));
-        });
-      }, function (err) {
-        var _err$response2, _err$response2$data;
+        } else {
+          var _temp9 = function _temp9() {
+            dispatch(marioCore.setLoading(false));
+          };
 
-        dispatch(marioCore.setAlert({
-          type: "danger",
-          message: ((_err$response2 = err.response) === null || _err$response2 === void 0 ? void 0 : (_err$response2$data = _err$response2.data) === null || _err$response2$data === void 0 ? void 0 : _err$response2$data.title) || err.message
-        }));
-      });
+          dispatch(marioCore.setLoading(true));
 
-      return Promise.resolve(_temp4 && _temp4.then ? _temp4.then(function () {}) : void 0);
+          var _temp10 = _catch(function () {
+            return Promise.resolve(updateApiSettingPage(data)).then(function () {
+              dispatch(marioCore.setAlert({
+                type: "success",
+                message: "Setting is updated successfully"
+              }));
+            });
+          }, function (err) {
+            var _err$response2, _err$response2$data;
+
+            dispatch(marioCore.setAlert({
+              type: "danger",
+              message: ((_err$response2 = err.response) === null || _err$response2 === void 0 ? void 0 : (_err$response2$data = _err$response2.data) === null || _err$response2$data === void 0 ? void 0 : _err$response2$data.title) || err.message
+            }));
+          });
+
+          return _temp10 && _temp10.then ? _temp10.then(_temp9) : _temp9(_temp10);
+        }
+      }();
+
+      return Promise.resolve(_temp8 && _temp8.then ? _temp8.then(function () {}) : void 0);
     } catch (e) {
       return Promise.reject(e);
     }
@@ -21410,7 +21434,7 @@ var useStyles$8 = styles$b.makeStyles(function (theme) {
       marginTop: "10px"
     },
     Button: {
-      marginTop: "5px"
+      marginTop: "30px"
     }
   });
 });
@@ -21452,7 +21476,6 @@ function NotificationsPage() {
     style: {
       display: "flex",
       justifyContent: "space-between",
-      marginBottom: "15px",
       alignItems: "center"
     }
   }, React__default.createElement("p", {
@@ -21469,7 +21492,6 @@ function NotificationsPage() {
     style: {
       display: "flex",
       justifyContent: "space-between",
-      marginBottom: "15px",
       alignItems: "center"
     }
   }, React__default.createElement("p", {
@@ -21486,7 +21508,6 @@ function NotificationsPage() {
     style: {
       display: "flex",
       justifyContent: "space-between",
-      marginBottom: "15px",
       alignItems: "center"
     }
   }, React__default.createElement("p", {