mario-education 2.4.609-feedback → 2.4.612-feedback

package/dist/containers/MarioAi/components/ChatContent.d.ts

@@ -8,6 +8,7 @@ interface ChatContentProps {
     inputString: string;
     setInputString?: Function;
     onSelectOption?: Function;
+    asking?: boolean;
 }
 declare const ChatContent: FC<ChatContentProps>;
 export default ChatContent;

package/dist/containers/MarioAi/hooks/useAIChat.d.ts

@@ -12,5 +12,6 @@ declare const useAIChat: () => {
     submitPromptMessage: () => void;
     inputString: string;
     setInputString: import("react").Dispatch<import("react").SetStateAction<string>>;
+    asking: boolean;
 };
 export default useAIChat;

package/dist/index.css

@@ -15608,6 +15608,10 @@ p._17qsx {
                   color: #fff;
                   transition: all 0.2s ease-in-out;
                   box-shadow: 0px 6px 32px 0px #C09FF8B8; }
+              ._2h1fv ._3kxy- ._2x_-F ._1N1T3 ._2iVL8:hover {
+                background: #fff !important;
+                color: #c7c7c7 !important;
+                box-shadow: unset !important; }
             ._2h1fv ._3kxy- ._2x_-F ._1N1T3 ._2YD7M {
               align-items: center;
               display: flex;

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, {
@@ -79999,7 +80041,7 @@ var MarioAi = function MarioAi() {
   }, "Generate")));
 };
 
-var styles$h = {"ai-mario-container":"_1hAN-","ai-mario":"_U4585","ai-mario-header":"_3H3TX","title-welcome":"_2wizn","title-help-question":"_1uejP","card-data-container":"_wXhYW","card":"_3F1f0","content":"_cB_eW","title":"_30saB","description-card":"_6m3YS","icon":"_gG2mp","go-icon":"_1tJEn","list-prompts":"_1O09T","header":"_1lK2v","see-all":"_1Qk2i","text":"_3qcYP","list-item":"_2DkM3","item":"_1FFC5","background":"_rGovp","left":"_1X7t2","right":"_1w2YZ","opacity-footer":"_4kmno","dot-color":"_6K7Pz","dot-color__top":"_3mOqe","dot-color__bottom":"_1LVOo","ai-mario-chat":"_2eGy1","ai-mario-chat__header":"_1_oTD","go-back":"_u-oqg","chat-title":"_PBH_Y","switch-theme":"_31WqA","item___light-btn":"_3Zheb","item___dark-btn":"_7T1lB","ai-mario-chat__header___dark":"__lhBc","ai-mario-chat__content":"_2h1fv","content-container":"_3kxy-","chat-box":"_3gjP5","chat-box__content":"_2x_-F","name":"_2bqyW","message":"_1N1T3","option":"_31bf9","option__item":"_7cV8X","loader":"_2YD7M","loader__dot":"_23N4j","dot":"_3St_4","time":"_CjCyy","chat-box__user":"_ZC3ml","chat-box__user-container":"_2oBqf","ai-mario-chat__content___dark":"_1r1Jl","action-wrapper":"_2o38p","action-item":"_1IcP8","bracketed-input":"_206DV","bracketed-input-block":"_1A9xm","icon-input":"_1Lwom"};
+var styles$h = {"ai-mario-container":"_1hAN-","ai-mario":"_U4585","ai-mario-header":"_3H3TX","title-welcome":"_2wizn","title-help-question":"_1uejP","card-data-container":"_wXhYW","card":"_3F1f0","content":"_cB_eW","title":"_30saB","description-card":"_6m3YS","icon":"_gG2mp","go-icon":"_1tJEn","list-prompts":"_1O09T","header":"_1lK2v","see-all":"_1Qk2i","text":"_3qcYP","list-item":"_2DkM3","item":"_1FFC5","background":"_rGovp","left":"_1X7t2","right":"_1w2YZ","opacity-footer":"_4kmno","dot-color":"_6K7Pz","dot-color__top":"_3mOqe","dot-color__bottom":"_1LVOo","ai-mario-chat":"_2eGy1","ai-mario-chat__header":"_1_oTD","go-back":"_u-oqg","chat-title":"_PBH_Y","switch-theme":"_31WqA","item___light-btn":"_3Zheb","item___dark-btn":"_7T1lB","ai-mario-chat__header___dark":"__lhBc","ai-mario-chat__content":"_2h1fv","content-container":"_3kxy-","chat-box":"_3gjP5","chat-box__content":"_2x_-F","name":"_2bqyW","message":"_1N1T3","option":"_31bf9","option__item":"_7cV8X","option__item-disable":"_2iVL8","loader":"_2YD7M","loader__dot":"_23N4j","dot":"_3St_4","time":"_CjCyy","chat-box__user":"_ZC3ml","chat-box__user-container":"_2oBqf","ai-mario-chat__content___dark":"_1r1Jl","action-wrapper":"_2o38p","action-item":"_1IcP8","bracketed-input":"_206DV","bracketed-input-block":"_1A9xm","icon-input":"_1Lwom"};
 
 var CardHeader = function CardHeader(_ref) {
   var id = _ref.id,
@@ -80336,6 +80378,7 @@ var useAIMario = function useAIMario() {
     }
   }, []);
   React.useEffect(function () {
+    document.title = 'Mario AI';
     getAllPrompt();
     getAllHistoryPrompt();
 
@@ -80561,6 +80604,10 @@ var useAIChat = function useAIChat() {
       filters = _useState6[0],
       setFilters = _useState6[1];
 
+  var _useState7 = React.useState(false),
+      asking = _useState7[0],
+      setAsking = _useState7[1];
+
   var goBack = function goBack() {
     history.goBack();
   };
@@ -80714,7 +80761,13 @@ var useAIChat = function useAIChat() {
 
   var askGeminiAI = function askGeminiAI(prompt, labelTime, responses, startDate, endDate) {
     try {
-      var _temp8 = _catch(function () {
+      var _temp9 = function _temp9() {
+        setAsking(false);
+      };
+
+      setAsking(true);
+
+      var _temp10 = _catch(function () {
         return Promise.resolve(chatWithAi({
           chatHistory: responses,
           startDate: startDate,
@@ -80794,12 +80847,15 @@ var useAIChat = function useAIChat() {
         }));
       });
 
-      return Promise.resolve(_temp8 && _temp8.then ? _temp8.then(function () {}) : void 0);
+      return Promise.resolve(_temp10 && _temp10.then ? _temp10.then(_temp9) : _temp9(_temp10));
     } catch (e) {
       return Promise.reject(e);
     }
   };
 
+  React.useEffect(function () {
+    document.title = "Mario AI";
+  }, []);
   React.useEffect(function () {
     id && getPromptDetail();
   }, [id]);
@@ -80814,7 +80870,8 @@ var useAIChat = function useAIChat() {
     getBracketedText: getBracketedText,
     submitPromptMessage: submitPromptMessage,
     inputString: inputString,
-    setInputString: setInputString
+    setInputString: setInputString,
+    asking: asking
   };
 };
 
@@ -80855,7 +80912,8 @@ var ChatContent = function ChatContent(_ref) {
       getBracketedText = _ref.getBracketedText,
       submitPromptMessage = _ref.submitPromptMessage,
       inputString = _ref.inputString,
-      setInputString = _ref.setInputString;
+      setInputString = _ref.setInputString,
+      asking = _ref.asking;
   return React__default.createElement("div", {
     className: (theme === THEME.DARK ? styles$h["ai-mario-chat__content___dark"] : "") + " " + styles$h["ai-mario-chat__content"] + " "
   }, React__default.createElement("div", {
@@ -80910,9 +80968,10 @@ var ChatContent = function ChatContent(_ref) {
         return React__default.createElement("button", {
           key: option,
           onClick: function onClick() {
-            return onSelectOption === null || onSelectOption === void 0 ? void 0 : onSelectOption(option);
+            return !asking && (onSelectOption === null || onSelectOption === void 0 ? void 0 : onSelectOption(option));
           },
-          className: styles$h["option__item"]
+          className: styles$h["option__item"] + " " + styles$h[asking ? 'option__item-disable' : ''],
+          disabled: asking
         }, option);
       }))) : React__default.createElement("div", {
         className: styles$h["loader"]
@@ -80943,7 +81002,8 @@ var ChatWithAI = function ChatWithAI() {
       getBracketedText = _useAIChat.getBracketedText,
       submitPromptMessage = _useAIChat.submitPromptMessage,
       inputString = _useAIChat.inputString,
-      setInputString = _useAIChat.setInputString;
+      setInputString = _useAIChat.setInputString,
+      asking = _useAIChat.asking;
 
   return React__default.createElement("div", {
     className: styles$h['ai-mario-chat']
@@ -80960,7 +81020,8 @@ var ChatWithAI = function ChatWithAI() {
     getBracketedText: getBracketedText,
     submitPromptMessage: submitPromptMessage,
     inputString: inputString,
-    setInputString: setInputString
+    setInputString: setInputString,
+    asking: asking
   }));
 };