mario-education 2.4.26-admin → 2.4.27-admin

package/dist/MarioFramework.Education/ClientApp/src/components/Select/SelectFilter.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import { PROPS_FILTERS_COMPONENT } from "../../utils/type";
-declare const SelectFilter: ({ teacherId, studentUserId, studentId, teacherUserId, studentDefault, handleChangeFilters, name, icon, option, onChangeFilters }: PROPS_FILTERS_COMPONENT) => JSX.Element;
+declare const SelectFilter: ({ studentUserId, studentId, studentDefault, handleChangeFilters, name, icon, option, onChangeFilters, btnStyle, filter, teacherUserId, changeCurrentTeacherUserId }: PROPS_FILTERS_COMPONENT) => JSX.Element;
 export default SelectFilter;

package/dist/MarioFramework.Education/ClientApp/src/containers/Classes/components/StudentItemSelector.d.ts

@@ -5,6 +5,7 @@ interface Props {
     externalStudentIds?: number[];
     studentDefault?: Student;
     teacherUserId?: string;
+    placeholder?: string;
 }
 export interface Student {
     studentId: number;

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

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

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

@@ -1,14 +1,10 @@
 import React from "react";
-import { IOverviewQuestionChoice } from "../configs/types";
-export declare enum TYPECHART {
-    AREA = 0,
-    BAR = 1,
-    BOTH = 2
-}
+import { IOverviewQuestionChoice, TYPECHART } from "../configs/types";
 export interface IProps {
     data: IOverviewQuestionChoice[];
     id: string;
     typeChart?: TYPECHART;
+    isHasLineChart?: boolean;
 }
 export interface ISeries {
     name: string;

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

@@ -1,5 +1,5 @@
 import { FC } from "react";
-import { TYPECHART } from "../ColumnChartAndPercent";
+import { IChartOptions, TYPECHART } from "../../configs/types";
 interface IProps {
     title: string;
     onToggle: () => void;
@@ -7,6 +7,7 @@ interface IProps {
     typeChart?: TYPECHART;
     onChangeChart: (type: TYPECHART) => void;
     isOpen: boolean;
+    options?: IChartOptions[];
 }
 declare const HeaderChart: FC<IProps>;
 export default HeaderChart;

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

@@ -0,0 +1,9 @@
+import { FC } from "react";
+import { ISeries } from "../configs/types";
+interface IProps {
+    months: string[];
+    activeColumn: boolean[];
+    series: ISeries[];
+}
+declare const LineChart: FC<IProps>;
+export default LineChart;

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

@@ -217,4 +217,14 @@ export interface ILabelBox {
     grade: number;
     bandScore: number;
 }
+export declare enum TYPECHART {
+    AREA = 0,
+    BAR = 1,
+    LINE = 2,
+    BOTH = 3
+}
+export interface IChartOptions {
+    value: TYPECHART;
+    label: string;
+}
 export {};

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ApexOptions } from "apexcharts";
 import { IOptionSelector } from "../../../components/Select/InputSelector";
 import { FILTER_YEAR, IActivityCircle, IOverviewQuestionChoice, IReadinessToLearning, ISeries, IseriesChart, IStudentByAge, IStudentByGrade, IsyntheticFriendCircle, LegalGenderType, MtssType } from "./types";
@@ -99,12 +100,13 @@ export declare const studentByGradeConvert: (newData: IStudentByGrade[]) => {
 }[];
 export declare const findTotalStudentByGrade: (data: IStudentByGrade[]) => number;
 export declare const getConvertMinuteToHour: (timeSecond: any) => string;
-export declare const readinesToLearnoptions: (data: IReadinessToLearning[], seriesName: string[]) => ApexOptions;
+export declare const readinesToLearnoptions: (seriesName: string[]) => ApexOptions;
 export declare const convertDataToSeriesBullderChart: (data: IReadinessToLearning[]) => {
     name: string;
-    data: number[][];
+    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[]) => ApexOptions;
 export declare const convertDataToDataChart: (data: IOverviewQuestionChoice[]) => string[];
 export declare const convertToSeriesColumnChartAndPercent: (dataCharts: string[], data: IOverviewQuestionChoice[]) => {
@@ -113,7 +115,7 @@ export declare const convertToSeriesColumnChartAndPercent: (dataCharts: string[]
 }[];
 export declare const convertToAvg: (dataCharts: string[], data: IOverviewQuestionChoice[], months: string[]) => number[];
 export declare const seriesNameBubbleChartCustom: (series: IReadinessToLearning[]) => string[];
-export declare const mergeBarChartAndArea: (series: ISeries[]) => {
+export declare const mergeBarChartAndArea: (series: ISeries[], isHasLineChart: boolean) => {
     type: string;
     name: string;
     data: number[];

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

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

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

@@ -1,12 +1,16 @@
 /// <reference types="react" />
 import { PROPS_FILTERS_COMPONENT } from "../../../utils/type";
-import { TYPECHART } from "../components/ColumnChartAndPercent";
+import { TYPECHART } from "../configs/types";
 declare const useChartDatas: () => {
     chartDashBoards: {
         id: string;
         label: string;
-        children: (_: TYPECHART) => JSX.Element;
+        children: (typeChart: TYPECHART) => JSX.Element;
         isShowChangeChart: boolean;
+        options: {
+            label: string;
+            value: TYPECHART;
+        }[];
     }[];
     user: any;
     filter: import("../configs/types").DashboardFilter;
@@ -28,5 +32,6 @@ declare const useChartDatas: () => {
         filter: string;
     })[];
     onChangeFilters: (filterSelect: import("../../../utils/type").IFilter) => void;
+    initialTypeChart: (TYPECHART.AREA | TYPECHART)[];
 };
 export default useChartDatas;

package/dist/MarioFramework.Education/ClientApp/src/utils/type.d.ts

@@ -30,6 +30,8 @@ export interface PROPS_FILTERS_COMPONENT {
     option?: any[];
     defautl?: number;
     onChangeFilters?: (filters: IFilter) => void;
+    btnStyle?: any;
+    changeCurrentTeacherUserId?: (userId: string) => void;
 }
 export interface BAND_SCORE {
     label: string;

package/dist/index.css

@@ -716,7 +716,7 @@ h6._3zOGW {
 
 ._2j8fp ._1PPhv {
   position: absolute;
-  right: 50px;
+  right: 22px;
 }
 ._2j8fp ._1PPhv ._1rjWR {
   margin-bottom: 22.5px;