mario-teacher-student-client 2.0.6 → 2.0.9

package/dist/containers/MyStudent/hooks/useStudentConference.d.ts

@@ -11,6 +11,6 @@ declare const useStudentConference: () => {
     sessionData: any;
     filter: FILTER_SESSION;
     changeFilters: (updatedFilters: any) => void;
-    getStudentConference: (studentId: any) => Promise<void>;
+    getStudentConference: () => Promise<void>;
 };
 export default useStudentConference;

package/dist/containers/MyStudent/hooks/useStudentOneToOne.d.ts

@@ -13,6 +13,6 @@ declare const useStudentOneToOne: () => {
     sessionData: any;
     filter: FILTER_SESSION;
     changeFilters: (updatedFilters: any) => void;
-    getStudentOneToOne: (studentId: any) => Promise<void>;
+    getStudentOneToOne: () => Promise<void>;
 };
 export default useStudentOneToOne;

package/dist/index.js

@@ -8201,8 +8201,8 @@ var DialogNodes = function DialogNodes(props) {
 };
 
 function areEqual(prevProps, nextProps) {
-  if (prevProps.checkOpenModal == nextProps.checkOpenModal) return false;
-  return true;
+  if (prevProps.checkOpenModal == nextProps.checkOpenModal) return true;
+  return false;
 }
 
 var DialogNodes$1 = React__default.memo(DialogNodes, areEqual);
@@ -8243,8 +8243,8 @@ var SimpleDialog$2 = function SimpleDialog(props) {
 };
 
 function areEqual$1(prevProps, nextProps) {
-  if (prevProps.checkOpenModal == nextProps.checkOpenModal) return false;
-  return true;
+  if (prevProps.checkOpenModal == nextProps.checkOpenModal) return true;
+  return false;
 }
 
 var SimpleDialog$3 = React__default.memo(SimpleDialog$2, areEqual$1);
@@ -8576,7 +8576,7 @@ var ConductIndex = function ConductIndex() {
     style: {
       position: "absolute",
       right: "0",
-      bottom: "4%"
+      bottom: "50%"
     }
   }, React__default.createElement(NodeDraggable, {
     handleClickOpen: handleClickOpen
@@ -12876,7 +12876,7 @@ var Overview = function Overview(props) {
               return t.month;
             }),
             chartData: informationWellbeing === null || informationWellbeing === void 0 ? void 0 : informationWellbeing.overviewQuestionChoice.map(function (t) {
-              return t.avgOfStudentChoice / 20;
+              return t.avgOfStudentChoice / 10;
             })
           }
         };
@@ -13116,6 +13116,8 @@ var useStudentOneToOne = function useStudentOneToOne() {
       sessionData = _useState[0],
       setSessionData = _useState[1];
 
+  var studentId = location.pathname.replace(/[^0-9]/g, "");
+
   var _useState2 = React.useState({
     startDate: moment().subtract(30, 'days').valueOf(),
     endDate: moment().add(7, "days").valueOf(),
@@ -13132,7 +13134,7 @@ var useStudentOneToOne = function useStudentOneToOne() {
     return setFilter(_extends({}, filter, updatedFilters));
   };
 
-  var getStudentOneToOne = function getStudentOneToOne(studentId) {
+  var getStudentOneToOne = function getStudentOneToOne() {
     try {
       var _temp3 = function _temp3() {
         dispatch(marioCore.setLoading(false));
@@ -13162,7 +13164,7 @@ var useStudentOneToOne = function useStudentOneToOne() {
   };
 
   React.useEffect(function () {
-    getStudentOneToOne(sessionData === null || sessionData === void 0 ? void 0 : sessionData.studentId);
+    getStudentOneToOne();
   }, [filter]);
   return {
     sessionData: sessionData,
@@ -13435,7 +13437,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, _row$studentProfile2;
+    var _row$studentProfile, _row$studentProfile2, _row$studentProfile3, _row$studentProfile4, _row$studentProfile5;
 
     var timeStart = marioCore.utcToLocalTime(row === null || row === void 0 ? void 0 : row.startTime, "Do MMMM yyyy - hh:mm A").toString();
     var timeSplitArray = timeStart.split(" - ");
@@ -13457,7 +13459,7 @@ var OneToOne = function OneToOne() {
       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, {
+    }), (row === null || row === void 0 ? void 0 : (_row$studentProfile3 = row.studentProfile) === null || _row$studentProfile3 === void 0 ? void 0 : _row$studentProfile3.name).length > 12 ? (row === null || row === void 0 ? void 0 : (_row$studentProfile4 = row.studentProfile) === null || _row$studentProfile4 === void 0 ? void 0 : _row$studentProfile4.name).slice(0, 12).concat("...") : row === null || row === void 0 ? void 0 : (_row$studentProfile5 = row.studentProfile) === null || _row$studentProfile5 === void 0 ? void 0 : _row$studentProfile5.name), React__default.createElement(core.TableCell, {
       align: "left",
       className: "" + styles$4["row_grade"]
     }, !!row.gradeLevel ? row === null || row === void 0 ? void 0 : row.gradeLevel : ""), React__default.createElement(core.TableCell, {
@@ -13501,7 +13503,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$studentProfile3, _row$studentProfile4;
+    var _row$studentProfile6, _row$studentProfile7, _row$studentProfile8;
 
     var timeStart = marioCore.utcToLocalTime(row.startTime, "Do MMMM yyyy - hh:mm A").toString();
     var timeSplitArray = timeStart.split(" - ");
@@ -13510,7 +13512,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$studentProfile3 = row.studentProfile) === null || _row$studentProfile3 === void 0 ? void 0 : _row$studentProfile3.avatar) : DEFAULT_USER_AVATAR$7,
+      src: !!((_row$studentProfile6 = row.studentProfile) !== null && _row$studentProfile6 !== void 0 && _row$studentProfile6.avatar) ? marioCore.getFileUrl(row === null || row === void 0 ? void 0 : (_row$studentProfile7 = row.studentProfile) === null || _row$studentProfile7 === void 0 ? void 0 : _row$studentProfile7.avatar) : DEFAULT_USER_AVATAR$7,
       alt: "",
       className: "" + styles$4["avatar_user"]
     })), React__default.createElement("div", {
@@ -13523,7 +13525,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$studentProfile4 = row.studentProfile) === null || _row$studentProfile4 === void 0 ? void 0 : _row$studentProfile4.name), React__default.createElement("p", {
+    }, row === null || row === void 0 ? void 0 : (_row$studentProfile8 = row.studentProfile) === null || _row$studentProfile8 === void 0 ? void 0 : _row$studentProfile8.name), React__default.createElement("p", {
       className: "" + styles$4["classes"]
     }, !!row.gradeLevel && row.gradeLevel), React__default.createElement("div", {
       style: {
@@ -13569,6 +13571,8 @@ var useStudentConference = function useStudentConference() {
       sessionData = _useState[0],
       setSessionData = _useState[1];
 
+  var studentId = location.pathname.replace(/[^0-9]/g, "");
+
   var _useState2 = React.useState({
     startDate: moment().subtract(30, 'days').valueOf(),
     endDate: moment().add(7, "days").valueOf(),
@@ -13585,7 +13589,7 @@ var useStudentConference = function useStudentConference() {
     return setFilter(_extends({}, filter, updatedFilters));
   };
 
-  var getStudentConference = function getStudentConference(studentId) {
+  var getStudentConference = function getStudentConference() {
     try {
       var _temp3 = function _temp3() {
         dispatch(marioCore.setLoading(false));
@@ -13615,7 +13619,7 @@ var useStudentConference = function useStudentConference() {
   };
 
   React.useEffect(function () {
-    getStudentConference(sessionData === null || sessionData === void 0 ? void 0 : sessionData.studentId);
+    getStudentConference();
   }, [filter]);
   return {
     sessionData: sessionData,
@@ -17688,7 +17692,7 @@ var ConferenceRubric = function ConferenceRubric() {
     style: {
       position: "absolute",
       right: "0",
-      bottom: "2%"
+      bottom: "50%"
     }
   }, React__default.createElement(NodeDraggable, {
     handleClickOpen: handleClickOpen