mario-education 2.4.33-admin → 2.4.35-admin

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

@@ -28,7 +28,7 @@ export declare const mtssOptions: {
     value: MtssType;
     label: string;
 }[];
-export declare const learningStrategyChartOptions: (labelNames: string[], usageCountList: number[]) => ApexOptions;
+export declare const learningStrategyChartOptions: (labelNames: string[], usageCountList: number[], screenWidth: number) => ApexOptions;
 export declare const ReadinessToLearnOptions: (questionTexts: string[]) => ApexOptions;
 export declare const optionsChartGrade: (maxDatas: number) => ApexOptions;
 export declare const studentBySpecialNeedOptions: (seriesValue: IseriesChart, colors: string[]) => ApexOptions;

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

@@ -1,8 +1,8 @@
-import { TYPECHART } from "../configs/types";
+import { TYPECHART, IChartOptions } from "../configs/types";
 declare const useBehavior: (initialTypeChart: TYPECHART[]) => {
     chartIsOpened: boolean[];
     onToggle: (idx: number) => void;
-    onChangeChart: (idx: number, type: TYPECHART) => void;
+    onChangeChart: (idx: number, type: TYPECHART, options?: IChartOptions[] | undefined) => void;
     typeChartList: TYPECHART[];
     teacherUserId: string;
     changeCurrentTeacherUserId: (userId: string) => void;

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

@@ -32,7 +32,7 @@ declare const useChartDatas: () => {
         filter: string;
     })[];
     onChangeFilters: (filterSelect: import("../../../utils/type").IFilter) => void;
-    initialTypeChart: TYPECHART[];
+    initialTypeChart: (TYPECHART.AREA | TYPECHART)[];
     handleSelectToPrint: (checked: boolean, data: any, chartType: any) => void;
     checkSelectedItem: (id: string) => boolean;
     selectedToPrint: any;

package/dist/index.js

@@ -19898,7 +19898,7 @@ var useBehavior = function useBehavior(initialTypeChart) {
     setChartIsOpened(newStateChart);
   };
 
-  var onChangeChart = function onChangeChart(idx, type) {
+  var onChangeChart = function onChangeChart(idx, type, options) {
     switch (type) {
       case TYPECHART.AREA:
         if (typeChartList[idx] === TYPECHART.BAR || typeChartList[idx] === TYPECHART.LINE) {
@@ -19910,7 +19910,7 @@ var useBehavior = function useBehavior(initialTypeChart) {
 
         if (typeChartList[idx] === TYPECHART.BOTH) {
           setTypeChartList(typeChartList.map(function (cur, index) {
-            return index === idx ? initialTypeChart[idx] : cur;
+            return index === idx ? options[1].value : cur;
           }));
         }
 
@@ -25730,7 +25730,7 @@ var gradeOptions = function gradeOptions(grades, studentUserId) {
     };
   });
 };
-var learningStrategyChartOptions = function learningStrategyChartOptions(labelNames, usageCountList) {
+var learningStrategyChartOptions = function learningStrategyChartOptions(labelNames, usageCountList, screenWidth) {
   return {
     chart: {
       type: "bar",
@@ -25787,7 +25787,7 @@ var learningStrategyChartOptions = function learningStrategyChartOptions(labelNa
         show: true,
         align: "left",
         minWidth: 0,
-        maxWidth: 120,
+        maxWidth: screenWidth,
         style: {
           colors: [],
           fontSize: "14px",
@@ -26629,9 +26629,6 @@ var BarAndAreaChart = function BarAndAreaChart(_ref) {
       _ref$isHasLineChart = _ref.isHasLineChart,
       isHasLineChart = _ref$isHasLineChart === void 0 ? false : _ref$isHasLineChart;
   var newseries = mergeBarChartAndArea(series, isHasLineChart);
-  console.log({
-    newseries: newseries
-  });
   return React__default.createElement(Chart, {
     options: optionBarChartAndArea(months, activeColumn, newseries),
     series: newseries,
@@ -26940,6 +26937,7 @@ var TopLearningStrategy = function TopLearningStrategy(_ref) {
       return i.usageCount / maxData * 100;
     })
   }];
+  var screenWidth = (window.innerWidth - 256) / 100 * 30;
   return React__default.createElement("div", {
     className: "h-100 w-100 " + styles$1["chart-background"]
   }, React__default.createElement("div", {
@@ -26947,7 +26945,7 @@ var TopLearningStrategy = function TopLearningStrategy(_ref) {
   }, serieslearningStrategy.some(function (i) {
     return i.data;
   }) ? React__default.createElement(Chart, {
-    options: learningStrategyChartOptions(labelNames, usageCount),
+    options: learningStrategyChartOptions(labelNames, usageCount, screenWidth),
     series: serieslearningStrategy,
     type: "bar",
     width: "100%",
@@ -27166,13 +27164,15 @@ var useDashboard = function useDashboard() {
   };
 
   React.useEffect(function () {
-    setSeriesOneToOne(newSeriesOneToOne);
     setActiveColumnOneToOne([true].concat(dataConvertedOneToOne.map(function (_i) {
       return false;
     }).splice(0, dataConvertedOneToOne.length - 2)));
     setAvgOneToOne(newAvgOneToOne === null || newAvgOneToOne === void 0 ? void 0 : newAvgOneToOne.map(function (_, index) {
       return activeColumnOneToOne[index] ? newAvgOneToOne[index] : 0;
     }));
+    setSeriesOneToOne(newSeriesOneToOne === null || newSeriesOneToOne === void 0 ? void 0 : newSeriesOneToOne.filter(function (_, idx) {
+      return activeColumnOneToOne[idx];
+    }));
   }, [chartOneToOneData.overviewQuestionChoice]);
 
   var _useState23 = React.useState([]),
@@ -27207,7 +27207,9 @@ var useDashboard = function useDashboard() {
   };
 
   React.useEffect(function () {
-    setSeriesClassReflection(newSeriesClassReflection);
+    setSeriesClassReflection(newSeriesClassReflection === null || newSeriesClassReflection === void 0 ? void 0 : newSeriesClassReflection.filter(function (_, idx) {
+      return activeColumnClassReflection[idx];
+    }));
     setActiveColumnClassReflection([true].concat(dataConvertedClassReflection.map(function (_i) {
       return false;
     }).splice(0, dataConvertedClassReflection.length - 2)));
@@ -27248,12 +27250,14 @@ var useDashboard = function useDashboard() {
   };
 
   React.useEffect(function () {
-    setSeriesConference(newSeriesConference);
+    setSeriesConference(newSeriesConference === null || newSeriesConference === void 0 ? void 0 : newSeriesConference.filter(function (_, idx) {
+      return activeColumnConference[idx];
+    }));
     setActiveColumnConference([true].concat(dataConvertedConference === null || dataConvertedConference === void 0 ? void 0 : dataConvertedConference.map(function (_i) {
       return false;
     }).splice(0, dataConvertedConference.length - 2)));
     setAvgConference(newAvgConference === null || newAvgConference === void 0 ? void 0 : newAvgConference.map(function (_, idx) {
-      return newAvgConference[idx];
+      return activeColumnConference[idx] ? newAvgConference[idx] : 0;
     }));
   }, [chartConference === null || chartConference === void 0 ? void 0 : chartConference.overviewQuestionChoice]);
 
@@ -27719,7 +27723,7 @@ var useChartDatas = function useChartDatas() {
     }]
   }, {
     id: "Student_by_age",
-    label: "Student by Age",
+    label: "Student by Designation",
     children: function children(_, columnFlex) {
       return React__default.createElement(StudentByAgeAndGender$1, {
         columnFlex: columnFlex,
@@ -27740,8 +27744,8 @@ var useChartDatas = function useChartDatas() {
     isShowChangeChart: false,
     options: []
   }];
-  var initialTypeChart = chartDashBoards.map(function () {
-    return TYPECHART.AREA;
+  var initialTypeChart = chartDashBoards.map(function (i) {
+    return i.options.length > 0 ? i.options[0].value : TYPECHART.AREA;
   });
   var totalCardData = [{
     icon: "images/icon_chart.png",
@@ -29420,7 +29424,7 @@ var Dashboard = function Dashboard() {
       isShowChangeChart: chartDashBoard.isShowChangeChart,
       typeChart: typeChartList[index],
       onChangeChart: function onChangeChart(type) {
-        return _onChangeChart(index, type);
+        return _onChangeChart(index, type, chartDashBoard === null || chartDashBoard === void 0 ? void 0 : chartDashBoard.options);
       },
       isOpen: chartIsOpened[index],
       options: chartDashBoard.options