mario-education 2.4.588-feedback → 2.4.590-feedback

package/dist/containers/Dashboard/components/GenerateTrendQuestion.d.ts

@@ -1,4 +1,4 @@
 import React from "react";
 import { IGenerateTrendQuestion } from "../configs/types";
-declare const _default: React.MemoExoticComponent<({ series, avgQuestionLastMonth, icons, className, noAvgText }: IGenerateTrendQuestion) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ series, avgQuestionLastMonth, icons, className, noAvgText, timeOfDay }: IGenerateTrendQuestion) => JSX.Element>;
 export default _default;

package/dist/containers/Dashboard/components/ReadinessToLearnTab.d.ts

@@ -1,3 +1,3 @@
 import { IReadinessToLearnTab } from "../configs/types";
-declare const ReadinessToLearnTab: ({ dataReadinessOfChart, handleHoverTooltip, classFontSize, dataOverallReadyToLearn, dayOfWeekOneToOne, monthsOneToOne, avgQuestionLastMonth, preparednessData, preparednessWeeklyData, weeksOneToOne, setOptionDate, activeColumn, onActiveColumn }: IReadinessToLearnTab) => JSX.Element;
+declare const ReadinessToLearnTab: ({ dataReadinessOfChart, handleHoverTooltip, classFontSize, dataOverallReadyToLearn, dayOfWeekOneToOne, monthsOneToOne, avgQuestionLastMonth, preparednessData, preparednessWeeklyData, weeksOneToOne, setOptionDate, activeColumn, onActiveColumn, timeOfDay }: IReadinessToLearnTab) => JSX.Element;
 export default ReadinessToLearnTab;

package/dist/containers/Dashboard/configs/types.d.ts

@@ -640,6 +640,7 @@ export interface IReadinessToLearnTab {
     setOptionDate?: Function;
     onActiveColumn?: any;
     activeColumn?: boolean[];
+    timeOfDay?: string;
 }
 export interface IGenerateTrendQuestion {
     series: ISeries[];
@@ -648,6 +649,7 @@ export interface IGenerateTrendQuestion {
     icons: string[];
     className?: string;
     noAvgText?: boolean;
+    timeOfDay?: string;
 }
 export interface FILTER_STUDENT_WELLBEING {
     startDate?: number;

package/dist/index.js

@@ -36318,32 +36318,31 @@ var GenerateTrendQuestion = function GenerateTrendQuestion(_ref) {
       avgQuestionLastMonth = _ref.avgQuestionLastMonth,
       icons = _ref.icons,
       className = _ref.className,
-      noAvgText = _ref.noAvgText;
+      noAvgText = _ref.noAvgText,
+      timeOfDay = _ref.timeOfDay;
 
   var _useTranslation = marioCore.useTranslation(),
       t = _useTranslation.t;
 
   var avgs = React.useMemo(function () {
     return series.map(function (element) {
-      var avgLast = avgQuestionLastMonth.find(function (r) {
-        return r.questionText.toLowerCase().includes(element.name.toLowerCase());
-      });
-
-      if (avgLast) {
-        return avgLast.avgQuestionResponse - avgLast.avgQuestionResponseLastMonth;
-      }
-
       var sum = element.data.reduce(function (acc, val) {
         return acc + val;
       }, 0);
       return sum / element.data.length;
     });
-  }, [series, avgQuestionLastMonth]);
+  }, [series]);
   return React__default.createElement(core$1.Grid, {
     className: "" + styles$3["trend-question-list"]
   }, series.map(function (item, index) {
-    var _item$data, _item$data2;
+    var _item$data;
+
+    var avgLast = avgQuestionLastMonth.find(function (r) {
+      var _r$questionText, _r$questionText$toLow, _item$name;
 
+      return (_r$questionText = r.questionText) === null || _r$questionText === void 0 ? void 0 : (_r$questionText$toLow = _r$questionText.toLowerCase()) === null || _r$questionText$toLow === void 0 ? void 0 : _r$questionText$toLow.includes((_item$name = item.name) === null || _item$name === void 0 ? void 0 : _item$name.toLowerCase());
+    });
+    var trendPercent = !avgLast ? 0 : avgLast.avgQuestionResponse - avgLast.avgQuestionResponseLastMonth;
     return React__default.createElement(core$1.Grid, {
       key: item.name,
       className: "" + styles$3["trend-question-item"]
@@ -36357,8 +36356,9 @@ var GenerateTrendQuestion = function GenerateTrendQuestion(_ref) {
       alt: ""
     })), React__default.createElement(GraphTrend, {
       label: getDescriptionFromPercent((item === null || item === void 0 ? void 0 : (_item$data = item.data) === null || _item$data === void 0 ? void 0 : _item$data[0]) || 0, item.description) || "",
-      value: avgs[index] || 0,
-      valueData: (item === null || item === void 0 ? void 0 : (_item$data2 = item.data) === null || _item$data2 === void 0 ? void 0 : _item$data2[0]) || 0
+      value: trendPercent || 0,
+      valueData: avgs[index] || 0,
+      timeOfDay: timeOfDay
     }));
   }));
 };
@@ -36454,7 +36454,8 @@ var ReadinessToLearnTab = function ReadinessToLearnTab(_ref) {
       weeksOneToOne = _ref.weeksOneToOne,
       setOptionDate = _ref.setOptionDate,
       activeColumn = _ref.activeColumn,
-      onActiveColumn = _ref.onActiveColumn;
+      onActiveColumn = _ref.onActiveColumn,
+      timeOfDay = _ref.timeOfDay;
   var preferredOrder = ['Energy', 'Happiness', 'Focus'];
   var sortedData = [].concat(dataReadinessOfChart).sort(function (a, b) {
     return preferredOrder.indexOf(removeHTMLTags(a.questionText)) - preferredOrder.indexOf(removeHTMLTags(b.questionText));
@@ -36472,6 +36473,7 @@ var ReadinessToLearnTab = function ReadinessToLearnTab(_ref) {
   }, React__default.createElement(GenerateTrendQuestion$1, {
     avgQuestionLastMonth: avgQuestionLastMonth,
     series: preparednessData,
+    timeOfDay: timeOfDay,
     icons: ["home/energy.png", "home/focus.png", "home/happiness.png"],
     trendLabels: ["Feeling Okay", "Generally focused", "More positives than negatives"],
     className: "trend-item-icon-large"
@@ -36550,6 +36552,7 @@ var SuccessIndicatorTab = function SuccessIndicatorTab(_ref) {
   }, React__default.createElement(GenerateTrendQuestion$1, {
     avgQuestionLastMonth: avgQuestionLastMonth,
     series: successIndicatorsData,
+    timeOfDay: timeOfDay,
     icons: ["well-being-icon.png", "growth-icon.png", "relationship-icon.png", "personal-icon-quests.svg", "academic-icon.png", "self-efficacy-icon.png"],
     trendLabels: ["Generally okay", "Good growth overall", "All key relationships are positive", "Meeting some deadlines", "On target in most areas", "Lacking some self-belief"],
     noAvgText: true
@@ -38175,7 +38178,8 @@ var Dashboard = function Dashboard() {
         weeksOneToOne: weeksOneToOne,
         setOptionDate: setOptionDate,
         onActiveColumn: handleActiveColumn,
-        activeColumn: activeColumnReadiness
+        activeColumn: activeColumnReadiness,
+        timeOfDay: filter.optionDate
       })
     }, {
       label: "open_field_questions",