mario-education 2.4.54-admin → 2.4.56-admin

package/dist/index.modern.js

@@ -26126,17 +26126,10 @@ var handleViewSeriesActive = function handleViewSeriesActive(active) {
 
 var readinesToLearnoptions = function readinesToLearnoptions(seriesName, data) {
   var history = 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 {
@@ -26146,15 +26139,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]);
         }
       }
     },
@@ -27220,9 +27211,14 @@ var useDashboard = function useDashboard() {
   };
 
   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;
     }));
@@ -27263,12 +27259,17 @@ var useDashboard = function useDashboard() {
   };
 
   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;
     }));
@@ -27306,12 +27307,17 @@ var useDashboard = function useDashboard() {
   };
 
   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;
     }));
@@ -27401,7 +27407,6 @@ var useDashboard = function useDashboard() {
       setStudentDefault(option);
       setFilter(_extends({}, filter, {
         gender: [LegalGenderType.None, LegalGenderType.Male, LegalGenderType.Female],
-        teacherId: undefined,
         studentId: option ? option === null || option === void 0 ? void 0 : option.studentId : undefined,
         studentUserId: option === null || option === void 0 ? void 0 : option.id
       }));
@@ -27412,7 +27417,6 @@ var useDashboard = function useDashboard() {
     setStudentDefault(undefined);
     setFilter(_extends({}, filter, {
       gender: [LegalGenderType.None, LegalGenderType.Male, LegalGenderType.Female],
-      teacherId: undefined,
       grade: [],
       studentId: undefined,
       studentUserId: ""