mario-education 2.4.25-admin → 2.4.26-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, filter, option }: PROPS_FILTERS_COMPONENT) => JSX.Element;
+declare const SelectFilter: ({ teacherId, studentUserId, studentId, teacherUserId, studentDefault, handleChangeFilters, name, icon, option, onChangeFilters }: PROPS_FILTERS_COMPONENT) => JSX.Element;
 export default SelectFilter;

package/dist/MarioFramework.Education/ClientApp/src/containers/Dashboard/components/AreaChart.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 AreaChart: FC<IProps>;
+export default AreaChart;

package/dist/MarioFramework.Education/ClientApp/src/containers/Dashboard/components/BarAndAreaChart.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 BarAndAreaChart: FC<IProps>;
+export default BarAndAreaChart;

package/dist/MarioFramework.Education/ClientApp/src/containers/Dashboard/components/BarChart.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 BarChart: FC<IProps>;
+export default BarChart;

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

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

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

@@ -1,10 +1,11 @@
 import { FC } from "react";
+import { TYPECHART } from "../ColumnChartAndPercent";
 interface IProps {
     title: string;
     onToggle: () => void;
     isShowChangeChart?: boolean;
-    isRidgeChart?: boolean;
-    onChangeChart: () => void;
+    typeChart?: TYPECHART;
+    onChangeChart: (type: TYPECHART) => void;
     isOpen: boolean;
 }
 declare const HeaderChart: FC<IProps>;

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

@@ -38,3 +38,7 @@ export declare const INITIAL_AVG: number[];
 export declare const COLOR_CHART_AND_PERCENTS: string[];
 export declare const COLOR_CHART_BUBBLE: string[];
 export declare const PERCENT: number[];
+export declare const GENDER_OPTION: {
+    value: number;
+    label: string;
+}[];

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

@@ -179,6 +179,10 @@ export interface BAND_SCORE {
     label: string;
     value: number;
 }
+export interface IOption {
+    label: string;
+    value: number;
+}
 export interface IDashboardToTalStudent {
     avgClassReflection: number;
     totalConference: number;
@@ -186,4 +190,31 @@ export interface IDashboardToTalStudent {
     totalTimeConference: number;
     totalTimeOneToOne: number;
 }
+export declare enum FILTER_YEAR {
+    THIS_YEAR = 0,
+    LAST_YEAR = 1,
+    LAST_QUARTER = 2,
+    LAST_MONTH = 3,
+    LAST_DAY = 4
+}
+export interface IfilterYear {
+    label: string;
+    value: FILTER_YEAR;
+    startDate: number;
+    endDate: number;
+}
+export interface ICalenDarLabelBox {
+    value: FILTER_YEAR;
+    label: string;
+}
+export interface IGenderLabelBox {
+    value: number;
+    label: string;
+}
+export interface ILabelBox {
+    calendar: ICalenDarLabelBox;
+    gender: IGenderLabelBox;
+    grade: number;
+    bandScore: number;
+}
 export {};

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

@@ -1,6 +1,6 @@
 import { ApexOptions } from "apexcharts";
 import { IOptionSelector } from "../../../components/Select/InputSelector";
-import { IActivityCircle, IOverviewQuestionChoice, IReadinessToLearning, ISeries, IseriesChart, IStudentByAge, IStudentByGrade, IsyntheticFriendCircle, LegalGenderType, MtssType } from "./types";
+import { FILTER_YEAR, IActivityCircle, IOverviewQuestionChoice, IReadinessToLearning, ISeries, IseriesChart, IStudentByAge, IStudentByGrade, IsyntheticFriendCircle, LegalGenderType, MtssType } from "./types";
 export declare const getColors: (length: number) => string[];
 export declare const friendCircleItems: ({ bestFriends, friends, couldBeFriends, supportive }: IsyntheticFriendCircle) => {
     id: number;
@@ -68,6 +68,26 @@ export declare const pieChartOptions: {
         colors: string[];
         width: number;
     };
+    states: {
+        normal: {
+            filter: {
+                type: string;
+                value: number;
+            };
+        };
+        hover: {
+            filter: {
+                type: string;
+                value: number;
+            };
+        };
+        active: {
+            filter: {
+                type: string;
+                value: number;
+            };
+        };
+    };
 };
 export declare const convertDataToSeriesStudentByGrade: (data: IStudentByGrade[]) => {
     name: string;
@@ -85,6 +105,7 @@ export declare const convertDataToSeriesBullderChart: (data: IReadinessToLearnin
     data: number[][];
 }[];
 export declare const optionColumnChartAndPercents: (months: string[], activeData: boolean[], isRidgeCharts: 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[]) => {
     name: string;
@@ -92,3 +113,18 @@ 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[]) => {
+    type: string;
+    name: string;
+    data: number[];
+}[];
+export declare const getLastQuarterRange: () => {
+    start: number;
+    end: number;
+};
+export declare const filterYearData: {
+    label: string;
+    value: FILTER_YEAR;
+    startDate: number;
+    endDate: number;
+}[];

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

@@ -1,7 +1,8 @@
+import { TYPECHART } from "../components/ColumnChartAndPercent";
 declare const useBehavior: () => {
-    isRidgeCharts: boolean[];
     chartIsOpened: boolean[];
     onToggle: (idx: number) => void;
-    onChangeChart: (idx: number) => void;
+    onChangeChart: (idx: number, type: TYPECHART) => void;
+    typeChartList: TYPECHART[];
 };
 export default useBehavior;

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

@@ -1,10 +1,11 @@
 /// <reference types="react" />
 import { PROPS_FILTERS_COMPONENT } from "../../../utils/type";
+import { TYPECHART } from "../components/ColumnChartAndPercent";
 declare const useChartDatas: () => {
     chartDashBoards: {
         id: string;
         label: string;
-        children: (_: boolean) => JSX.Element;
+        children: (_: TYPECHART) => JSX.Element;
         isShowChangeChart: boolean;
     }[];
     user: any;
@@ -26,5 +27,6 @@ declare const useChartDatas: () => {
         deviant: string;
         filter: string;
     })[];
+    onChangeFilters: (filterSelect: import("../../../utils/type").IFilter) => void;
 };
 export default useChartDatas;

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

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { DashboardFilter, IActivityCircle, IlearningStrategies, IReadinessToLearning, IStudentByGrade, IStudentBySpecialNeed, IsyntheticFriendCircle, BAND_SCORE, IColumnChartAndPercent, IStudentByAge, IStudentByGender, IDashboardToTalStudent } from "../configs/types";
-import { Student } from "../../../utils/type";
+import { IFilter, Student } from "../../../utils/type";
 declare const useDashboard: () => {
     setFilter: import("react").Dispatch<import("react").SetStateAction<DashboardFilter>>;
     filter: DashboardFilter;
@@ -29,5 +29,6 @@ declare const useDashboard: () => {
     setGenderOfStudent: import("react").Dispatch<import("react").SetStateAction<string>>;
     handleFilterStudent: (option: any) => void;
     handleFilterTeacher: (option: any) => void;
+    onChangeFilters: (filterSelect: IFilter) => void;
 };
 export default useDashboard;

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

@@ -5,10 +5,6 @@ export declare const CONFERENCE_RUBRIC_TYPES: {
     HabitsAttitudesTowardsLearning: string;
     Custom: string;
 };
-export declare const LAST_YEAR_FILTER: {
-    label: string;
-    value: number;
-}[];
 export declare const GENDER_FILTER: string[];
 export declare enum FILTER_NAME {
     Calendar = "Calendar",

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

@@ -9,6 +9,13 @@ export interface Student {
     gender?: string;
     mtss?: string;
 }
+export interface IFilter {
+    startDate?: number;
+    endDate?: number;
+    gender?: number[];
+    grade?: string[];
+    bandScore?: string;
+}
 export interface PROPS_FILTERS_COMPONENT {
     teacherId?: number;
     studentUserId?: string;
@@ -21,6 +28,8 @@ export interface PROPS_FILTERS_COMPONENT {
     icon: string;
     handleChangeFilters: Function;
     option?: any[];
+    defautl?: number;
+    onChangeFilters?: (filters: IFilter) => void;
 }
 export interface BAND_SCORE {
     label: string;

package/dist/index.css

@@ -124,6 +124,7 @@ tbody._b-AXV tr {
 ._1XSIo {
  position: absolute;
  width:100%;
+ z-index: 100;
 }
 
 ._3o8gR {
@@ -133,7 +134,8 @@ tbody._b-AXV tr {
 ._3ru37 {
     background: #ffff;
     border-radius: 4px;
-    max-height: 150px;
+    min-width: 160px;
+    padding: 5px 0px 12px;
     overflow: auto;
     overflow-x: hidden;
     border: 1px solid rgba(51, 51, 51, 0.1);
@@ -232,7 +234,7 @@ h6._3zOGW {
 }
 
 ._10hbz {
-    font-weight: 400;
+    font-weight: bold;
     font-size: 14px;
     line-height: 16px;
 }
@@ -351,6 +353,12 @@ h6._3zOGW {
     min-width: 255px;
     flex-basis: 19%;
 }
+._1yuC9 ._10hbz {
+  font-family: 'Roboto';
+  font-weight: 500;
+  font-size: 14px;
+  line-height: 16px;
+}
 ._1yuC9:last-child {
     padding: 1.2rem !important;
 }
@@ -364,6 +372,7 @@ h6._3zOGW {
     width: 100%;
     -o-object-fit: scale-down;
        object-fit: scale-down;
+    max-height: 300px;
 }
 ._2PMoX._3ZX0b {
     height: 300px;
@@ -423,11 +432,27 @@ h6._3zOGW {
 ._6ZvFg {
   border-radius: 8px;
   overflow: hidden;
+  position: relative;
+}
+
+._24CNV._6ZvFg::after {
+  content: "";
+  width: 1px;
+  height: 100%;
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translate(-50%,0);
+  display: block;
+  background: rgba(51, 51, 51, 0.1);
 }
+
+._6ZvFg
 ._2vtSi{
   background: #FFFFFF;
   border-radius: 8px;
   padding: 20px;
+  cursor: pointer;
 }
 ._IpsVf{
 
@@ -440,14 +465,19 @@ h6._3zOGW {
 ._2vtSi ._37IcR{
   color: #D9D9D9;
   display:flex;
+  align-items: center;
 }
 
 ._2vtSi ._2G6Wz{
-  font-family: 'Roboto';
-  font-weight: 600;
+  font-weight: 700;
   font-size: 18px;
   letter-spacing: 0.01em;
   color: #262626;
+  font-family: "Roboto";
+}
+._2vtSi ._IpsVf {
+  display: flex;
+  align-items: center;
 }
 
 ._3xpNv {
@@ -469,11 +499,17 @@ h6._3zOGW {
 }
 
 ._2vtSi ._3AALV{
-  font-size: 23px;
+  font-size: 16px;
 }
 ._g5-bn ._2htKu{
   cursor: pointer;
 }
+
+._2htKu svg{
+    width: 20px !important;
+    height: auto !important;
+}
+
 ._2vtSi ._1qXAT{
   font-weight: 400;
   font-size: 16px;
@@ -533,16 +569,15 @@ h6._3zOGW {
   padding-right: 50px;
 }
 ._38ikt{
-  height: 410px;
+  /* height: 410px; */
 }
 ._38ikt ._1TnWs {
   position: absolute;
-  right: 35px;
-  top: 10px;
+  right: 60px;
   display: flex;
   justify-content: flex-end;
   flex-wrap: wrap;
-  width: 91px;
+  width: 150px;
 }
 ._38ikt ._1TnWs label {
   color: #333333;
@@ -603,7 +638,7 @@ h6._3zOGW {
   display: flex;
   justify-content: flex-end;
   flex-wrap: wrap;
-  width: 91px;
+  width: 150px;
 }
 ._2az-l ._1TnWs label {
   color: #333333;
@@ -709,3 +744,12 @@ h6._3zOGW {
   justify-content: center;
   align-items: center;
 }
+
+._38ikt ._pFFg9{
+  font-weight: 400;
+  font-size: 16px;
+  text-align: center;
+  letter-spacing: 0.01em;
+  color: #808080;
+  margin-bottom: 20px;
+}