mario-education 2.4.180-level → 2.4.182-level

package/dist/MarioFramework.Education/ClientApp/src/containers/Dashboard/components/StudentPressureChart.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import { IStudentPressureChart } from "../configs/types";
-declare const StudentPressureChart: ({ studentPressure, width }: IStudentPressureChart) => JSX.Element;
+declare const StudentPressureChart: ({ studentPressure, width, print }: IStudentPressureChart) => JSX.Element;
 export default StudentPressureChart;

package/dist/MarioFramework.Education/ClientApp/src/containers/Dashboard/configs/types.d.ts

@@ -31,6 +31,7 @@ export interface IStudentPressure {
 export interface IStudentPressureChart {
     studentPressure: IStudentPressure;
     width?: number;
+    print?: boolean;
 }
 export interface IStudentPressure {
     boreOutStudent: string[];

package/dist/index.js

@@ -29642,9 +29642,7 @@ var useChartDatas = function useChartDatas() {
       topLearningStrategies = _useDashboard.topLearningStrategies,
       readinessToLearning = _useDashboard.readinessToLearning,
       handleChangeFilters = _useDashboard.handleChangeFilters,
-      handleChangeAcademicYearFilters = _useDashboard.handleChangeAcademicYearFilters,
       bandScore = _useDashboard.bandScore,
-      academicYear = _useDashboard.academicYear,
       user = _useDashboard.user,
       studentDefault = _useDashboard.studentDefault,
       handleFilterStudent = _useDashboard.handleFilterStudent,
@@ -29719,21 +29717,6 @@ var useChartDatas = function useChartDatas() {
     setSelectedToPrint(updateSelectToPrint);
   };
 
-  var academicYearItem = React.useMemo(function () {
-    if ((academicYear === null || academicYear === void 0 ? void 0 : academicYear.length) > 0) {
-      return academicYear.map(function (item) {
-        return {
-          value: item.id,
-          label: moment(item.startTime).year() + " - " + moment(item.endTime).year(),
-          startTime: item.startTime,
-          endTime: item.endTime,
-          isCurrent: item.isCurrent
-        };
-      });
-    }
-
-    return [];
-  }, [academicYear]);
   var LIST_FILTERS_LEFT = [{
     name: FILTER_NAME.Calendar,
     icon: "/images/calendar.svg",
@@ -29780,13 +29763,6 @@ var useChartDatas = function useChartDatas() {
       value: -1,
       label: "All"
     }].concat(bandScore)
-  }, {
-    name: FILTER_NAME.AcademicYear,
-    icon: "/images/student-icon.svg",
-    handleChangeFilters: handleChangeAcademicYearFilters,
-    option: [].concat(academicYearItem),
-    labelBox: labelBox,
-    setLabelBox: setLabelBox
   }];
   var LIST_FILTERS_RIGHT = [{
     name: FILTER_NAME.StudentName,
@@ -31199,7 +31175,8 @@ var backgroundPressureMobile = "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjg3Ii
 
 var StudentPressureChart = function StudentPressureChart(_ref) {
   var studentPressure = _ref.studentPressure,
-      width = _ref.width;
+      width = _ref.width,
+      print = _ref.print;
   var svgRef = React.useRef(null);
   var innerWidth = window.innerWidth < 576 ? window.innerWidth - 20 : window.innerWidth - 340;
 
@@ -31258,35 +31235,6 @@ var StudentPressureChart = function StudentPressureChart(_ref) {
       colorTooltip = _useState6[0],
       setColorTooltip = _useState6[1];
 
-  var getHeightFromText = function getHeightFromText(text, fontSize) {
-    var dummyElement = document.createElement("span");
-    dummyElement.style.visibility = "hidden";
-    dummyElement.style.position = "absolute";
-    dummyElement.style.whiteSpace = "wrap";
-    dummyElement.style.fontSize = fontSize;
-    dummyElement.style.width = "162px";
-    dummyElement.style.padding = "5px 5px 5px 8px";
-    dummyElement.innerHTML = text;
-    document.body.appendChild(dummyElement);
-    var height = dummyElement.offsetHeight;
-    document.body.removeChild(dummyElement);
-    return height;
-  };
-
-  var getWidthFromText = function getWidthFromText(text, fontSize, fontWeight) {
-    var dummyElement = document.createElement("span");
-    dummyElement.style.visibility = "hidden";
-    dummyElement.style.position = "absolute";
-    dummyElement.style.whiteSpace = "nowrap";
-    dummyElement.style.fontSize = fontSize;
-    dummyElement.style.fontWeight = fontWeight;
-    dummyElement.innerHTML = text;
-    document.body.appendChild(dummyElement);
-    var width = dummyElement.offsetWidth;
-    document.body.removeChild(dummyElement);
-    return width;
-  };
-
   var handleDotHover = function handleDotHover(students, x, y, label, color) {
     setTooltipStudents(Array.from(new Set(students)));
     setTooltipX(isMobileScreen && label == data[data.length - 1].label ? x - 45 : x);
@@ -31380,7 +31328,7 @@ var StudentPressureChart = function StudentPressureChart(_ref) {
             var circleY = !isMobileScreen ? chartHeight - 30 : chartHeight - 24;
 
             var _loop = function _loop(i) {
-              var _data3, _data4, _data5, _data5$value, _data5$value$length, _data8, _data9;
+              var _data3, _data4, _data4$value, _data4$value$length, _data7, _data8;
 
               var circleX = circleSpacing * i + alignment;
               var radius = !isMobileScreen ? 15 : 12;
@@ -31396,8 +31344,8 @@ var StudentPressureChart = function StudentPressureChart(_ref) {
                 handleDotHover((_data = data[i - 1]) === null || _data === void 0 ? void 0 : _data.value, circleX, circleY, (_data2 = data[i - 1]) === null || _data2 === void 0 ? void 0 : _data2.label, colors[i - 1]);
               });
               var lineHeight = 20;
-              var tooltipHeight = ((_data3 = data[i - 1]) === null || _data3 === void 0 ? void 0 : _data3.value.length) * lineHeight * 6;
-              var widthLabel = getWidthFromText((_data4 = data[i - 1]) === null || _data4 === void 0 ? void 0 : _data4.label, "9px", "bold");
+              var tooltipHeight = ((_data3 = data[i - 1]) === null || _data3 === void 0 ? void 0 : _data3.value.length) * lineHeight;
+              var widthLabel = 69;
               var isScrollStudents = tooltipHeight + 30 > chartHeight - 100 - (isMobileScreen ? widthLabel : 0);
               if (isScrollStudents) circle.addEventListener("click", handleDotLeave);else circle.addEventListener("mouseleave", handleDotLeave);
               svg.appendChild(circle);
@@ -31409,17 +31357,17 @@ var StudentPressureChart = function StudentPressureChart(_ref) {
               text.setAttribute("text-anchor", "middle");
               text.setAttribute("dominant-baseline", "middle");
               text.setAttribute("style", "cursor: default");
-              text.textContent = (_data5 = data[i - 1]) === null || _data5 === void 0 ? void 0 : (_data5$value = _data5.value) === null || _data5$value === void 0 ? void 0 : (_data5$value$length = _data5$value.length) === null || _data5$value$length === void 0 ? void 0 : _data5$value$length.toString();
+              text.textContent = (_data4 = data[i - 1]) === null || _data4 === void 0 ? void 0 : (_data4$value = _data4.value) === null || _data4$value === void 0 ? void 0 : (_data4$value$length = _data4$value.length) === null || _data4$value$length === void 0 ? void 0 : _data4$value$length.toString();
               text.style.cursor = "pointer";
               text.addEventListener("mouseenter", function () {
-                var _data6, _data7;
+                var _data5, _data6;
 
-                handleDotHover((_data6 = data[i - 1]) === null || _data6 === void 0 ? void 0 : _data6.value, circleX, circleY, (_data7 = data[i - 1]) === null || _data7 === void 0 ? void 0 : _data7.label, colors[i - 1]);
+                handleDotHover((_data5 = data[i - 1]) === null || _data5 === void 0 ? void 0 : _data5.value, circleX, circleY, (_data6 = data[i - 1]) === null || _data6 === void 0 ? void 0 : _data6.label, colors[i - 1]);
               });
               if (isScrollStudents) text.addEventListener("click", handleDotLeave);else text.addEventListener("mouseleave", handleDotLeave);
               svg.appendChild(text);
-              var label = (_data8 = data[i - 1]) === null || _data8 === void 0 ? void 0 : _data8.label;
-              var tooltip = (_data9 = data[i - 1]) === null || _data9 === void 0 ? void 0 : _data9.tooltip;
+              var label = (_data7 = data[i - 1]) === null || _data7 === void 0 ? void 0 : _data7.label;
+              var tooltip = (_data8 = data[i - 1]) === null || _data8 === void 0 ? void 0 : _data8.tooltip;
               var infoIconContainer = document.createElementNS("http://www.w3.org/2000/svg", "foreignObject");
               var infoIcon = document.createElementNS("http://www.w3.org/2000/svg", "svg");
               infoIcon.innerHTML = "<rect width=\"256\" height=\"256\" fill=\"none\"></rect><circle cx=\"128\" cy=\"128\" r=\"96\" fill=\"none\" stroke=\"#000\" stroke-linecap=\"round\" stroke-linejoin=\"round\" stroke-width=\"16\"></circle><polyline fill=\"none\" stroke=\"#000\" stroke-linecap=\"round\" stroke-linejoin=\"round\" stroke-width=\"16\" points=\"120 120 128 120 128 176 136 176\"></polyline><circle cx=\"128\" cy=\"84\" r=\"12\"></circle>";
@@ -31453,7 +31401,10 @@ var StudentPressureChart = function StudentPressureChart(_ref) {
                 return handleEnterInfoIcon(infoX, infoY + 4, tooltip, label);
               });
               infoIconContainer.addEventListener("mouseleave", handleLeaveInfoIcon);
-              svg.appendChild(infoIconContainer);
+
+              if (!print) {
+                svg.appendChild(infoIconContainer);
+              }
             };
 
             for (var i = 1; i <= data.length; i++) {
@@ -31473,10 +31424,6 @@ var StudentPressureChart = function StudentPressureChart(_ref) {
 
       try {
         while (svg.firstChild) {
-          while (svg.firstChild.firstChild) {
-            svg.firstChild.firstChild.remove();
-          }
-
           svg.firstChild.remove();
         }
 
@@ -31486,18 +31433,12 @@ var StudentPressureChart = function StudentPressureChart(_ref) {
       }
     }
   }, [chartWidth, chartHeight, JSON.stringify(studentPressure)]);
-  var widthLabel = React.useMemo(function () {
-    if (!!tooltipVisible) return getWidthFromText(tooltipVisible, "9px", "bold");
-    return 0;
-  }, [tooltipVisible]);
+  var widthLabel = 64;
   var lineHeight = 20;
-  var tooltipHeight = tooltipStudents.length * lineHeight * 6;
+  var tooltipHeight = tooltipStudents.length * lineHeight;
   var isScrollStudents = tooltipHeight + 30 > chartHeight - 100 - (isMobileScreen ? widthLabel : 0);
   var maxHeightTooltip = isScrollStudents ? chartHeight - 100 - (isMobileScreen ? widthLabel : 0) : tooltipHeight + 30;
-  var heightInfoTooltip = React.useMemo(function () {
-    if (!!infoTooltip && !!tooltipVisible) return getHeightFromText(infoTooltip, "12px");
-    return 0;
-  }, [infoTooltip, tooltipVisible]);
+  var heightInfoTooltip = 64;
   return React__default.createElement("svg", {
     ref: svgRef,
     width: chartWidth,
@@ -32438,7 +32379,8 @@ var DashboardToPDF = function DashboardToPDF(props) {
     }
   }, React__default.createElement(StudentPressureChart, {
     studentPressure: studentPressure,
-    width: 1280
+    width: 1280,
+    print: true
   })), React__default.createElement("div", {
     id: "learning_progress"
   }, React__default.createElement(GenerateChartData, {
@@ -32699,7 +32641,7 @@ var Dashboard = function Dashboard() {
     className: "" + styles$1["header-desc-modal"]
   }, t("the_data_is_taken_from_the_home_screen"), "."), React__default.createElement("p", {
     className: "" + styles$1["header-desc-modal"]
-  }, t("make_sure_everything_is_set_correctly_before_exporting"), ".")), React__default.createElement(reactstrap.ModalBody, null, chartNames === null || chartNames === void 0 ? void 0 : chartNames.map(function (item) {
+  }, t("make_sure_everything_is_set_correctly_before_exporting"))), React__default.createElement(reactstrap.ModalBody, null, chartNames === null || chartNames === void 0 ? void 0 : chartNames.map(function (item) {
     return React__default.createElement(reactstrap.FormGroup, {
       check: true,
       className: "" + styles$1["form-checkbox"]