mario-education 2.4.146-level → 2.4.148-level

package/dist/index.js

@@ -14868,7 +14868,7 @@ var QuestionDetail = function QuestionDetail() {
         setFieldValue("isBeforeSession", !values.isBeforeSession);
         setEditedTrue();
       }
-    })), values.isDefaultQuestionSurvey == true && React__default.createElement(reactstrap.Col, {
+    })), parseInt(type) == TYPE_QUESTION.Default && React__default.createElement(reactstrap.Col, {
       md: 12
     }, React__default.createElement(reactstrap.CustomInput, {
       type: "checkbox",
@@ -30648,11 +30648,13 @@ var CustomArcLabel = function CustomArcLabel(_ref) {
 };
 
 var TopLearningStrategy = function TopLearningStrategy(_ref2) {
-  var _learningStrategies$f, _learningStrategies$f2;
+  var _data$learningStrateg, _learningStrategies$f, _learningStrategies$f2;
 
   var data = _ref2.data;
   if (!data) return React__default.createElement(Loading, null);
-  var learningStrategies = data.learningStrategies;
+  var learningStrategies = (data === null || data === void 0 ? void 0 : (_data$learningStrateg = data.learningStrategies) === null || _data$learningStrateg === void 0 ? void 0 : _data$learningStrateg.sort(function (a, b) {
+    return average(b.usagePoint) - average(a.usagePoint);
+  })) || [];
 
   var _useTranslation = marioCore.useTranslation(),
       t = _useTranslation.t;
@@ -31568,15 +31570,16 @@ var StudentPressureChart = function StudentPressureChart(_ref) {
   }, [chartWidth, studentPressure]);
   var lineHeight = 20;
   var tooltipHeight = tooltipStudents.length * lineHeight;
+  var maxHeightTooltip = tooltipHeight + 30 > chartHeight - 50 ? chartHeight - 50 : tooltipHeight + 30;
   return React__default.createElement("svg", {
     ref: svgRef,
     width: chartWidth,
     height: chartHeight + 50
   }, !!tooltipVisible && React__default.createElement("g", {
-    transform: "translate(" + (tooltipX - 100) + "," + (tooltipY - tooltipHeight - 80) + ")"
+    transform: "translate(" + (tooltipX - 100) + "," + Math.max(0, tooltipY - tooltipHeight - 80) + ")"
   }, React__default.createElement("rect", {
     width: "200",
-    height: tooltipHeight + 30,
+    height: maxHeightTooltip + 10,
     fill: "rgba(36, 36, 36, 0.8)",
     rx: "5"
   }), React__default.createElement("text", {
@@ -31585,25 +31588,33 @@ var StudentPressureChart = function StudentPressureChart(_ref) {
     fill: "#fff",
     fontSize: "12px",
     textAnchor: "start"
-  }, tooltipStudents.length + " students are " + tooltipVisible), tooltipStudents.map(function (label, index) {
-    return React__default.createElement("g", {
+  }, tooltipStudents.length + " students are " + tooltipVisible), React__default.createElement("foreignObject", {
+    x: "0",
+    y: "30",
+    width: "200",
+    height: maxHeightTooltip
+  }, React__default.createElement("div", {
+    style: {
+      overflowY: "auto",
+      maxHeight: maxHeightTooltip - 20 + "px",
+      padding: "5px 5px 5px 10px",
+      color: "#fff",
+      fontSize: "12px"
+    }
+  }, tooltipStudents.map(function (label, index) {
+    return React__default.createElement("div", {
       key: index
-    }, React__default.createElement("rect", {
-      x: "10",
-      y: lineHeight * (index + 1) - 12 + 20,
-      width: "4",
-      height: "14",
-      fill: colorTooltip,
-      rx: "10",
-      ry: "1"
-    }), React__default.createElement("text", {
-      x: "25",
-      y: lineHeight * (index + 1) + 20,
-      fill: "#fff",
-      fontSize: "12px",
-      textAnchor: "start"
-    }, label));
-  })));
+    }, React__default.createElement("span", {
+      style: {
+        display: "inline-block",
+        width: "4px",
+        height: "14px",
+        backgroundColor: colorTooltip,
+        borderRadius: "10px",
+        marginRight: "10px"
+      }
+    }), React__default.createElement("span", null, label));
+  })))));
 };
 
 var Dashboard = function Dashboard() {
@@ -31852,7 +31863,15 @@ var Dashboard = function Dashboard() {
     dayOfWeek: dayOfWeekOneToOne,
     timeOfDay: filter.optionDate,
     colors: ["#73C8E5", "#F9F871", "#D7B0DE", "#E56362", "#5A7F05", "#D3D3D3"]
-  }))), React__default.createElement("div", {
+  }), React__default.createElement("div", {
+    className: "" + styles$1["mt-15"]
+  }, React__default.createElement("p", {
+    className: "" + styles$1["title-chart"]
+  }, "Student Stress by Zone"), React__default.createElement("div", {
+    className: "" + styles$1["box-chart-pressure"]
+  }, React__default.createElement(StudentPressureChart, {
+    studentPressure: studentPressure
+  }))))), React__default.createElement("div", {
     className: "shadow-lg mb-3 " + styles$1["chart-header-wrapper"]
   }, React__default.createElement(HeaderChart, {
     title: "Learning Progress",
@@ -31874,15 +31893,7 @@ var Dashboard = function Dashboard() {
     avgQuestionLastMonth: []
   }), React__default.createElement(TopLearningStrategy$1, {
     data: topLearningStrategies
-  }), React__default.createElement("div", {
-    className: "" + styles$1["mt-15"]
-  }, React__default.createElement("p", {
-    className: "" + styles$1["title-chart"]
-  }, t(studentPressureName)), React__default.createElement("div", {
-    className: "" + styles$1["box-chart-pressure"]
-  }, React__default.createElement(StudentPressureChart, {
-    studentPressure: studentPressure
-  }))))));
+  }))));
 };
 
 var TypeEnumTemplate;