mario-education 2.4.186-level → 2.4.187-level

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

@@ -6,6 +6,7 @@ interface IProps {
     series: ISeries[];
     colors: string[];
     dayOfWeek: string[];
+    isCountSeries?: boolean;
 }
 declare const AreaChart: FC<IProps>;
 export default AreaChart;

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

@@ -6,6 +6,7 @@ interface IProps {
     width?: number | string;
     height?: number | string;
     textColors?: string[];
+    isCountSeries?: boolean;
 }
 declare const OverallDonutChart: FC<IProps>;
 export default OverallDonutChart;

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

@@ -102,10 +102,10 @@ export declare const convertDataToSeriesBullderChart: (data: IReadinessToLearnin
     name: string;
     data: import("react").ReactText[][];
 }[];
-export declare const optionColumnChartAndPercents: (months: string[], activeData: boolean[], isRidgeCharts: boolean, colors: string[], dayOfWeek: string[]) => ApexOptions;
+export declare const optionColumnChartAndPercents: (months: string[], activeData: boolean[], isRidgeCharts: boolean, colors: string[], dayOfWeek: string[], isCountSeries?: boolean | undefined) => ApexOptions;
 export declare const optionLineChart: (months: string[], activeData: boolean[], colors: string[], dayOfWeek: string[]) => ApexOptions;
 export declare const optionBarChartAndArea: (months: string[], activeData: boolean[], dayOfWeek: string[], newseries?: any) => ApexOptions;
-export declare const overallDonutCHartOptions: (labelNames: string[], colors: string[], textColors?: string[] | undefined) => ApexOptions;
+export declare const overallDonutCHartOptions: (labelNames: string[], colors: string[], isCountSeries?: boolean | undefined, textColors?: string[] | undefined) => ApexOptions;
 export declare const convertDataToDataChart: (data: IOverviewQuestionChoice[]) => string[];
 export declare const convertToSeriesColumnChartAndPercent: (dataCharts: string[], data: IOverviewQuestionChoice[]) => {
     name: string;

package/dist/index.js

@@ -28767,7 +28767,7 @@ var convertDataToSeriesBullderChart = function convertDataToSeriesBullderChart(d
     };
   });
 };
-var optionColumnChartAndPercents = function optionColumnChartAndPercents(months, activeData, isRidgeCharts, colors, dayOfWeek) {
+var optionColumnChartAndPercents = function optionColumnChartAndPercents(months, activeData, isRidgeCharts, colors, dayOfWeek, isCountSeries) {
   return {
     chart: {
       height: 350,
@@ -28848,7 +28848,8 @@ var optionColumnChartAndPercents = function optionColumnChartAndPercents(months,
           cssClass: "apexcharts-yaxis-label"
         },
         formatter: function formatter(value) {
-          return value + "%";
+          var roundedValue = Math.round(value);
+          return !isCountSeries ? roundedValue + "%" : roundedValue.toString();
         },
         offsetX: 0,
         offsetY: 0,
@@ -28980,7 +28981,7 @@ var optionLineChart = function optionLineChart(months, activeData, colors, dayOf
     }
   };
 };
-var overallDonutCHartOptions = function overallDonutCHartOptions(labelNames, colors, textColors) {
+var overallDonutCHartOptions = function overallDonutCHartOptions(labelNames, colors, isCountSeries, textColors) {
   return {
     legend: {
       show: false,
@@ -29008,13 +29009,18 @@ var overallDonutCHartOptions = function overallDonutCHartOptions(labelNames, col
       theme: "palette5",
       y: {
         formatter: function formatter(value) {
-          return value.toFixed(1).toString() + "%";
+          return !isCountSeries ? value.toFixed(1).toString() + "%" : value.toString();
         }
       }
     },
     colors: colors,
     dataLabels: {
       enabled: true,
+      formatter: function formatter(val, opt) {
+        var _opt$w, _opt$w$globals, _opt$w$globals$series;
+
+        return !isCountSeries ? val.toFixed(1) + "%" : opt === null || opt === void 0 ? void 0 : (_opt$w = opt.w) === null || _opt$w === void 0 ? void 0 : (_opt$w$globals = _opt$w.globals) === null || _opt$w$globals === void 0 ? void 0 : (_opt$w$globals$series = _opt$w$globals.series) === null || _opt$w$globals$series === void 0 ? void 0 : _opt$w$globals$series[opt === null || opt === void 0 ? void 0 : opt.seriesIndex];
+      },
       style: {
         colors: textColors || ["#242424", "#242424"],
         fontSize: "12px",
@@ -30696,8 +30702,9 @@ var AreaChart = function AreaChart(_ref) {
       months = _ref.months,
       activeColumn = _ref.activeColumn,
       colors = _ref.colors,
-      dayOfWeek = _ref.dayOfWeek;
-  var options = optionColumnChartAndPercents(months, activeColumn, true, colors, dayOfWeek);
+      dayOfWeek = _ref.dayOfWeek,
+      isCountSeries = _ref.isCountSeries;
+  var options = optionColumnChartAndPercents(months, activeColumn, true, colors, dayOfWeek, isCountSeries);
   options.tooltip = {
     custom: function custom(_ref2) {
       var dataPointIndex = _ref2.dataPointIndex,
@@ -30707,7 +30714,7 @@ var AreaChart = function AreaChart(_ref) {
       return "<div class=" + styles$1["custom-tooltip"] + "> \n               <p class=" + styles$1["custom-tooltip-month"] + "> " + dayOfWeek[dataPointIndex] + " </p>\n               " + seriesItem.map(function (r, index) {
         var _r$data$dataPointInde;
 
-        return "<div key={" + index + "} class=" + styles$1["tooltip-data-box"] + ">\n                      <div class=" + styles$1["tooltip-data-cursor"] + " style=\"background: " + colorsItem[index] + "\"></div>\n                      <div class=" + styles$1["tooltip-data"] + ">\n                        <p  class=" + styles$1["name"] + ">" + r.name + ":</p>\n                        <p class=" + styles$1["data"] + ">" + ((_r$data$dataPointInde = r.data[dataPointIndex]) === null || _r$data$dataPointInde === void 0 ? void 0 : _r$data$dataPointInde.toFixed(2)) + "%</p>\n                      </div>\n                    </div>";
+        return "<div key={" + index + "} class=" + styles$1["tooltip-data-box"] + ">\n                      <div class=" + styles$1["tooltip-data-cursor"] + " style=\"background: " + colorsItem[index] + "\"></div>\n                      <div class=" + styles$1["tooltip-data"] + ">\n                        <p  class=" + styles$1["name"] + ">" + r.name + ":</p>\n                        <p class=" + styles$1["data"] + ">" + (!isCountSeries ? ((_r$data$dataPointInde = r.data[dataPointIndex]) === null || _r$data$dataPointInde === void 0 ? void 0 : _r$data$dataPointInde.toFixed(2)) + "%" : r.data[dataPointIndex]) + "</p>\n                      </div>\n                    </div>";
       }) + "\n            </div>";
     }
   };
@@ -30772,9 +30779,10 @@ var OverallDonutChart = function OverallDonutChart(_ref) {
       width = _ref$width === void 0 ? "100%" : _ref$width,
       _ref$height = _ref.height,
       height = _ref$height === void 0 ? 250 : _ref$height,
+      isCountSeries = _ref.isCountSeries,
       textColors = _ref.textColors;
   return React__default.createElement(Chart, {
-    options: overallDonutCHartOptions(label, colors, textColors),
+    options: overallDonutCHartOptions(label, colors, isCountSeries, textColors),
     series: series,
     type: "donut",
     width: width,
@@ -30912,6 +30920,7 @@ var GenerateChartData = function GenerateChartData(_ref) {
   })), React__default.createElement("div", {
     className: "w-100 " + (isPrint && typeChart === TYPECHART.DONUT ? "d-flex justify-content-center" : "")
   }, typeChart === TYPECHART.AREA && React__default.createElement(AreaChart, {
+    isCountSeries: !!avgContent,
     months: months,
     activeColumn: activeColumn,
     series: newSeries,
@@ -30930,6 +30939,7 @@ var GenerateChartData = function GenerateChartData(_ref) {
     dayOfWeek: dayOfWeek,
     colors: colors
   }), typeChart === TYPECHART.DONUT && React__default.createElement(OverallDonutChart, {
+    isCountSeries: !!avgContent,
     series: seriesDonut,
     colors: colors,
     label: label,
@@ -32563,7 +32573,7 @@ var useExportSessionCsv = function useExportSessionCsv() {
     var headers = "Student Name,ID/Email,Question,Answer,Teacher,Start Time";
 
     if (startDate || endDate) {
-      headers = "" + (moment(startDate).isValid() ? moment(startDate).format("DD/MM/YYYY") : '') + (moment(startDate).isValid() && moment(endDate).isValid() ? '-' : '') + moment(endDate).format("DD/MM/YYYY") + "\n" + headers;
+      headers = "\"" + (moment(startDate).isValid() ? 'From: ' + moment(startDate).format("DD/MM/YYYY") : '') + (moment(startDate).isValid() && moment(endDate).isValid() ? ' - ' : '') + (moment(endDate).isValid() ? 'To: ' + moment(endDate).format("DD/MM/YYYY") : '') + "\"\n" + headers;
     }
 
     var questions = data.questions,
@@ -35143,7 +35153,7 @@ var SurveyDashboard = function SurveyDashboard() {
   })), React__default.createElement(reactstrap.Col, {
     md: 12
   }, React__default.createElement(GenerateChartData, {
-    colors: ["#73C8E5", "#F9F871", "#D7B0DE", "#E56362", "#169490", "#D3D3D3", "#316CD9"],
+    colors: ["#73C8E5", "#FFB04F", "#D7B0DE", "#E56362", "#169490", "#D3D3D3", "#316CD9"],
     name: "Survey Results",
     typeChart: TYPECHART$2.AREA,
     activeColumn: activeColumnResult,