mario-teacher-student-client 2.2.24-beta → 3.0.0-admin

package/dist/containers/Home/hooks/getEventCalendar.d.ts

@@ -1,4 +1,4 @@
-declare const getEventFullCalendar: (userId: string, year: number, month: number) => {
+declare const getEventFullCalendar: (userId: string, startCalendar: number) => {
     dataEvent: any;
     classFontSize: string;
     fontSizeHeader: number;

package/dist/index.css

@@ -5335,7 +5335,7 @@ h2._2HVLw {
               position: absolute;
               color: rgba(0, 0, 0, 0.54);
               font-size: 1rem;
-              font-family: "Roboto", "Helvetica", "Arial",
 sans-serif;
+              font-family: "Roboto", "Helvetica", "Arial", sans-serif;
               letter-spacing: 0.00938em;
               background: #ffffff; }
           ._3TPGz ._1n-GQ ._1IiKL ._1k0E0 ._10gXX ._1Rtg2 {

package/dist/index.js

@@ -870,11 +870,16 @@ var HeaderSideBar = function HeaderSideBar(_ref) {
 
     return (_state$common4 = state.common) === null || _state$common4 === void 0 ? void 0 : _state$common4.menuBar;
   });
+  var isEnableSurvey = reactRedux.useSelector(function (state) {
+    var _state$common5;
+
+    return (_state$common5 = state.common) === null || _state$common5 === void 0 ? void 0 : _state$common5.isEnableSurvey;
+  });
   var isParentPage = location.pathname.includes("/parent");
   var isLoginFirst = reactRedux.useSelector(function (state) {
-    var _state$common5;
+    var _state$common6;
 
-    return (_state$common5 = state.common) === null || _state$common5 === void 0 ? void 0 : _state$common5.user.isLoginFirst;
+    return (_state$common6 = state.common) === null || _state$common6 === void 0 ? void 0 : _state$common6.user.isLoginFirst;
   });
 
   var _useState = React.useState(new Date()),
@@ -964,6 +969,7 @@ var HeaderSideBar = function HeaderSideBar(_ref) {
         return Promise.resolve(getInformation()).then(function (res) {
           dispatch(marioCore.setEnableIEP(res.data.isEnableIEP));
           dispatch(marioCore.setConversationOneToOne(res.data.isConversationOneToOne));
+          dispatch(marioCore.setEnableSurvey(res.data.isEnableSurvey));
         });
       }, function (err) {
         console.error(err);
@@ -1097,8 +1103,8 @@ var HeaderSideBar = function HeaderSideBar(_ref) {
     name: "Settings",
     icon: React__default.createElement(SettingsIcon, null)
   }];
-  navigations = isTeacher ? navigations : navigations.filter(function (item) {
-    return item.name != 'Surveys';
+  navigations = isEnableSurvey ? navigations : navigations.filter(function (item) {
+    return !item.name.includes('Survey');
   });
 
   var onStepNext = function onStepNext() {
@@ -1836,12 +1842,11 @@ var home = {"title-home":"_28pc4","to-do-today":"_1UG9Q","show-calendar":"_2W0R7
 
 var EVENT_CALENDAR = marioCore.BASE_URL + "/api/GoogleCalendar/eventCalendarDashboard";
 var TOTAL_CARD = marioCore.BASE_URL + "/api/GoogleCalendar/eventTotalCardDashboard";
-var getEventCalendar = function getEventCalendar(userId, year, month) {
+var getEventCalendar = function getEventCalendar(userId, startDate) {
   return marioCore.api.get("" + EVENT_CALENDAR, {
     params: {
       userId: userId,
-      year: year,
-      month: month
+      startDate: startDate
     }
   });
 };
@@ -2079,7 +2084,7 @@ var CurrentFullCalendar = function CurrentFullCalendar(props) {
 var defaultFontLarge$2 = 20;
 var defaultFontSmall$2 = 12;
 
-var getEventFullCalendar = function getEventFullCalendar(userId, year, month) {
+var getEventFullCalendar = function getEventFullCalendar(userId, startCalendar) {
   var dispatch = reactRedux.useDispatch();
 
   var _useState = React.useState(),
@@ -2107,10 +2112,11 @@ var getEventFullCalendar = function getEventFullCalendar(userId, year, month) {
     return "";
   }, [defaultFont]);
   var fontSizeHeader = caculateHeaderFont(defaultFont);
-  var getDataEvent = React.useCallback(function () {
+
+  var getDataEvent = function getDataEvent() {
     try {
       var _temp2 = _catch(function () {
-        return Promise.resolve(getEventCalendar(userId, year, month)).then(function (res) {
+        return Promise.resolve(getEventCalendar(userId, startCalendar)).then(function (res) {
           setDataEvent(res.data);
         });
       }, function (err) {
@@ -2126,7 +2132,7 @@ var getEventFullCalendar = function getEventFullCalendar(userId, year, month) {
     } catch (e) {
       return Promise.reject(e);
     }
-  }, [month, year]);
+  };
 
   var getDataCardEvent = function getDataCardEvent() {
     try {
@@ -2150,7 +2156,7 @@ var getEventFullCalendar = function getEventFullCalendar(userId, year, month) {
   React.useEffect(function () {
     document.title = "Home";
     getDataEvent();
-  }, [month, year]);
+  }, [startCalendar]);
   React.useEffect(function () {
     getDataCardEvent();
   }, []);
@@ -3513,15 +3519,11 @@ var Dashboard = function Dashboard() {
   var todayDate = moment().format("DD");
   var todayWeekDay = moment().format("dddd");
 
-  var _useState = React.useState(parseInt(moment().format("YYYY"))),
-      currentYear = _useState[0],
-      setCurrentYear = _useState[1];
+  var _useState = React.useState(moment().startOf('day').valueOf()),
+      startCalendar = _useState[0],
+      setStartCalendar = _useState[1];
 
-  var _useState2 = React.useState(parseInt(moment().format("MM"))),
-      currentMonth = _useState2[0],
-      setCurrentMonth = _useState2[1];
-
-  var _getEventFullCalendar = getEventFullCalendar(user.id, currentYear, currentMonth),
+  var _getEventFullCalendar = getEventFullCalendar(user.id, startCalendar),
       dataEvent = _getEventFullCalendar.dataEvent,
       classFontSize = _getEventFullCalendar.classFontSize,
       getDataEvent = _getEventFullCalendar.getDataEvent,
@@ -3532,10 +3534,8 @@ var Dashboard = function Dashboard() {
   };
 
   var handleChangeDate = function handleChangeDate(date) {
-    var startDate = date.start;
-    var newDate = moment(startDate).add(26, "days");
-    setCurrentMonth(parseInt(newDate.format('M')));
-    setCurrentYear(parseInt(newDate.format('YYYY')));
+    var startDate = moment(date.startStr).startOf('day').valueOf();
+    setStartCalendar(startDate);
   };
 
   var random = Math.floor(Math.random() * daily_motivation.length);
@@ -12338,7 +12338,7 @@ var useNotes = function useNotes(sessionId, sessionResultId, conferenceId, confe
 
   var getNotes = function getNotes() {
     try {
-      return Promise.resolve(isUsingSessionAPI ? getAllNote$2(dispatch, sessionId) : getAllConferenceNote$1(dispatch, conferenceId)).then(function (data) {
+      return Promise.resolve(sessionId ? getAllNote$2(dispatch, sessionId) : getAllConferenceNote$1(dispatch, conferenceId)).then(function (data) {
         var _data$privateNote, _data$teacherNotes, _data$studentNotes;
 
         setPrivateNote((_data$privateNote = data === null || data === void 0 ? void 0 : data.privateNote) != null ? _data$privateNote : "");
@@ -12882,12 +12882,16 @@ var MainViewScaffolding = function MainViewScaffolding(props) {
       "float": "right",
       margin: "10px"
     }
-  }, !openScaffolding ? React__default.createElement(ScaffoldingBtn, {
+  }, React__default.createElement(core.Grid, {
+    hidden: openScaffolding
+  }, React__default.createElement(ScaffoldingBtn, {
     hover: hover,
     onHover: onHover,
     onLeave: onLeave,
     handleOpen: onOpenScaffolding
-  }) : React__default.createElement(ScaffoldingFloatTab, {
+  })), React__default.createElement(core.Grid, {
+    hidden: !openScaffolding
+  }, React__default.createElement(ScaffoldingFloatTab, {
     onClose: onCloseScaffolding,
     sessionId: sessionId,
     sessionResultId: sessionResultId,
@@ -12895,7 +12899,7 @@ var MainViewScaffolding = function MainViewScaffolding(props) {
     conferenceResultId: conferenceResultId,
     informationUser: informationUser,
     isUserChangeSession: isUserChangeSession
-  }));
+  })));
 };
 
 function areEqual(prevProps, nextProps) {
@@ -15336,8 +15340,8 @@ var Loading$1 = function Loading() {
 };
 
 var timeGenerator = function timeGenerator(time) {
-  if (time <= 12) return time + " AM";
-  return time - 12 + " PM";
+  if (time < 12) return time + " AM";
+  return (time != 12 ? time - 12 : time) + " PM";
 };
 
 var Timeline = function Timeline(_ref) {
@@ -32493,16 +32497,12 @@ var Overview = function Overview(props) {
     },
     KeyboardButtonProps: {
       "aria-label": "change date"
-    },
-    minDate: moment(filterDateChart.endDate).subtract(4, 'months').valueOf(),
-    maxDate: filterDateChart.endDate
+    }
   })), React__default.createElement("div", {
     className: styles$9["date-time-end"] + " date-picker-overview"
   }, React__default.createElement("p", {
     className: "" + styles$9["text"]
   }, "To"), React__default.createElement(pickers.KeyboardDatePicker, {
-    minDate: filterDateChart.startDate || null,
-    maxDate: moment(filterDateChart.startDate).add(4, 'months').valueOf(),
     inputVariant: "outlined",
     format: "Do MMM YYYY",
     id: "time-picker",