mario-teacher-student-client 2.2.25-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.js

@@ -1103,8 +1103,8 @@ var HeaderSideBar = function HeaderSideBar(_ref) {
     name: "Settings",
     icon: React__default.createElement(SettingsIcon, null)
   }];
-  navigations = isTeacher && isEnableSurvey ? 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() {
@@ -1842,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
     }
   });
 };
@@ -2085,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(),
@@ -2113,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) {
@@ -2132,7 +2132,7 @@ var getEventFullCalendar = function getEventFullCalendar(userId, year, month) {
     } catch (e) {
       return Promise.reject(e);
     }
-  }, [month, year]);
+  };
 
   var getDataCardEvent = function getDataCardEvent() {
     try {
@@ -2156,7 +2156,7 @@ var getEventFullCalendar = function getEventFullCalendar(userId, year, month) {
   React.useEffect(function () {
     document.title = "Home";
     getDataEvent();
-  }, [month, year]);
+  }, [startCalendar]);
   React.useEffect(function () {
     getDataCardEvent();
   }, []);
@@ -3519,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 _useState2 = React.useState(parseInt(moment().format("MM"))),
-      currentMonth = _useState2[0],
-      setCurrentMonth = _useState2[1];
+  var _useState = React.useState(moment().startOf('day').valueOf()),
+      startCalendar = _useState[0],
+      setStartCalendar = _useState[1];
 
-  var _getEventFullCalendar = getEventFullCalendar(user.id, currentYear, currentMonth),
+  var _getEventFullCalendar = getEventFullCalendar(user.id, startCalendar),
       dataEvent = _getEventFullCalendar.dataEvent,
       classFontSize = _getEventFullCalendar.classFontSize,
       getDataEvent = _getEventFullCalendar.getDataEvent,
@@ -3538,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);