mario-teacher-student-client 9000.0.10 → 9000.0.11

package/dist/containers/Accommodation/hook/useAccommodation.d.ts

@@ -22,5 +22,13 @@ declare const useAccommodation: () => {
         studentId: number;
         type: number;
     }>>;
+    setFilters: import("react").Dispatch<import("react").SetStateAction<{
+        studentId: any;
+        type: string;
+    }>>;
+    filters: {
+        studentId: any;
+        type: string;
+    };
 };
 export default useAccommodation;

package/dist/containers/Goals/hook/useGoals.d.ts

@@ -6,5 +6,6 @@ declare const useGoals: () => {
     isAllowedEdit: boolean;
     setIsAllowedEdit: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     isTeacher: any;
+    currentId: any;
 };
 export default useGoals;

package/dist/containers/MyOneToOne/components/dialog/DialogRecurrence.d.ts

@@ -3,12 +3,12 @@ interface Props {
     handleClose: Function;
     open: boolean;
     applyValue: Function;
-    selectedDate: any;
+    selectedDate?: any;
 }
 export declare enum EndType {
     Never = "Never",
     On = "On",
     After = "After"
 }
-declare const Recurrence: ({ open, handleClose, applyValue, selectedDate }: Props) => JSX.Element;
+declare const Recurrence: ({ open, handleClose, applyValue }: Props) => JSX.Element;
 export default Recurrence;

package/dist/index.css

@@ -4054,6 +4054,13 @@ h2._1OAmb {
   line-height: 18px !important;
   cursor: pointer; }
 
+._3VC7c {
+  padding: 20px; }
+  ._3VC7c > p {
+    font-size: 14px;
+    font-style: normal;
+    font-weight: 700; }
+
 ._2OFNj {
   background-color: #ffffff;
   border-radius: 12px;
@@ -6833,6 +6840,8 @@ h2._1KpSK {
     color: white;
     padding: 10px 30px;
     border-radius: 12px; }
+    ._miWXB ._1mdHa:hover {
+      background-color: #22663e; }
   ._miWXB ._2GCRD {
     font-size: 24px;
     font-weight: bold; }
@@ -6846,8 +6855,7 @@ h2._1KpSK {
       margin-left: 15px; }
 
 ._3GVL7 {
-  padding: 24px 16px;
-  background: #efefef; }
+  padding: 24px 16px; }
   ._3GVL7 ._2O_7x {
     justify-content: flex-end;
     display: flex; }
@@ -7848,7 +7856,6 @@ button._kb6Ui {
       margin-left: 5px; }
 
 ._26Nh9 {
-  background: #efefef;
   padding: 16px 0px; }
   ._26Nh9 ._2ogUR {
     display: flex;
@@ -7962,8 +7969,7 @@ button._kb6Ui {
 
 ._PvIMZ {
   display: flex;
-  justify-content: flex-end;
-  background: #efefef; }
+  justify-content: flex-end; }
   ._PvIMZ ._2ogUR {
     margin-top: 10px; }
 

package/dist/index.js

@@ -290,6 +290,9 @@ var HeaderSideBar = function HeaderSideBar(_ref) {
     dispatch(marioCore.reset());
     history.replace("/");
   }, []);
+  var goToMyNotes = React.useCallback(function () {
+    history.push("/my-notes");
+  }, []);
 
   var _useState = React.useState(0),
       unreadNoti = _useState[0],
@@ -344,6 +347,7 @@ var HeaderSideBar = function HeaderSideBar(_ref) {
   }, [unreadNoti]);
 
   var openProfile = function openProfile() {
+    console.log("PROFILE");
     handleClose();
     var url = "/my-profile";
     history.push(url);
@@ -400,7 +404,9 @@ var HeaderSideBar = function HeaderSideBar(_ref) {
     onClick: signOut
   }, "Logout"), !!isTeacher && React__default.createElement(core.MenuItem, {
     onClick: openProfile
-  }, "Profile")))), screenWidth > 600 ? React__default.createElement(core.Drawer, {
+  }, "Profile"), React__default.createElement(core.MenuItem, {
+    onClick: goToMyNotes
+  }, "My notes")))), screenWidth > 600 ? React__default.createElement(core.Drawer, {
     id: "menu-sidebar",
     className: classes.drawer,
     variant: "persistent",
@@ -475,7 +481,7 @@ var useStyles = styles$z.makeStyles(function (theme) {
       }
     },
     header: {
-      zIndex: 1500,
+      zIndex: 1000,
       background: "#156DA1"
     },
     dropdown: {
@@ -2111,7 +2117,7 @@ var Dashboard = function Dashboard() {
     className: "" + home["title-box"]
   }, "Next Meeting"), React__default.createElement("p", {
     className: "" + home["content-box"]
-  }, !!dataEvent && dateFns.format(new Date(dataEvent.nextMeeting), "HH:mm aa"))), React__default.createElement("div", {
+  }, !!dataEvent && (marioCore.utcToLocalTime(dataEvent.nextMeeting, "hh:mm A") || "00:00 AM"))), React__default.createElement("div", {
     className: "" + home["box"]
   }, React__default.createElement("p", {
     className: "" + home["title-box"]
@@ -9138,7 +9144,7 @@ var ConductIndex = function ConductIndex() {
   });
   var questionBlock2 = listQuestionStudents.filter(function (item) {
     return !!item.isBeforeSession;
-  }).slice(7, 11);
+  }).slice(7, 12);
   var questionBlock4 = listQuestionStudents.filter(function (item) {
     return !item.isBeforeSession;
   }).slice(0, 4);
@@ -9541,8 +9547,11 @@ var Timeline = function Timeline(_ref) {
       events = _ref.events;
   var history = reactRouterDom.useHistory();
 
+  var _useParams = reactRouterDom.useParams(),
+      currentId = _useParams.currentId;
+
   var goToEditSession = function goToEditSession(sessionId) {
-    history.push("/detail-session/" + sessionId);
+    history.push("/detail-session/" + sessionId + "/" + currentId);
   };
 
   return React__default.createElement(React__default.Fragment, null, React__default.createElement(core.Grid, {
@@ -9764,8 +9773,7 @@ var useStyles$7 = styles$z.makeStyles(function (theme) {
 var Recurrence = function Recurrence(_ref) {
   var open = _ref.open,
       handleClose = _ref.handleClose,
-      applyValue = _ref.applyValue,
-      selectedDate = _ref.selectedDate;
+      applyValue = _ref.applyValue;
   var classes = useStyles$7();
 
   var _useState = React.useState(""),
@@ -9814,8 +9822,12 @@ var Recurrence = function Recurrence(_ref) {
 
   var handleChangeEnds = function handleChangeEnds(event) {
     setChooseEndDate(event.target.value);
+  };
 
-    switch (event.target.value) {
+  var handleApply = function handleApply() {
+    var dayOfWeek = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"];
+
+    switch (chooseEndDate) {
       case EndType.Never:
         setRecurrenceValue(_extends({}, recurrenceValue, {
           neverEnd: true,
@@ -9826,21 +9838,16 @@ var Recurrence = function Recurrence(_ref) {
       case EndType.After:
         setRecurrenceValue(_extends({}, recurrenceValue, {
           neverEnd: false,
-          endAfter: _.parseInt(recurrenceValue.repeatEveryCount),
           endOnDate: ""
         }));
 
       case EndType.On:
         setRecurrenceValue(_extends({}, recurrenceValue, {
           neverEnd: false,
-          endAfter: 0,
-          endOnDate: moment(selectedDate).format()
+          endAfter: 0
         }));
     }
-  };
 
-  var handleApply = function handleApply() {
-    var dayOfWeek = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"];
     var recurrenceSelectText = recurrenceValue.repeatDuration + " " + chooseEndDate + " " + dayOfWeek[_.parseInt(recurrenceValue.repeatOn) - 1];
     applyValue(recurrenceValue, recurrenceSelectText);
     handleClose();
@@ -9852,18 +9859,16 @@ var Recurrence = function Recurrence(_ref) {
     }));
   };
 
-  var handleGetDate = function handleGetDate(isAfter) {
-    var date = new Date(moment(selectedDate).format());
-    var nextDay = date;
-
-    if (recurrenceValue.repeatOn !== "") {
-      isAfter ? nextDay = new Date(date.setDate(date.getDate() + 7 * recurrenceValue.repeatEveryCount)) : nextDay = new Date(date.setDate(date.getDate() + 7 * recurrenceValue.repeatEveryCount - 7 + (_.parseInt(recurrenceValue.repeatOn) + (7 - date.getDay())) % 7));
-    }
+  var handleDateChange = function handleDateChange(date) {
+    setRecurrenceValue(_extends({}, recurrenceValue, {
+      endOnDate: moment(date).format()
+    }));
+  };
 
-    var shortDate = nextDay.getDate() + " " + nextDay.toLocaleString("default", {
-      month: "short"
-    }) + " " + date.getFullYear();
-    return shortDate;
+  var handleChangeEndAfter = function handleChangeEndAfter(event) {
+    setRecurrenceValue(_extends({}, recurrenceValue, {
+      endAfter: _.parseInt(event.target.value)
+    }));
   };
 
   return React__default.createElement(core.Dialog, {
@@ -9956,7 +9961,28 @@ var Recurrence = function Recurrence(_ref) {
     label: "After"
   }))), React__default.createElement(core.Grid, {
     className: "" + stylesOto["date-box"]
-  }, React__default.createElement(core.Typography, null, handleGetDate(true)), React__default.createElement(core.Typography, null, handleGetDate()))))), React__default.createElement(core.DialogActions, null, React__default.createElement(core.Button, {
+  }, React__default.createElement(pickers.MuiPickersUtilsProvider, {
+    utils: MomentUtils
+  }, React__default.createElement(pickers.KeyboardDatePicker, {
+    inputVariant: "outlined",
+    margin: "normal",
+    id: "time-picker",
+    label: "Pick a time",
+    className: "" + stylesOto["date-time"],
+    value: recurrenceValue.endOnDate,
+    onChange: handleDateChange,
+    KeyboardButtonProps: {
+      "aria-label": "change time"
+    }
+  })), React__default.createElement("input", {
+    type: "number",
+    min: 1,
+    className: "" + stylesOto["input-repeat-count"],
+    onChange: function onChange(e) {
+      return handleChangeEndAfter(e);
+    },
+    value: recurrenceValue.endAfter
+  }))))), React__default.createElement(core.DialogActions, null, React__default.createElement(core.Button, {
     onClick: function onClick() {
       return handleClose();
     },
@@ -10757,7 +10783,7 @@ var SessionDetail = function SessionDetail() {
   }, [dataSession]);
 
   var goBack = function goBack() {
-    history.push("/my-one-to-one/up-coming");
+    history.push("/book-session/" + studentId);
   };
 
   var goBackDetail = function goBackDetail() {
@@ -14792,7 +14818,7 @@ var OverviewTop = function OverviewTop(_ref) {
   }));
 };
 
-var styles$7 = {"learning-strategies-chart":"_39STc","header-box":"_2k_yg","title":"_16oXB","block-cricle":"_1xZXQ","header-box-dialog":"_2cDnz","icon":"_pShUd","title-dialog":"_Vlz7n","description-dialog":"_3NniU","box-dialog":"_5s_DJ","gr-action":"_2srYZ","btn-request":"_1PYm8","gr-date-time-mobile":"_ffVlk","gr-date-time":"_3OCIb","date-time":"_1gPtX","search-input-icon":"_3PV-Z","search-input":"_1UzKT","inputInput":"__hBcd","inputInput-history":"_3-rxx","table-border":"_3Saaw","table-cell":"_i-ZXZ"};
+var styles$7 = {"learning-strategies-chart":"_39STc","header-box":"_2k_yg","title":"_16oXB","block-cricle":"_1xZXQ","header-box-dialog":"_2cDnz","icon":"_pShUd","title-dialog":"_Vlz7n","description-dialog":"_3NniU","box-dialog":"_5s_DJ","gr-action":"_2srYZ","btn-request":"_1PYm8","gr-date-time-mobile":"_ffVlk","gr-date-time":"_3OCIb","date-time":"_1gPtX","search-input-icon":"_3PV-Z","search-input":"_1UzKT","inputInput":"__hBcd","inputInput-history":"_3-rxx","table-border":"_3Saaw","table-cell":"_i-ZXZ","data-returns-empty":"_3VC7c"};
 
 var getTopLearningStrategiesApi = function getTopLearningStrategiesApi(studentId) {
   return marioCore.api.get(marioCore.BASE_URL + "/api/Student/top-learning-strategies", {
@@ -15123,7 +15149,9 @@ var LearningStrategyDialog = function LearningStrategyDialog(props) {
     page: filters.currentPage - 1,
     onPageChange: handleChangePage,
     onRowsPerPageChange: handleChangeRowsPerPage
-  }) : null));
+  }) : React__default.createElement(core.Grid, {
+    className: "" + styles$7["data-returns-empty"]
+  }, React__default.createElement(core.Typography, null, "No data"))));
 };
 
 var TopLearningStrategiesChart = function TopLearningStrategiesChart(studentId) {
@@ -27253,6 +27281,13 @@ var useAccommodation = function useAccommodation() {
       dataItem = _useState3[0],
       setDataItem = _useState3[1];
 
+  var _useState4 = React.useState({
+    studentId: isTeacher ? studentId : currentId,
+    type: ""
+  }),
+      filters = _useState4[0],
+      setFilters = _useState4[1];
+
   var getAll = React.useCallback(function () {
     try {
       var _temp3 = function _temp3() {
@@ -27262,9 +27297,7 @@ var useAccommodation = function useAccommodation() {
       dispatch(marioCore.setLoading(true));
 
       var _temp4 = _catch(function () {
-        return Promise.resolve(getAllAccommodation({
-          studentId: isTeacher ? studentId : currentId
-        })).then(function (res) {
+        return Promise.resolve(getAllAccommodation(filters)).then(function (res) {
           !!res.data && setAccommodationData(res.data);
         });
       }, function (err) {
@@ -27280,7 +27313,7 @@ var useAccommodation = function useAccommodation() {
     } catch (e) {
       return Promise.reject(e);
     }
-  }, []);
+  }, [filters]);
   var create = React.useCallback(function (data) {
     try {
       var _temp7 = function _temp7() {
@@ -27458,7 +27491,7 @@ var useAccommodation = function useAccommodation() {
   React.useEffect(function () {
     getAllow();
     getAll();
-  }, []);
+  }, [filters]);
   return {
     create: create,
     update: update,
@@ -27471,7 +27504,9 @@ var useAccommodation = function useAccommodation() {
     studentId: studentId,
     isTeacher: isTeacher,
     dataItem: dataItem,
-    setDataItem: setDataItem
+    setDataItem: setDataItem,
+    setFilters: setFilters,
+    filters: filters
   };
 };
 
@@ -27550,6 +27585,7 @@ var useGoals = function useGoals() {
     return state === null || state === void 0 ? void 0 : state.common.user;
   });
   var isTeacher = currentUser.roles.includes("Teacher");
+  var currentId = currentUser.studentId;
   var getAll = React.useCallback(function () {
     try {
       var _temp3 = function _temp3() {
@@ -27560,7 +27596,7 @@ var useGoals = function useGoals() {
 
       var _temp4 = _catch(function () {
         return Promise.resolve(getAllItem({
-          studentId: studentId
+          studentId: isTeacher ? studentId : currentId
         })).then(function (res) {
           !!res.data && setListData(res.data);
         });
@@ -27672,7 +27708,8 @@ var useGoals = function useGoals() {
     listData: listData,
     isAllowedEdit: isAllowedEdit,
     setIsAllowedEdit: setIsAllowedEdit,
-    isTeacher: isTeacher
+    isTeacher: isTeacher,
+    currentId: currentId
   };
 };
 
@@ -27684,7 +27721,8 @@ var Goals = function Goals() {
       updateAllow = _useGoals.updateAllow,
       setIsAllowedEdit = _useGoals.setIsAllowedEdit,
       listData = _useGoals.listData,
-      isTeacher = _useGoals.isTeacher;
+      isTeacher = _useGoals.isTeacher,
+      currentId = _useGoals.currentId;
 
   var _useParams = reactRouterDom.useParams(),
       studentId = _useParams.studentId;
@@ -27700,7 +27738,7 @@ var Goals = function Goals() {
   var title = "Goals";
 
   var handleClickOpen = function handleClickOpen() {
-    history.push("/goals/" + studentId);
+    history.push("/goals/" + (isTeacher ? studentId : currentId));
   };
 
   var completedCheckpoint = function completedCheckpoint(checkpoint, isPoint) {
@@ -28676,7 +28714,7 @@ var ListPersonalinterrest = function ListPersonalinterrest() {
       color: "primary"
     }),
     label: "Allow student to edit"
-  })), (dataList === null || dataList === void 0 ? void 0 : dataList.length) > 0 ? dataList === null || dataList === void 0 ? void 0 : dataList.map(function (item) {
+  })), (dataList === null || dataList === void 0 ? void 0 : dataList.length) > 0 && (dataList === null || dataList === void 0 ? void 0 : dataList.map(function (item) {
     return React__default.createElement("div", {
       className: "" + styles$m["content-list-persion"],
       key: item === null || item === void 0 ? void 0 : item.id
@@ -28715,7 +28753,7 @@ var ListPersonalinterrest = function ListPersonalinterrest() {
     }, React__default.createElement("span", {
       className: "" + styles$m["text-button-header"]
     }, "EDIT", " "), " ", React__default.createElement("span", null, " ", React__default.createElement(EditIcon, null), " "))))));
-  }) : React__default.createElement("p", null, "No data")), React__default.createElement("div", {
+  }))), React__default.createElement("div", {
     className: "" + styles$m["modal-add-information"]
   }, React__default.createElement(Dialog, {
     open: openModal,
@@ -29007,6 +29045,7 @@ var SimpleDialogAccomodation = function SimpleDialogAccomodation(props) {
       htmlFor: "outlined-age-native-simple"
     }, "Title"), React__default.createElement(core.Select, {
       "native": true,
+      disabled: !!idItem && idItem !== 0 ? true : false,
       value: values.title,
       onChange: function onChange(e) {
         setFieldValue("title", e.target.value);
@@ -29082,7 +29121,9 @@ var AccomondationList = function AccomondationList() {
       studentId = _useAccommodation.studentId,
       dataItem = _useAccommodation.dataItem,
       setDataItem = _useAccommodation.setDataItem,
-      isTeacher = _useAccommodation.isTeacher;
+      isTeacher = _useAccommodation.isTeacher,
+      filters = _useAccommodation.filters,
+      setFilters = _useAccommodation.setFilters;
 
   var _useState4 = React.useState(isAllowedEdit),
       isChecked = _useState4[0],
@@ -29125,6 +29166,12 @@ var AccomondationList = function AccomondationList() {
     setIsChecked(e);
   };
 
+  var handleSelectType = function handleSelectType(type) {
+    setFilters(_extends({}, filters, {
+      type: type
+    }));
+  };
+
   return React__default.createElement(core.Grid, {
     className: "" + styles$l["accomondation-box"]
   }, React__default.createElement(core.Grid, {
@@ -29157,10 +29204,13 @@ var AccomondationList = function AccomondationList() {
   }, React__default.createElement(Autocomplete, {
     className: "" + styles$l["select-option"],
     id: "combo-box-demo",
-    options: [],
+    options: ["All", "Personalized", "IEF"],
     getOptionLabel: function getOptionLabel(option) {
       return option;
     },
+    onChange: function onChange(_e, value) {
+      return handleSelectType(value);
+    },
     renderInput: function renderInput(params) {
       return React__default.createElement(core.TextField, Object.assign({}, params, {
         label: "All categories",
@@ -30633,7 +30683,7 @@ var useNote = function useNote() {
   };
 
   var viewListNote = function viewListNote() {
-    history.push("/note");
+    history.push("/my-notes");
   };
 
   var updateFavorite = function updateFavorite(id, favorite) {
@@ -30965,7 +31015,7 @@ var useNoteAdd = function useNoteAdd() {
   };
 
   var viewListNote = function viewListNote() {
-    history.push("/note");
+    history.push("/my-notes");
   };
 
   var updateDataNote = function updateDataNote() {
@@ -33675,7 +33725,6 @@ function LearningStrategiesSave() {
       selectLearning = _useAddLearningStrate.selectLearning,
       handleChangeNote = _useAddLearningStrate.handleChangeNote,
       changeFilters = _useAddLearningStrate.changeFilters,
-      filters = _useAddLearningStrate.filters,
       selectData = _useAddLearningStrate.selectData,
       handleAddLearningStrategy = _useAddLearningStrate.handleAddLearningStrategy,
       backToLearningStrategy = _useAddLearningStrate.backToLearningStrategy;
@@ -33690,6 +33739,20 @@ function LearningStrategiesSave() {
     }) : null);
   };
 
+  var inputSearch = React.useRef(null);
+
+  var handleChangeInputSearch = function handleChangeInputSearch(event) {
+    var inputValue = event.target.value;
+
+    if (!!inputSearch.current) {
+      clearTimeout(inputSearch.current);
+    }
+
+    inputSearch.current = setTimeout(function () {
+      changeFilters(inputValue);
+    }, 800);
+  };
+
   return React__default.createElement(React__default.Fragment, null, React__default.createElement(core.Grid, {
     container: true,
     spacing: 2
@@ -33733,10 +33796,10 @@ function LearningStrategiesSave() {
     fullWidth: true,
     id: "standard-bare",
     variant: "outlined",
-    value: filters.searchString,
     onChange: function onChange(event) {
-      return changeFilters(event.target.value);
+      return handleChangeInputSearch(event);
     },
+    ref: inputSearch,
     label: "Seach",
     InputProps: {
       endAdornment: React__default.createElement(core.IconButton, null, React__default.createElement(SearchIcon, null))
@@ -36035,8 +36098,8 @@ var useClassReflectionList$1 = function useClassReflectionList() {
     searchString: "",
     sortBy: "classType",
     sortOrder: "DESC",
-    startDate: undefined,
-    endDate: undefined
+    startDate: Date.now(),
+    endDate: moment().add(7, "days").valueOf()
   }),
       filters = _useState2[0],
       setFilters = _useState2[1];