mario-education 2.4.52-admin → 2.4.55-admin

package/dist/index.js

@@ -26117,19 +26117,22 @@ var getConvertMinuteToHour = function getConvertMinuteToHour(timeSecond) {
 
   return hTime;
 };
+
+var handleViewSeriesActive = function handleViewSeriesActive(active) {
+  var _active$filter;
+
+  var item = ((_active$filter = active.filter(function (r) {
+    return r == true;
+  })) === null || _active$filter === void 0 ? void 0 : _active$filter.length) || 0;
+  return Array.from(Array(item).keys());
+};
+
 var readinesToLearnoptions = function readinesToLearnoptions(seriesName, data) {
   var history = reactRouterDom.useHistory();
-  var listStudentWithId = [];
   data === null || data === void 0 ? void 0 : data.forEach(function (element) {
     var _element$studentPerce;
 
     element === null || element === void 0 ? void 0 : (_element$studentPerce = element.studentPercentQuestion) === null || _element$studentPerce === void 0 ? void 0 : _element$studentPerce.forEach(function (item) {
-      if (!(listStudentWithId !== null && listStudentWithId !== void 0 && listStudentWithId.map(function (i) {
-        return i === null || i === void 0 ? void 0 : i.studentId;
-      }).includes(item.studentId))) listStudentWithId.push({
-        studentName: item.studentName,
-        studentId: item.studentId
-      });
     });
   });
   return {
@@ -26139,15 +26142,13 @@ var readinesToLearnoptions = function readinesToLearnoptions(seriesName, data) {
         show: false
       },
       events: {
-        markerClick: function markerClick(_e, _chart, options) {
-          var _listStudentWithId$fi;
-
-          var currentStudentId = (_listStudentWithId$fi = listStudentWithId.find(function (i) {
-            var _options$w, _options$w$globals;
-
-            return i.studentName.toLowerCase().trim() == (options === null || options === void 0 ? void 0 : (_options$w = options.w) === null || _options$w === void 0 ? void 0 : (_options$w$globals = _options$w.globals) === null || _options$w$globals === void 0 ? void 0 : _options$w$globals.seriesZ[options === null || options === void 0 ? void 0 : options.dataPointIndex][options === null || options === void 0 ? void 0 : options.dataPointIndex].toLowerCase().trim());
-          })) === null || _listStudentWithId$fi === void 0 ? void 0 : _listStudentWithId$fi.studentId;
-          history.push("/student-detail/overview/" + currentStudentId);
+        dataPointSelection: function dataPointSelection(_event, chartContext, config) {
+          var studentName = chartContext.data.threeDSeries[config.dataPointIndex];
+          var series = config.w.config.series[config.seriesIndex].data;
+          var student = series.find(function (r) {
+            return r.includes(studentName);
+          });
+          !!student && history.push("/student-detail/overview/" + student[student.length - 1]);
         }
       }
     },
@@ -26482,6 +26483,7 @@ var optionBarChartAndArea = function optionBarChartAndArea(months, activeData, n
       decimalsInFloat: 0
     },
     tooltip: {
+      enabledOnSeries: handleViewSeriesActive(activeData),
       y: {
         formatter: function formatter(value) {
           return value.toFixed(2) + "%";
@@ -27074,7 +27076,7 @@ var getBandScore = function getBandScore() {
 };
 
 var TITLE$s = "Dashboard";
-var DEFAULT_START_DATE = moment().endOf("day").valueOf().valueOf() > moment().startOf("month").month("Aug").valueOf() ? moment().startOf("month").month("Aug").valueOf() : moment().startOf("month").month("Aug").subtract(1, "year").valueOf();
+var DEFAULT_START_DATE = moment().subtract(3, 'months').startOf("day").valueOf();
 var DEFAULT_END_DATE = moment().endOf("day").valueOf();
 
 var useDashboard = function useDashboard() {
@@ -27212,9 +27214,14 @@ var useDashboard = function useDashboard() {
   };
 
   React.useEffect(function () {
-    setActiveColumnOneToOne([true].concat(dataConvertedOneToOne.map(function (_i) {
-      return false;
-    }).splice(0, dataConvertedOneToOne.length - 2)));
+    if (activeColumnOneToOne.filter(function (r) {
+      return r === true;
+    }).length == 0) {
+      setActiveColumnOneToOne([true].concat(dataConvertedOneToOne.map(function (_i) {
+        return false;
+      }).splice(0, dataConvertedOneToOne.length - 2)));
+    }
+
     setAvgOneToOne(newAvgOneToOne === null || newAvgOneToOne === void 0 ? void 0 : newAvgOneToOne.map(function (_, index) {
       return activeColumnOneToOne[index] ? newAvgOneToOne[index] : 0;
     }));
@@ -27255,12 +27262,17 @@ var useDashboard = function useDashboard() {
   };
 
   React.useEffect(function () {
+    if (activeColumnClassReflection.filter(function (r) {
+      return r === true;
+    }).length == 0) {
+      setActiveColumnClassReflection([true].concat(dataConvertedClassReflection.map(function (_i) {
+        return false;
+      }).splice(0, dataConvertedClassReflection.length - 2)));
+    }
+
     setSeriesClassReflection(newSeriesClassReflection === null || newSeriesClassReflection === void 0 ? void 0 : newSeriesClassReflection.filter(function (_, idx) {
       return activeColumnClassReflection[idx];
     }));
-    setActiveColumnClassReflection([true].concat(dataConvertedClassReflection.map(function (_i) {
-      return false;
-    }).splice(0, dataConvertedClassReflection.length - 2)));
     setAvgClassReflection(newAvgClassReflection === null || newAvgClassReflection === void 0 ? void 0 : newAvgClassReflection.map(function (_, index) {
       return activeColumnClassReflection[index] ? newAvgClassReflection[index] : 0;
     }));
@@ -27298,12 +27310,17 @@ var useDashboard = function useDashboard() {
   };
 
   React.useEffect(function () {
+    if (activeColumnConference.filter(function (r) {
+      return r === true;
+    }).length == 0) {
+      setActiveColumnConference([true].concat(dataConvertedConference === null || dataConvertedConference === void 0 ? void 0 : dataConvertedConference.map(function (_i) {
+        return false;
+      }).splice(0, dataConvertedConference.length - 2)));
+    }
+
     setSeriesConference(newSeriesConference === null || newSeriesConference === void 0 ? void 0 : newSeriesConference.filter(function (_, idx) {
       return activeColumnConference[idx];
     }));
-    setActiveColumnConference([true].concat(dataConvertedConference === null || dataConvertedConference === void 0 ? void 0 : dataConvertedConference.map(function (_i) {
-      return false;
-    }).splice(0, dataConvertedConference.length - 2)));
     setAvgConference(newAvgConference === null || newAvgConference === void 0 ? void 0 : newAvgConference.map(function (_, idx) {
       return activeColumnConference[idx] ? newAvgConference[idx] : 0;
     }));
@@ -27621,14 +27638,6 @@ var useChartDatas = function useChartDatas() {
     name: FILTER_NAME.EndDate,
     icon: "/images/calendar.svg",
     handleChangeFilters: handleChangeFilters
-  }, {
-    name: FILTER_NAME.StartDate,
-    icon: "/images/calendar.svg",
-    handleChangeFilters: handleChangeFilters
-  }, {
-    name: FILTER_NAME.EndDate,
-    icon: "/images/calendar.svg",
-    handleChangeFilters: handleChangeFilters
   }, {
     name: FILTER_NAME.Gender,
     icon: "/images/gender-icon.svg",
@@ -28158,7 +28167,9 @@ var SelectFilter = function SelectFilter(_ref) {
         onChange: function onChange(date) {
           return handleChangeStartDate(date);
         },
-        inline: true
+        inline: true,
+        maxDate: moment(filter === null || filter === void 0 ? void 0 : filter.endDate).toDate(),
+        minDate: moment(filter === null || filter === void 0 ? void 0 : filter.endDate).subtract(3, "months").toDate()
       })));
     }
 
@@ -28182,7 +28193,9 @@ var SelectFilter = function SelectFilter(_ref) {
         onChange: function onChange(date) {
           return handleChangeEndDate(date);
         },
-        inline: true
+        inline: true,
+        maxDate: moment(filter === null || filter === void 0 ? void 0 : filter.startDate).add(3, "months").toDate(),
+        minDate: moment(filter === null || filter === void 0 ? void 0 : filter.startDate).toDate()
       })));
     }