mario-teacher-student-client 2.1.124-admin → 2.1.127-admin

package/dist/index.css

@@ -5122,7 +5122,7 @@ h2._1OAmb {
   display: flex;
   padding-bottom: 10px;
   padding-right: 20px;
-  justify-content: flex-end; }
+  justify-content: space-between; }
 
 ._3d2hF ._zL0pN {
   display: flex;
@@ -14402,6 +14402,14 @@ h4._3lNz0 {
 ._3u2Hp {
   padding: 30px; }
 
+._3yRVo {
+  font-size: 16px !important;
+  font-weight: bold; }
+
+._3M1fw {
+  display: flex;
+  align-items: center; }
+
 @font-face {
   font-family: "Lato-Regular";
   src: url("/fonts/Lato-Regular.ttf");

package/dist/index.js

@@ -3982,10 +3982,12 @@ var getInformationStudent = function getInformationStudent(studentId) {
     }
   });
 };
-var getDashboardOverview = function getDashboardOverview(studentId) {
+var getDashboardOverview = function getDashboardOverview(studentId, startDate, endDate) {
   return marioCore.api.get(STUDENT_URL + "/overview-dashboard", {
     params: {
-      studentId: studentId
+      studentId: studentId,
+      startDate: startDate,
+      endDate: endDate
     }
   });
 };
@@ -4130,10 +4132,10 @@ var checkIsStartedSession = function checkIsStartedSession(sessionId) {
     }
   });
 };
-var checkIsConferenceStarted = function checkIsConferenceStarted(sessionId) {
+var checkIsConferenceStarted = function checkIsConferenceStarted(conferenceId) {
   return marioCore.api.get(TEACHER_URL$1 + "/current/check-session-conference", {
     params: {
-      sessionId: sessionId
+      conferenceId: conferenceId
     }
   });
 };
@@ -18405,7 +18407,7 @@ var OverviewLeft = function OverviewLeft(props) {
 
   var openEdit = function openEdit() {
     var url = "/student-detail/profile/" + studentId + "/update";
-    !isAdmin && history.push(url);
+    !isEduTeacher && !isAdmin && history.push(url);
   };
 
   return React__default.createElement("div", {
@@ -20266,7 +20268,7 @@ var useOverview = function useOverview(studentId) {
       dispatch(marioCore.setLoading(true));
 
       var _temp8 = _catch(function () {
-        return Promise.resolve(getDashboardOverview(studentId)).then(function (res) {
+        return Promise.resolve(getDashboardOverview(studentId, filterDateChart.startDate || DEFAULT_START_DATE, filterDateChart.endDate || DEFAULT_END_DATE)).then(function (res) {
           var body = {
             totalConference: res.data.totalConference,
             totalOneToOne: res.data.totalOneToOne,
@@ -20289,7 +20291,7 @@ var useOverview = function useOverview(studentId) {
     } catch (e) {
       return Promise.reject(e);
     }
-  }, [studentId]);
+  }, [studentId, filterDateChart]);
   var getInformationWellbeing = React.useCallback(function (type, startDate, endDate) {
     try {
       var _temp11 = function _temp11() {
@@ -20412,7 +20414,7 @@ var useOverview = function useOverview(studentId) {
       getPartnerProfileSelector();
       getInformationSession();
     }
-  }, []);
+  }, [filterDateChart]);
   return {
     isAdmin: isAdmin,
     partnerData: partnerData,
@@ -28925,13 +28927,14 @@ var useStyles$b = styles$N.makeStyles(function () {
   };
 });
 var LearningStrategyDialog = function LearningStrategyDialog(props) {
+  var _filters$endDate, _filters$startDate, _filters$startDate2;
+
   var handleClose = props.handleClose,
       open = props.open,
       getLearningStrategiesData = props.getLearningStrategiesData,
       changeFilters = props.changeFilters,
       learningStrategiesData = props.learningStrategiesData,
-      filters = props.filters,
-      isPlp = props.isPlp;
+      filters = props.filters;
   var inputSearch = React.useRef(null);
   var classes = useStyles$b();
 
@@ -28986,7 +28989,7 @@ var LearningStrategyDialog = function LearningStrategyDialog(props) {
   };
 
   React.useEffect(function () {
-    !isPlp && (getLearningStrategiesData === null || getLearningStrategiesData === void 0 ? void 0 : getLearningStrategiesData());
+    getLearningStrategiesData === null || getLearningStrategiesData === void 0 ? void 0 : getLearningStrategiesData();
   }, [filters]);
   return React__default.createElement(core.Dialog, {
     onClose: function onClose() {
@@ -29028,9 +29031,10 @@ var LearningStrategyDialog = function LearningStrategyDialog(props) {
     KeyboardButtonProps: {
       "aria-label": "change date"
     },
-    maxDate: (filters === null || filters === void 0 ? void 0 : filters.endDate) || ""
+    maxDate: (_filters$endDate = filters === null || filters === void 0 ? void 0 : filters.endDate) != null ? _filters$endDate : undefined,
+    minDate: (_filters$startDate = filters === null || filters === void 0 ? void 0 : filters.startDate) != null ? _filters$startDate : undefined
   }), React__default.createElement(pickers.KeyboardDatePicker, {
-    minDate: (filters === null || filters === void 0 ? void 0 : filters.startDate) || "",
+    minDate: (_filters$startDate2 = filters === null || filters === void 0 ? void 0 : filters.startDate) != null ? _filters$startDate2 : undefined,
     inputVariant: "outlined",
     format: "Do MMM YYYY",
     id: "time-picker",
@@ -29196,7 +29200,7 @@ var TopLearningStrategy = function TopLearningStrategy(_ref) {
     className: "" + styles$9["block-header-name"]
   }, React__default.createElement("p", {
     className: "" + styles$9["title-chart"]
-  }, "Top Learning Strategies"), !isPlp && React__default.createElement("div", {
+  }, "Top Learning Strategies"), React__default.createElement("div", {
     className: "" + styles$9["expand-option"]
   }, React__default.createElement(core.IconButton, {
     onClick: handleClick,
@@ -29914,7 +29918,7 @@ var Overview = function Overview(props) {
   }, React__default.createElement("div", {
     className: "" + styles$7["date-time-box"]
   }, React__default.createElement("div", {
-    className: "" + styles$7["date-time-start"]
+    className: styles$7["date-time-start"] + " date-picker-overview"
   }, React__default.createElement("p", {
     className: "" + styles$7["text"]
   }, "From"), React__default.createElement(pickers.KeyboardDatePicker, {
@@ -29928,9 +29932,11 @@ var Overview = function Overview(props) {
     },
     KeyboardButtonProps: {
       "aria-label": "change date"
-    }
+    },
+    minDate: filterDateChart.startDate,
+    maxDate: filterDateChart.endDate
   })), React__default.createElement("div", {
-    className: "" + styles$7["date-time-end"]
+    className: styles$7["date-time-end"] + " date-picker-overview"
   }, React__default.createElement("p", {
     className: "" + styles$7["text"]
   }, "To"), React__default.createElement(pickers.KeyboardDatePicker, {
@@ -31227,7 +31233,7 @@ var Conferences = function Conferences() {
   var screenWidth = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
   var open = React.useCallback(function (row) {
     var studentId = row.studentId;
-    var url = !row.isDone ? "/start-conference/" + studentId + "/" + row.id + "/conferenceRubric" : "/result-conference/" + studentId + "/" + row.id + "/conferenceRubric";
+    var url = !row.isTeacherDone ? "/start-conference/" + studentId + "/" + row.id + "/conferenceRubric" : "/result-conference/" + studentId + "/" + row.id + "/conferenceRubric";
     history.push(url);
   }, [isTeacher]);
   return React__default.createElement(core.Grid, {
@@ -31417,7 +31423,7 @@ var Conferences = function Conferences() {
     }, !!row.gradeLevel && (row === null || row === void 0 ? void 0 : row.gradeLevel)), React__default.createElement(core.TableCell, {
       align: "left",
       className: "" + styles$c["row_grade"]
-    }, row !== null && row !== void 0 && row.isDone ? React__default.createElement("div", {
+    }, row !== null && row !== void 0 && row.isTeacherDone ? React__default.createElement("div", {
       className: styles$c["done"] + " " + styles$c["request"]
     }, "Done") : React__default.createElement("div", {
       className: styles$c["missed"] + " " + styles$c["request"]
@@ -31426,7 +31432,7 @@ var Conferences = function Conferences() {
       className: "" + styles$c["row_type"]
     }, React__default.createElement("div", {
       className: styles$c["duration"] + " " + styles$c["request"]
-    }, !!row.finalScore ? row === null || row === void 0 ? void 0 : row.finalScore : ""), !row.isEditConference && !row.isDone && React__default.createElement(core.Button, {
+    }, !!row.finalScore ? row === null || row === void 0 ? void 0 : row.finalScore : ""), !row.isEditConference && !row.isTeacherDone && React__default.createElement(core.Button, {
       variant: "contained",
       color: "primary",
       disableElevation: true,
@@ -40379,7 +40385,7 @@ var BookSessionConferences = function BookSessionConferences() {
   };
 
   React.useEffect(function () {
-    document.title = "Book conferences";
+    document.title = "Book conference";
   });
   var screenWidth = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
   return React__default.createElement(core.Grid, null, screenWidth > 600 ? React__default.createElement(core.Grid, {
@@ -40467,7 +40473,7 @@ var BookSessionConferences = function BookSessionConferences() {
       fontSize: "18px",
       fontWeight: 500
     }
-  }, "Book Conferences"), React__default.createElement(InsertInvitationIcon, null)))))), React__default.createElement(core.Grid, {
+  }, "Book Conference"), React__default.createElement(InsertInvitationIcon, null)))))), React__default.createElement(core.Grid, {
     item: true,
     xs: 1,
     style: {
@@ -40649,7 +40655,7 @@ var BookSessionConferences = function BookSessionConferences() {
       fontSize: "18px",
       fontWeight: 500
     }
-  }, "BOOK CONFERENCES"), React__default.createElement("i", {
+  }, "BOOK CONFERENCE"), React__default.createElement("i", {
     className: "fas fa-calendar-day",
     style: {
       fontSize: 18
@@ -61812,7 +61818,7 @@ var useStudentList$2 = function useStudentList() {
   };
 };
 
-var styles$L = {"search-input":"_mB4S_","search-input-icon":"_2dOCb","inputInput":"_3LZHP","block-search":"_3ETqf","block-header":"_28w_g","header-content":"_MM65j","table-border":"_2l3wP","table-row":"_NhhUt","row_type":"_rp-5t","duration":"_3I1fi","request":"_2-rzs","avatar_user":"_1FxvF","table-cell":"_3flzL","list-student-desktop":"_2hSN6","list-student-mobile":"_1Uabb","item-right":"_3AfFZ","item":"_3pZDy","box-info":"_3osaq","item-name":"_cuqGm","box-edu":"_2r6Xx","box-container":"_3u2Hp"};
+var styles$L = {"search-input":"_mB4S_","search-input-icon":"_2dOCb","inputInput":"_3LZHP","block-search":"_3ETqf","block-header":"_28w_g","header-content":"_MM65j","table-border":"_2l3wP","table-row":"_NhhUt","row_type":"_rp-5t","duration":"_3I1fi","request":"_2-rzs","avatar_user":"_1FxvF","table-cell":"_3flzL","list-student-desktop":"_2hSN6","list-student-mobile":"_1Uabb","item-right":"_3AfFZ","item":"_3pZDy","box-info":"_3osaq","item-name":"_cuqGm","box-edu":"_2r6Xx","box-container":"_3u2Hp","student_name":"_3yRVo","box_name":"_3M1fw"};
 
 var DEFAULT_USER_AVATAR$t = "/images/image-default.png";
 var ListStudent = function ListStudent() {
@@ -61942,11 +61948,15 @@ var ListStudent = function ListStudent() {
       scope: "row",
       height: 80,
       className: "" + styles$L["row_name"]
+    }, React__default.createElement("div", {
+      className: "" + styles$L["box_name"]
     }, React__default.createElement("img", {
       src: !!(row !== null && row !== void 0 && row.profileImageFileName) ? marioCore.getFileUrl(row === null || row === void 0 ? void 0 : row.profileImageFileName) : DEFAULT_USER_AVATAR$t,
       alt: "",
       className: "" + styles$L["avatar_user"]
-    }), row.fullName), React__default.createElement(core.TableCell, {
+    }), React__default.createElement(core.Typography, {
+      className: "" + styles$L["student_name"]
+    }, row.fullName))), React__default.createElement(core.TableCell, {
       component: "th",
       scope: "row",
       height: 80,