mario-education 2.4.245-release → 2.4.247-release

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

@@ -132,5 +132,5 @@ export declare const filterYearData: {
     startDate: number;
     endDate: number;
 }[];
-export declare const handleAveraged: (points: number[]) => number;
-export declare const handleGenerateAvgQuestion: (data: number[], avgContent?: string | undefined) => string;
+export declare const handleAveraged: (points: number[], isStress?: boolean | undefined) => number;
+export declare const handleGenerateAvgQuestion: (data: number[], isStress: boolean, avgContent?: string | undefined) => string;

package/dist/MarioFramework.Education/ClientApp/src/containers/MyStudent/components/NewOverview/Chat/configs/utils.d.ts

@@ -6,8 +6,8 @@ export declare const average: (arr: number[]) => number;
 export declare const convertDataToDataChart: (data: IOverviewQuestionChoice[]) => string[];
 export declare const overallDonutCHartOptions: (labelNames: string[], colors: string[], isCountSeries?: boolean | undefined, textColors?: string[] | undefined) => ApexOptions;
 export declare const learningStrategyChartOptions: (labelNames: any, usageCountList: number[], isMobileScreen: boolean) => ApexOptions;
-export declare const readinesToLearnoptions: (seriesName: string[], redirectStudentOverview?: Function | undefined, isStudent?: boolean | undefined, colors?: string[] | undefined) => ApexOptions;
-export declare const convertDataToSeriesBullderChart: (data: IReadinessToLearning[], chartWidth: number) => {
+export declare const readinesToLearnoptions: (seriesName: string[], redirectStudentOverview?: Function | undefined, isStudent?: boolean | undefined, colors?: string[] | undefined, isStudentResponses?: boolean | undefined) => ApexOptions;
+export declare const convertDataToSeriesBullderChart: (data: IReadinessToLearning[], chartWidth: number, isStudentResponses?: boolean | undefined) => {
     name: string;
     data: import("react").ReactText[][];
 }[];

package/dist/MarioFramework.Education/ClientApp/src/containers/MyStudent/components/NewOverview/Chat/view/BubbleChartCustom.d.ts

@@ -7,6 +7,7 @@ interface IProps {
     disableSeriesName?: boolean;
     colors?: string[];
     indexActive?: number[];
+    isStudentResponses?: boolean;
 }
-declare const _default: React.MemoExoticComponent<({ data, isPlp, print, disableSeriesName, colors, indexActive }: IProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ data, isPlp, print, disableSeriesName, colors, indexActive, isStudentResponses }: IProps) => JSX.Element>;
 export default _default;

package/dist/index.js

@@ -29410,16 +29410,16 @@ var filterYearData = [{
   startDate: moment().utc().add(-1, "days").startOf("day").valueOf(),
   endDate: moment().utc().add(-1, "days").endOf("day").valueOf()
 }];
-var handleAveraged = function handleAveraged(points) {
+var handleAveraged = function handleAveraged(points, isStress) {
   var total = points.reduce(function (acc, cur) {
-    return acc + cur;
+    return acc + (!isStress ? cur : (cur - 50) * 2);
   }, 0);
   return total / points.length;
 };
-var handleGenerateAvgQuestion = function handleGenerateAvgQuestion(data, avgContent) {
+var handleGenerateAvgQuestion = function handleGenerateAvgQuestion(data, isStress, avgContent) {
   var _handleAveraged$toFix, _handleAveraged, _data$reduce;
 
-  return !avgContent ? "AVR. " + ((_handleAveraged$toFix = (_handleAveraged = handleAveraged(data)) === null || _handleAveraged === void 0 ? void 0 : _handleAveraged.toFixed(2)) != null ? _handleAveraged$toFix : 0) + "%" : ((_data$reduce = data.reduce(function (accumulator, currentValue) {
+  return !avgContent ? "AVR. " + ((_handleAveraged$toFix = (_handleAveraged = handleAveraged(data, isStress)) === null || _handleAveraged === void 0 ? void 0 : _handleAveraged.toFixed(2)) != null ? _handleAveraged$toFix : 0) + "%" : ((_data$reduce = data.reduce(function (accumulator, currentValue) {
     return accumulator + currentValue;
   }, 0)) != null ? _data$reduce : 0) + " " + avgContent;
 };
@@ -31267,7 +31267,7 @@ var GenerateChartData = function GenerateChartData(_ref) {
       className: "" + styles$1["label-chart"]
     }, t(item.name.toLocaleLowerCase()))), React__default.createElement("p", {
       className: "" + styles$1["avr-question"]
-    }, "" + ((_handleGenerateAvgQue = handleGenerateAvgQuestion(item.data, avgContent)) != null ? _handleGenerateAvgQue : 0)), React__default.createElement("div", {
+    }, "" + ((_handleGenerateAvgQue = handleGenerateAvgQuestion(item.data, min == -100, avgContent)) != null ? _handleGenerateAvgQue : 0)), React__default.createElement("div", {
       hidden: avgs.length == 0 || !timeOfDay,
       className: "" + styles$1["volatility"]
     }, avgs[index] < 0 ? React__default.createElement("div", {
@@ -47619,7 +47619,31 @@ var overallDonutCHartOptions$1 = function overallDonutCHartOptions(labelNames, c
     }
   };
 };
-var readinesToLearnoptions$1 = function readinesToLearnoptions(seriesName, redirectStudentOverview, isStudent, colors) {
+var readinesToLearnoptions$1 = function readinesToLearnoptions(seriesName, redirectStudentOverview, isStudent, colors, isStudentResponses) {
+  var configToolTip = {
+    enabled: true,
+    x: {
+      show: false
+    },
+    y: {
+      formatter: undefined,
+      title: {
+        formatter: function formatter() {
+          return "Percent";
+        }
+      }
+    }
+  };
+
+  if (!isStudentResponses) {
+    configToolTip = Object.assign(configToolTip, {
+      z: {
+        formatter: undefined,
+        title: "Student: "
+      }
+    });
+  }
+
   return {
     chart: {
       height: 250,
@@ -47690,24 +47714,7 @@ var readinesToLearnoptions$1 = function readinesToLearnoptions(seriesName, redir
         }
       }
     },
-    tooltip: {
-      enabled: true,
-      x: {
-        show: false
-      },
-      y: {
-        formatter: undefined,
-        title: {
-          formatter: function formatter() {
-            return "Percent";
-          }
-        }
-      },
-      z: {
-        formatter: undefined,
-        title: "Student: "
-      }
-    },
+    tooltip: configToolTip,
     labels: [],
     legend: {
       show: false,
@@ -47722,15 +47729,17 @@ var readinesToLearnoptions$1 = function readinesToLearnoptions(seriesName, redir
     }
   };
 };
-var convertDataToSeriesBullderChart$1 = function convertDataToSeriesBullderChart(data, chartWidth) {
+var convertDataToSeriesBullderChart$1 = function convertDataToSeriesBullderChart(data, chartWidth, isStudentResponses) {
   var widthItem = (chartWidth - 400) / data.length;
   return data.map(function (i, index) {
-    var _i$studentPercentQues;
+    var _i$studentPercentQues, _i$studentPercentQues2;
 
     return {
       name: i.questionText.replace("<p>", "").replace("</p>", ""),
-      data: ((_i$studentPercentQues = i.studentPercentQuestion) === null || _i$studentPercentQues === void 0 ? void 0 : _i$studentPercentQues.map(function (question) {
+      data: !isStudentResponses ? (_i$studentPercentQues = i.studentPercentQuestion) === null || _i$studentPercentQues === void 0 ? void 0 : _i$studentPercentQues.map(function (question) {
         return [getRandomArbitrary$1(index * widthItem + widthItem * (30 / 100), (index + 1) * widthItem - widthItem * (30 / 100)), question.percentQuestion, question.studentName, question.studentId];
+      }) : ((_i$studentPercentQues2 = i.studentPercentQuestion) === null || _i$studentPercentQues2 === void 0 ? void 0 : _i$studentPercentQues2.map(function (question) {
+        return [getRandomArbitrary$1(index * widthItem + widthItem * (30 / 100), (index + 1) * widthItem - widthItem * (30 / 100)), question.percentQuestion];
       })) || []
     };
   });
@@ -48092,7 +48101,8 @@ var BubbleChartCustom$2 = function BubbleChartCustom(_ref) {
       print = _ref.print,
       disableSeriesName = _ref.disableSeriesName,
       colors = _ref.colors,
-      indexActive = _ref.indexActive;
+      indexActive = _ref.indexActive,
+      isStudentResponses = _ref.isStudentResponses;
   var history = reactRouterDom.useHistory();
 
   var _useTranslation = marioCore.useTranslation(),
@@ -48157,9 +48167,9 @@ var BubbleChartCustom$2 = function BubbleChartCustom(_ref) {
   }, React__default.createElement("div", {
     ref: chartRef
   }, React__default.createElement(Chart, {
-    options: readinesToLearnoptions$1(seriesName, redirectStudentOverview, isStudent, colors),
+    options: readinesToLearnoptions$1(seriesName, redirectStudentOverview, isStudent, colors, isStudentResponses),
     type: "scatter",
-    series: convertDataToSeriesBullderChart$1(data, chartWidth),
+    series: convertDataToSeriesBullderChart$1(data, chartWidth, isStudentResponses),
     width: "100%",
     height: 250
   })))), React__default.createElement("div", {
@@ -49195,6 +49205,7 @@ var SurveyDetailAdmin = function SurveyDetailAdmin() {
     print: true,
     disableSeriesName: true,
     colors: ratingOfQuestionColors,
+    isStudentResponses: tabIndex != 0,
     data: distributionSeries.filter(function (_r, index) {
       return activeColumnDistribution[index] == true;
     }) || [],