mario-teacher-student-client 2.1.128-admin → 2.1.129-admin

package/dist/containers/ActionPoint/components/Dialogs/hooks/useDialogRequest.d.ts

@@ -22,11 +22,11 @@ declare const useDialogRequest: (_props: PropsType, ref: any) => {
     handleChangeNotiCount: (e: React.ChangeEvent<{
         value: unknown;
     }>) => void;
-    handleCreate: (cb?: Function | undefined) => Promise<void>;
+    handleCreate: (cb?: Function | undefined, cbGetEventCalendar?: Function | undefined) => Promise<void>;
     handleClickClose: () => void;
     handleCheckbox: (e: React.ChangeEvent<HTMLInputElement>) => void;
-    submitUpdate: (cb?: Function | undefined) => Promise<void>;
-    handleDeleteItem: (cb?: Function | undefined) => Promise<void>;
+    submitUpdate: (cb?: Function | undefined, cbGetEventCalendar?: Function | undefined) => Promise<void>;
+    handleDeleteItem: (cb?: Function | undefined, cbGetEventCalendar?: Function | undefined) => Promise<void>;
     handleCloseNoti: () => void;
     setNotiSetting: React.Dispatch<React.SetStateAction<string>>;
     notiSetting: string;

package/dist/index.css

@@ -3119,7 +3119,7 @@ h2._1OAmb {
     margin-top: 10px; }
     ._gOdCz ._smLhQ ._1MX_1 {
       overflow: auto;
-      max-height: 20vh; }
+      height: 20vh; }
       ._gOdCz ._smLhQ ._1MX_1 ._3tmRq {
         display: flex;
         align-items: center;
@@ -4775,8 +4775,7 @@ h2._1OAmb {
   min-height: 180px;
   height: 100%;
   max-height: 100vh;
-  overflow: scroll;
-  overflow-x: hidden; }
+  overflow: auto; }
   ._S0bRu ._2z0d_ {
     font-size: 16px;
     font-style: normal;
@@ -13911,7 +13910,9 @@ h2._1KpSK {
   ._1VfS9 ._3s-7D {
     display: flex;
     width: 100%;
-    justify-content: flex-end; }
+    justify-content: flex-start;
+    margin-bottom: 20px;
+    margin-left: 10px; }
 
 ._1MqAT ._2cDXH {
   display: flex;
@@ -13922,7 +13923,7 @@ h2._1KpSK {
     margin-right: 20px; }
     ._1MqAT ._2cDXH ._3C3be ._1fkiB, ._1MqAT ._2cDXH ._JeKAW ._1fkiB {
       margin-bottom: 0 !important;
-      font-size: 18px;
+      font-size: 15px;
       margin-right: 10px;
       color: #242424; }
 

package/dist/index.js

@@ -2473,6 +2473,14 @@ var useDialogRequest = function useDialogRequest(_props, ref) {
 
   var handleClickClose = function handleClickClose() {
     setOpen(false);
+    setFormData({
+      title: "",
+      "class": "",
+      deadline: null,
+      notiCount: 0,
+      notiDuration: "week",
+      isDone: false
+    });
   };
 
   var openModal = function openModal() {
@@ -2551,10 +2559,11 @@ var useDialogRequest = function useDialogRequest(_props, ref) {
     });
   };
 
-  var handleDeleteItem = function handleDeleteItem(cb) {
+  var handleDeleteItem = function handleDeleteItem(cb, cbGetEventCalendar) {
     try {
       return Promise.resolve(deleteActionPoint(dispatch, actionId)).then(function () {
         cb === null || cb === void 0 ? void 0 : cb();
+        cbGetEventCalendar === null || cbGetEventCalendar === void 0 ? void 0 : cbGetEventCalendar();
         reloadRef === null || reloadRef === void 0 ? void 0 : reloadRef.current.reload();
         setOpen(false);
       });
@@ -2570,7 +2579,7 @@ var useDialogRequest = function useDialogRequest(_props, ref) {
     });
   };
 
-  var submitUpdate = function submitUpdate(cb) {
+  var submitUpdate = function submitUpdate(cb, cbGetEventCalendar) {
     try {
       var _formData$title;
 
@@ -2584,6 +2593,7 @@ var useDialogRequest = function useDialogRequest(_props, ref) {
 
       return Promise.resolve(updateActionPoint(dispatch, actionId, formData)).then(function () {
         cb === null || cb === void 0 ? void 0 : cb();
+        cbGetEventCalendar === null || cbGetEventCalendar === void 0 ? void 0 : cbGetEventCalendar();
         reloadRef === null || reloadRef === void 0 ? void 0 : reloadRef.current.reload();
         setOpen(false);
       });
@@ -2592,7 +2602,7 @@ var useDialogRequest = function useDialogRequest(_props, ref) {
     }
   };
 
-  var handleCreate = function handleCreate(cb) {
+  var handleCreate = function handleCreate(cb, cbGetEventCalendar) {
     try {
       var _formData$title2;
 
@@ -2606,6 +2616,7 @@ var useDialogRequest = function useDialogRequest(_props, ref) {
 
       return Promise.resolve(createActionPoint(dispatch, formData)).then(function () {
         cb === null || cb === void 0 ? void 0 : cb();
+        cbGetEventCalendar === null || cbGetEventCalendar === void 0 ? void 0 : cbGetEventCalendar();
         reloadRef === null || reloadRef === void 0 ? void 0 : reloadRef.current.reload();
         setOpen(false);
         setFormData({
@@ -2940,9 +2951,7 @@ var DialogRequestActionPoint = function DialogRequestActionPoint(_props, ref) {
     color: "secondary",
     onClick: function () {
       try {
-        return Promise.resolve(handleDeleteItem(_props.onReloading)).then(function () {
-          handleGetNewActionPoint === null || handleGetNewActionPoint === void 0 ? void 0 : handleGetNewActionPoint();
-        });
+        return Promise.resolve(handleDeleteItem(_props.onReloading, handleGetNewActionPoint)).then(function () {});
       } catch (e) {
         return Promise.reject(e);
       }
@@ -2954,9 +2963,7 @@ var DialogRequestActionPoint = function DialogRequestActionPoint(_props, ref) {
       try {
         setTitleValidate(true);
         setDeadlineValidate(true);
-        return Promise.resolve(submitUpdate(_props.onReloading)).then(function () {
-          handleGetNewActionPoint === null || handleGetNewActionPoint === void 0 ? void 0 : handleGetNewActionPoint();
-        });
+        return Promise.resolve(submitUpdate(_props.onReloading, handleGetNewActionPoint)).then(function () {});
       } catch (e) {
         return Promise.reject(e);
       }
@@ -2980,9 +2987,7 @@ var DialogRequestActionPoint = function DialogRequestActionPoint(_props, ref) {
       try {
         setTitleValidate(true);
         setDeadlineValidate(true);
-        return Promise.resolve(handleCreate(_props.onReloading)).then(function () {
-          handleGetNewActionPoint === null || handleGetNewActionPoint === void 0 ? void 0 : handleGetNewActionPoint();
-        });
+        return Promise.resolve(handleCreate(_props.onReloading, handleGetNewActionPoint)).then(function () {});
       } catch (e) {
         return Promise.reject(e);
       }
@@ -3358,8 +3363,7 @@ var Dashboard = function Dashboard() {
       listData = _useActionPointsDB.listData,
       openDialog = _useActionPointsDB.openDialog,
       clickOpenModal = _useActionPointsDB.clickOpenModal,
-      onReloading = _useActionPointsDB.onReloading,
-      getData = _useActionPointsDB.getData;
+      onReloading = _useActionPointsDB.onReloading;
 
   var roles = reactRedux.useSelector(function (state) {
     var _state$common, _state$common$user;
@@ -3388,7 +3392,6 @@ var Dashboard = function Dashboard() {
 
   var handleGetNewActionPoint = function handleGetNewActionPoint() {
     getDataEvent();
-    getData();
   };
 
   var handleChangeDate = function handleChangeDate(date) {
@@ -18239,12 +18242,12 @@ var MyNote = function MyNote(props) {
       className: "" + myStudent["box-header-item"]
     }, React__default.createElement(core.Typography, {
       className: "" + myStudent["item-title"]
-    }, convertQuestText(note.text, 1))), ((_note$text = note.text) === null || _note$text === void 0 ? void 0 : _note$text.includes("[/]")) && React__default.createElement(core.Typography, {
+    }, convertQuestText(note.text || note.title, 1))), ((_note$text = note.text) === null || _note$text === void 0 ? void 0 : _note$text.includes("[/]")) && React__default.createElement(core.Typography, {
       className: "" + myStudent["item-description"],
       style: {
         marginBottom: 5
       }
-    }, convertQuestText(note.text, 2)), React__default.createElement(core.Grid, {
+    }, convertQuestText(note.text || note.title, 2)), React__default.createElement(core.Grid, {
       className: "" + myStudent["box-status"]
     }, React__default.createElement("div", {
       className: "" + myStudent["content-right"]
@@ -18412,11 +18415,7 @@ var OverviewLeft = function OverviewLeft(props) {
 
   return React__default.createElement("div", {
     className: "\n                " + styles$4["partner-profiles-diallog"] + " \n                " + styles$7["overview-partner-profiles"] + " \n                " + styles$4[classFontSize] + "\n            "
-  }, screenWidth$1 > 600 ? React__default.createElement(core.Box, {
-    sx: {
-      height: "100%"
-    }
-  }, React__default.createElement(core.Box, {
+  }, screenWidth$1 > 600 ? React__default.createElement(core.Box, null, React__default.createElement(core.Box, {
     className: "" + styles$7["overview-left"],
     style: {
       overflow: "hidden"
@@ -28974,8 +28973,8 @@ var LearningStrategyDialog = function LearningStrategyDialog(props) {
   };
 
   React.useEffect(function () {
-    getLearningStrategiesData === null || getLearningStrategiesData === void 0 ? void 0 : getLearningStrategiesData();
-  }, [filters]);
+    open && (getLearningStrategiesData === null || getLearningStrategiesData === void 0 ? void 0 : getLearningStrategiesData());
+  }, [filters, open]);
   return React__default.createElement(core.Dialog, {
     onClose: function onClose() {
       return handleClose();
@@ -49377,6 +49376,10 @@ var Note = function Note() {
       setSelectStudent = _useNote.setSelectStudent,
       isTeacher = _useNote.isTeacher;
 
+  console.log({
+    allNoteList: allNoteList
+  });
+
   var _useFontStyles = useFontStyles(),
       defaultFont = _useFontStyles.defaultFont;
 
@@ -59808,7 +59811,7 @@ var PlpPage = function PlpPage() {
   }, React__default.createElement("div", {
     className: "" + styles$G["date-time-box"]
   }, React__default.createElement("div", {
-    className: "" + styles$G["date-time-start"]
+    className: styles$G["date-time-start"] + " date-picker-overview"
   }, React__default.createElement("p", {
     className: "" + styles$G["text"]
   }, "From"), React__default.createElement(pickers.KeyboardDatePicker, {
@@ -59824,7 +59827,7 @@ var PlpPage = function PlpPage() {
       "aria-label": "change date"
     }
   })), React__default.createElement("div", {
-    className: "" + styles$G["date-time-end"]
+    className: styles$G["date-time-end"] + " date-picker-overview"
   }, React__default.createElement("p", {
     className: "" + styles$G["text"]
   }, "To"), React__default.createElement(pickers.KeyboardDatePicker, {
@@ -59842,7 +59845,7 @@ var PlpPage = function PlpPage() {
     }
   }))))), React__default.createElement(core.FormControl, {
     variant: "outlined",
-    className: "custom-select-grade"
+    className: "custom-select-grade-plp"
   }, React__default.createElement(core.InputLabel, {
     htmlFor: "outlined-age-native-simple"
   }, "Grade"), React__default.createElement(core.Select, {