mario-education 2.4.588-release → 2.4.589-release

package/dist/index.js

@@ -29738,7 +29738,7 @@ var optionColumnChartAndPercents = function optionColumnChartAndPercents(min, mo
     yaxis: {
       tickAmount: 5,
       min: 0,
-      max: !isCountSeries || !maxSeries ? 100 : Math.ceil(maxSeries * 1.1),
+      max: !isCountSeries || !maxSeries ? 100 : maxSeries,
       axisBorder: {
         show: true
       },
@@ -29754,14 +29754,17 @@ var optionColumnChartAndPercents = function optionColumnChartAndPercents(min, mo
           cssClass: "apexcharts-yaxis-label"
         },
         formatter: function formatter(value) {
-          var roundedValue = Math.round(value);
-          return !isCountSeries ? roundedValue + "%" : roundedValue.toString();
+          if (!isCountSeries) {
+            return Math.round(value) + "%";
+          }
+
+          return value % 1 === 0 ? value.toString() : value.toFixed(1);
         },
         offsetX: 0,
         offsetY: 0,
         rotate: 0
       },
-      decimalsInFloat: 0
+      decimalsInFloat: 1
     },
     tooltip: {
       y: {
@@ -35646,9 +35649,47 @@ var BarChart = function BarChart(_ref) {
       lowMetricStudents = _ref.lowMetricStudents,
       print = _ref.print,
       labelDate = _ref.labelDate;
-  var maxSeries = series.reduce(function (max, item) {
-    return Math.max.apply(Math, [max].concat(item.data));
-  }, -Infinity) || 0;
+
+  var roundUpToNiceNumber = function roundUpToNiceNumber(num) {
+    if (num === 0) return 5;
+    if (num <= 50) return Math.ceil(num / 5) * 5;
+    if (num <= 100) return Math.ceil(num / 10) * 10;
+    return Math.ceil(num / 20) * 20;
+  };
+
+  var _useMemo = React.useMemo(function () {
+    if (!lowMetricStudents || lowMetricStudents.length === 0) {
+      var max = series.reduce(function (max, item) {
+        return Math.max.apply(Math, [max].concat(item.data));
+      }, -Infinity) || 0;
+      return {
+        correctedSeries: series,
+        maxSeries: roundUpToNiceNumber(max)
+      };
+    }
+
+    var studentCountsPerPeriod = {};
+    lowMetricStudents.forEach(function (student) {
+      var periodIndex = labelDate !== "Monthly" ? student.orderWeek : student.orderMonth;
+      studentCountsPerPeriod[periodIndex] = (studentCountsPerPeriod[periodIndex] || 0) + 1;
+    });
+    var correctedData = months.map(function (_, index) {
+      return studentCountsPerPeriod[index] || 0;
+    });
+    var maxCount = Math.max.apply(Math, correctedData.concat([0]));
+    var roundedMax = roundUpToNiceNumber(maxCount);
+    var newSeries = series.map(function (s) {
+      return _extends({}, s, {
+        data: correctedData
+      });
+    });
+    return {
+      correctedSeries: newSeries,
+      maxSeries: roundedMax
+    };
+  }, [series, lowMetricStudents, labelDate, months]),
+      correctedSeries = _useMemo.correctedSeries,
+      maxSeries = _useMemo.maxSeries;
 
   var _useState = React.useState(null),
       tooltipData = _useState[0],
@@ -35675,7 +35716,7 @@ var BarChart = function BarChart(_ref) {
       events: {
         dataPointSelection: function dataPointSelection(_event, _chartContext, config) {
           var dataPointIndex = config.dataPointIndex;
-          var chartEl = document.querySelector("#apexchartsmy-bar-chart");
+          var chartEl = document.querySelector("#bar_chart_metric_admin");
           if (!chartEl) return;
           var barEls = chartEl.querySelectorAll(".apexcharts-bar-series path");
           if (!barEls.length) return;
@@ -35691,7 +35732,7 @@ var BarChart = function BarChart(_ref) {
         dataPointMouseEnter: function dataPointMouseEnter(_event, _chartContext, config) {
           var dataPointIndex = config === null || config === void 0 ? void 0 : config.dataPointIndex;
           var currentTooltip = tooltipDataRef.current;
-          var chartEl = document.querySelector("#apexchartsmy-bar-chart");
+          var chartEl = document.querySelector("#bar_chart_metric_admin");
           if (!chartEl) return;
           var barEls = chartEl.querySelectorAll(".apexcharts-bar-series path");
           if (!barEls.length) return;
@@ -35807,7 +35848,7 @@ var BarChart = function BarChart(_ref) {
   React.useEffect(function () {
     var handleClickOutside = function handleClickOutside(e) {
       if (open) return;
-      var chartEl = document.querySelector("#apexchartsmy-bar-chart");
+      var chartEl = document.querySelector("#bar_chart_metric_admin");
       if (!chartEl) return;
 
       if (!chartEl.contains(e.target)) {
@@ -35831,12 +35872,13 @@ var BarChart = function BarChart(_ref) {
     ref: chartWrapperRef,
     style: {
       position: "relative"
-    }
+    },
+    id: "bar_chart_metric_admin"
   }, React__default.createElement(Chart, {
     ref: chartRef,
     options: options,
     type: "bar",
-    series: series,
+    series: correctedSeries,
     width: "100%",
     height: 300
   }), renderCustomTooltip()), React__default.createElement(MetricModelStudent, {