mario-education 2.4.70-beta → 2.4.80-beta

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

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

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

@@ -5,6 +5,7 @@ interface IProps {
     activeColumn: boolean[];
     series: ISeries[];
     isHasLineChart: boolean;
+    dayOfWeek: string[];
 }
 declare const BarAndAreaChart: FC<IProps>;
 export default BarAndAreaChart;

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

@@ -4,6 +4,7 @@ interface IProps {
     months: string[];
     activeColumn: boolean[];
     series: ISeries[];
+    dayOfWeek: string[];
 }
 declare const BarChart: FC<IProps>;
 export default BarChart;

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

@@ -12,6 +12,7 @@ export interface IProps {
     series: ISeries[];
     avg: number[];
     months: any;
+    dayOfWeek?: string[];
 }
 declare const _default: React.NamedExoticComponent<IProps>;
 export default _default;

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

@@ -4,6 +4,7 @@ interface IProps {
     months: string[];
     activeColumn: boolean[];
     series: ISeries[];
+    dayOfWeek: string[];
 }
 declare const LineChart: FC<IProps>;
 export default LineChart;

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

@@ -156,6 +156,8 @@ export interface IResultQuestion {
 export interface IOverviewQuestionChoice {
     month: string;
     resultQuestion: IResultQuestion[];
+    endDate: string;
+    startDate: string;
 }
 export interface IColumnChartAndPercent {
     overviewQuestionChoice: IOverviewQuestionChoice[];

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

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

package/dist/MarioFramework.Education/ClientApp/src/containers/Dashboard/hooks/useDashboard.d.ts

@@ -66,5 +66,9 @@ declare const useDashboard: () => {
     filterLearningStrategiesTable: any;
     changeFiltersLearningStrategiesTable: (updatedFilter: any) => void;
     getLearningStrategiesTableData: () => Promise<void>;
+    dayOfWeekOneToOne: string[];
+    dayOfWeekConference: string[];
+    dayOfWeekReflection: string[];
+    dayOfWeekSafety: string[];
 };
 export default useDashboard;

package/dist/index.js

@@ -27627,7 +27627,7 @@ var convertDataToSeriesBullderChart = function convertDataToSeriesBullderChart(d
     };
   });
 };
-var optionColumnChartAndPercents = function optionColumnChartAndPercents(months, activeData, isRidgeCharts) {
+var optionColumnChartAndPercents = function optionColumnChartAndPercents(months, activeData, isRidgeCharts, dayOfWeek) {
   return {
     chart: {
       height: 350,
@@ -27708,6 +27708,11 @@ var optionColumnChartAndPercents = function optionColumnChartAndPercents(months,
           return value.toFixed(2) + "%";
         }
       },
+      x: {
+        formatter: function formatter(value, opts) {
+          return dayOfWeek[opts === null || opts === void 0 ? void 0 : opts.dataPointIndex] || value.toString();
+        }
+      },
       onDatasetHover: {
         highlightDataSeries: true
       }
@@ -27717,7 +27722,7 @@ var optionColumnChartAndPercents = function optionColumnChartAndPercents(months,
     }
   };
 };
-var optionLineChart = function optionLineChart(months, activeData) {
+var optionLineChart = function optionLineChart(months, activeData, dayOfWeek) {
   return {
     chart: {
       height: 350,
@@ -27788,6 +27793,11 @@ var optionLineChart = function optionLineChart(months, activeData) {
           return value.toFixed(2) + "%";
         }
       },
+      x: {
+        formatter: function formatter(value, opts) {
+          return dayOfWeek[opts === null || opts === void 0 ? void 0 : opts.dataPointIndex] || value.toString();
+        }
+      },
       onDatasetHover: {
         highlightDataSeries: true
       }
@@ -27797,7 +27807,7 @@ var optionLineChart = function optionLineChart(months, activeData) {
     }
   };
 };
-var optionBarChartAndArea = function optionBarChartAndArea(months, activeData, newseries) {
+var optionBarChartAndArea = function optionBarChartAndArea(months, activeData, dayOfWeek, newseries) {
   return {
     chart: {
       height: 350,
@@ -27887,6 +27897,11 @@ var optionBarChartAndArea = function optionBarChartAndArea(months, activeData, n
           return value.toFixed(2) + "%";
         }
       },
+      x: {
+        formatter: function formatter(value, opts) {
+          return dayOfWeek[opts === null || opts === void 0 ? void 0 : opts.dataPointIndex] || value.toString();
+        }
+      },
       onDatasetHover: {
         highlightDataSeries: true
       }
@@ -28047,9 +28062,10 @@ var BubbleChartCustom$1 = React__default.memo(BubbleChartCustom, propsAreEqual);
 var AreaChart = function AreaChart(_ref) {
   var series = _ref.series,
       months = _ref.months,
-      activeColumn = _ref.activeColumn;
+      activeColumn = _ref.activeColumn,
+      dayOfWeek = _ref.dayOfWeek;
   return React__default.createElement(Chart, {
-    options: optionColumnChartAndPercents(months, activeColumn, true),
+    options: optionColumnChartAndPercents(months, activeColumn, true, dayOfWeek),
     type: "area",
     series: series,
     width: "100%",
@@ -28060,9 +28076,10 @@ var AreaChart = function AreaChart(_ref) {
 var BarChart = function BarChart(_ref) {
   var series = _ref.series,
       months = _ref.months,
-      activeColumn = _ref.activeColumn;
+      activeColumn = _ref.activeColumn,
+      dayOfWeek = _ref.dayOfWeek;
   return React__default.createElement(Chart, {
-    options: optionColumnChartAndPercents(months, activeColumn, false),
+    options: optionColumnChartAndPercents(months, activeColumn, false, dayOfWeek),
     type: "bar",
     series: series,
     width: "100%",
@@ -28075,10 +28092,11 @@ var BarAndAreaChart = function BarAndAreaChart(_ref) {
       months = _ref.months,
       activeColumn = _ref.activeColumn,
       _ref$isHasLineChart = _ref.isHasLineChart,
-      isHasLineChart = _ref$isHasLineChart === void 0 ? false : _ref$isHasLineChart;
+      isHasLineChart = _ref$isHasLineChart === void 0 ? false : _ref$isHasLineChart,
+      dayOfWeek = _ref.dayOfWeek;
   var newseries = mergeBarChartAndArea(series, isHasLineChart);
   return React__default.createElement(Chart, {
-    options: optionBarChartAndArea(months, activeColumn, newseries),
+    options: optionBarChartAndArea(months, activeColumn, dayOfWeek, newseries),
     series: newseries,
     width: "100%",
     height: 450
@@ -28088,9 +28106,10 @@ var BarAndAreaChart = function BarAndAreaChart(_ref) {
 var LineChart = function LineChart(_ref) {
   var series = _ref.series,
       months = _ref.months,
-      activeColumn = _ref.activeColumn;
+      activeColumn = _ref.activeColumn,
+      dayOfWeek = _ref.dayOfWeek;
   return React__default.createElement(Chart, {
-    options: optionLineChart(months, activeColumn),
+    options: optionLineChart(months, activeColumn, dayOfWeek),
     type: "line",
     series: series,
     width: "100%",
@@ -28104,6 +28123,8 @@ var ColumnChartAndPercent = function ColumnChartAndPercent(_ref) {
       typeChart = _ref$typeChart === void 0 ? TYPECHART.BAR : _ref$typeChart,
       _ref$isHasLineChart = _ref.isHasLineChart,
       isHasLineChart = _ref$isHasLineChart === void 0 ? false : _ref$isHasLineChart,
+      _ref$dayOfWeek = _ref.dayOfWeek,
+      dayOfWeek = _ref$dayOfWeek === void 0 ? [] : _ref$dayOfWeek,
       onActiveColumn = _ref.onActiveColumn,
       activeColumn = _ref.activeColumn,
       series = _ref.series,
@@ -28152,20 +28173,24 @@ var ColumnChartAndPercent = function ColumnChartAndPercent(_ref) {
   }, typeChart === TYPECHART.AREA && React__default.createElement(AreaChart, {
     months: months,
     activeColumn: activeColumn,
-    series: series
+    series: series,
+    dayOfWeek: dayOfWeek
   }), typeChart === TYPECHART.BAR && React__default.createElement(BarChart, {
     months: months,
     activeColumn: activeColumn,
-    series: series
+    series: series,
+    dayOfWeek: dayOfWeek
   }), typeChart === TYPECHART.BOTH && React__default.createElement(BarAndAreaChart, {
     months: months,
+    dayOfWeek: dayOfWeek,
     activeColumn: activeColumn,
     series: series,
     isHasLineChart: isHasLineChart
   }), typeChart === TYPECHART.LINE && React__default.createElement(LineChart, {
     months: months,
     activeColumn: activeColumn,
-    series: series
+    series: series,
+    dayOfWeek: dayOfWeek
   })), !isPDF && React__default.createElement("div", {
     className: "w-100 d-flex gap-2 flex-wrap  " + styles$1["listItem"]
   }, data.map(function (month, index) {
@@ -28665,6 +28690,9 @@ var useDashboard = function useDashboard() {
   var monthsOneToOne = chartOneToOneData === null || chartOneToOneData === void 0 ? void 0 : chartOneToOneData.overviewQuestionChoice.map(function (i) {
     return (i === null || i === void 0 ? void 0 : i.month) || "";
   });
+  var dayOfWeekOneToOne = chartOneToOneData === null || chartOneToOneData === void 0 ? void 0 : chartOneToOneData.overviewQuestionChoice.map(function (r) {
+    return marioCore.utcToLocalTime(r.startDate, "DD-MM-yyyy") + " - " + marioCore.utcToLocalTime(r.endDate, "DD-MM-yyyy");
+  });
   var dataConvertedOneToOne = convertDataToDataChart(chartOneToOneData === null || chartOneToOneData === void 0 ? void 0 : chartOneToOneData.overviewQuestionChoice);
   var newSeriesOneToOne = convertToSeriesColumnChartAndPercent(dataConvertedOneToOne, chartOneToOneData === null || chartOneToOneData === void 0 ? void 0 : chartOneToOneData.overviewQuestionChoice);
   var newAvgOneToOne = convertToAvg(dataConvertedOneToOne, chartOneToOneData === null || chartOneToOneData === void 0 ? void 0 : chartOneToOneData.overviewQuestionChoice, monthsOneToOne);
@@ -28746,6 +28774,9 @@ var useDashboard = function useDashboard() {
   var monthsClassReflection = chartClassReflection === null || chartClassReflection === void 0 ? void 0 : chartClassReflection.overviewQuestionChoice.map(function (i) {
     return (i === null || i === void 0 ? void 0 : i.month) || "";
   });
+  var dayOfWeekReflection = chartClassReflection === null || chartClassReflection === void 0 ? void 0 : chartClassReflection.overviewQuestionChoice.map(function (r) {
+    return marioCore.utcToLocalTime(r.startDate, "DD-MM-yyyy") + " - " + marioCore.utcToLocalTime(r.endDate, "DD-MM-yyyy");
+  });
   var dataConvertedClassReflection = convertDataToDataChart(chartClassReflection === null || chartClassReflection === void 0 ? void 0 : chartClassReflection.overviewQuestionChoice);
   var newSeriesClassReflection = convertToSeriesColumnChartAndPercent(dataConvertedClassReflection, chartClassReflection === null || chartClassReflection === void 0 ? void 0 : chartClassReflection.overviewQuestionChoice);
   var newAvgClassReflection = convertToAvg(dataConvertedClassReflection, chartClassReflection === null || chartClassReflection === void 0 ? void 0 : chartClassReflection.overviewQuestionChoice, monthsClassReflection);
@@ -28789,6 +28820,9 @@ var useDashboard = function useDashboard() {
   var monthsConference = chartConference === null || chartConference === void 0 ? void 0 : (_chartConference$over = chartConference.overviewQuestionChoice) === null || _chartConference$over === void 0 ? void 0 : _chartConference$over.map(function (i) {
     return (i === null || i === void 0 ? void 0 : i.month) || "";
   });
+  var dayOfWeekConference = chartConference === null || chartConference === void 0 ? void 0 : chartConference.overviewQuestionChoice.map(function (r) {
+    return marioCore.utcToLocalTime(r.startDate, "DD-MM-yyyy") + " - " + marioCore.utcToLocalTime(r.endDate, "DD-MM-yyyy");
+  });
   var dataConvertedConference = convertDataToDataChart(chartConference === null || chartConference === void 0 ? void 0 : chartConference.overviewQuestionChoice);
   var newSeriesConference = convertToSeriesColumnChartAndPercent(dataConvertedConference, chartConference === null || chartConference === void 0 ? void 0 : chartConference.overviewQuestionChoice);
   var newAvgConference = convertToAvg(dataConvertedConference, chartConference === null || chartConference === void 0 ? void 0 : chartConference.overviewQuestionChoice, monthsConference);
@@ -28832,6 +28866,9 @@ var useDashboard = function useDashboard() {
   var monthsSafety = safety === null || safety === void 0 ? void 0 : (_safety$overviewQuest = safety.overviewQuestionChoice) === null || _safety$overviewQuest === void 0 ? void 0 : _safety$overviewQuest.map(function (i) {
     return (i === null || i === void 0 ? void 0 : i.month) || "";
   });
+  var dayOfWeekSafety = safety === null || safety === void 0 ? void 0 : safety.overviewQuestionChoice.map(function (r) {
+    return marioCore.utcToLocalTime(r.startDate, "DD-MM-yyyy") + " - " + marioCore.utcToLocalTime(r.endDate, "DD-MM-yyyy");
+  });
   var dataConvertedSafety = convertDataToDataChart(safety === null || safety === void 0 ? void 0 : safety.overviewQuestionChoice);
   var newSeriesSafety = convertToSeriesColumnChartAndPercent(dataConvertedSafety, safety === null || safety === void 0 ? void 0 : safety.overviewQuestionChoice);
   var newAvgSafety = convertToAvg(dataConvertedSafety, safety === null || safety === void 0 ? void 0 : safety.overviewQuestionChoice, monthsSafety);
@@ -29035,7 +29072,11 @@ var useDashboard = function useDashboard() {
     handleOpenCloseLearningStrategiesTable: handleOpenCloseLearningStrategiesTable,
     filterLearningStrategiesTable: filterLearningStrategiesTable,
     changeFiltersLearningStrategiesTable: changeFiltersLearningStrategiesTable,
-    getLearningStrategiesTableData: getLearningStrategiesTableData
+    getLearningStrategiesTableData: getLearningStrategiesTableData,
+    dayOfWeekOneToOne: dayOfWeekOneToOne,
+    dayOfWeekConference: dayOfWeekConference,
+    dayOfWeekReflection: dayOfWeekReflection,
+    dayOfWeekSafety: dayOfWeekSafety
   };
 };
 
@@ -29095,7 +29136,11 @@ var useChartDatas = function useChartDatas() {
       handleOpenCloseLearningStrategiesTable = _useDashboard.handleOpenCloseLearningStrategiesTable,
       filterLearningStrategiesTable = _useDashboard.filterLearningStrategiesTable,
       changeFiltersLearningStrategiesTable = _useDashboard.changeFiltersLearningStrategiesTable,
-      getLearningStrategiesTableData = _useDashboard.getLearningStrategiesTableData;
+      getLearningStrategiesTableData = _useDashboard.getLearningStrategiesTableData,
+      dayOfWeekOneToOne = _useDashboard.dayOfWeekOneToOne,
+      dayOfWeekReflection = _useDashboard.dayOfWeekReflection,
+      dayOfWeekConference = _useDashboard.dayOfWeekConference,
+      dayOfWeekSafety = _useDashboard.dayOfWeekSafety;
 
   var _useState = React.useState([]),
       selectedToPrint = _useState[0],
@@ -29250,6 +29295,7 @@ var useChartDatas = function useChartDatas() {
         series: seriesOneToOne,
         avg: avgOneToOne,
         months: monthsOneToOne,
+        dayOfWeek: dayOfWeekOneToOne,
         isPDF: isPDF
       });
     },
@@ -29277,7 +29323,8 @@ var useChartDatas = function useChartDatas() {
         series: seriesClassRefection,
         avg: avgClassReflection,
         months: monthsClassReflection,
-        isPDF: isPDF
+        isPDF: isPDF,
+        dayOfWeek: dayOfWeekReflection
       });
     },
     isShowChangeChart: true,
@@ -29303,7 +29350,8 @@ var useChartDatas = function useChartDatas() {
         series: seriesConference,
         avg: avgConference,
         months: monthsConference,
-        isPDF: isPDF
+        isPDF: isPDF,
+        dayOfWeek: dayOfWeekConference
       });
     },
     isShowChangeChart: true,
@@ -29330,7 +29378,8 @@ var useChartDatas = function useChartDatas() {
         series: seriesSafety,
         avg: avgSafety,
         months: monthsSafety,
-        isPDF: isPDF
+        isPDF: isPDF,
+        dayOfWeek: dayOfWeekSafety
       });
     },
     isShowChangeChart: true,