mario-education 2.4.142-level → 2.4.144-level

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

@@ -39,5 +39,6 @@ declare const useDashboard: () => {
     monthsLearningProgress: string[];
     dayOfWeekLearningProgress: string[];
     avgQuestionLastMonth: IQuestionResponseLastMonth[];
+    gradeList: string[];
 };
 export default useDashboard;

package/dist/MarioFramework.Education/ClientApp/src/services/dashboardService.d.ts

@@ -16,7 +16,7 @@ export declare const getActivityCircleItems: (filter: any) => Promise<import("ax
 export declare const getStudentBySpecialNeed: (filter: any) => Promise<import("axios").AxiosResponse<any>>;
 export declare const getStudentByAge: (filter: any) => Promise<import("axios").AxiosResponse<any>>;
 export declare const getStudentByGender: (filter: any) => Promise<import("axios").AxiosResponse<any>>;
-export declare const getGrades: (studentUserId: string) => Promise<import("axios").AxiosResponse<any>>;
+export declare const getGrades: (studentUserId: string, academicYearId: number) => Promise<import("axios").AxiosResponse<any>>;
 export declare const getBandScore: () => Promise<import("axios").AxiosResponse<any>>;
 export declare const getLearningStrategiesTableApi: (filter: any) => Promise<import("axios").AxiosResponse<any>>;
 export declare const getTopMostSurveyUsed: (filter: any) => Promise<import("axios").AxiosResponse<any>>;

package/dist/index.js

@@ -28917,10 +28917,11 @@ var getStudentByGender = function getStudentByGender(filter) {
     params: filter
   });
 };
-var getGrades = function getGrades(studentUserId) {
+var getGrades = function getGrades(studentUserId, academicYearId) {
   return marioCore.api.get(REPORT_URL + "/grade-levels", {
     params: {
-      studentUserId: studentUserId
+      studentUserId: studentUserId,
+      academicYearId: academicYearId
     }
   });
 };
@@ -29034,51 +29035,55 @@ var useDashboard = function useDashboard() {
       genderOfStudent = _useState14[0],
       setGenderOfStudent = _useState14[1];
 
+  var _useState15 = React.useState(GRAGE_DEFAULT),
+      gradeList = _useState15[0],
+      setGradeList = _useState15[1];
+
   var handleChangeFilters = function handleChangeFilters(event) {
     var _extends2;
 
     setFilter(_extends({}, filter, (_extends2 = {}, _extends2[event.target.name] = event.target.value, _extends2)));
   };
 
-  var _useState15 = React.useState([]),
-      stressData = _useState15[0],
-      setStressData = _useState15[1];
-
   var _useState16 = React.useState([]),
-      safetyData = _useState16[0],
-      setSafetyData = _useState16[1];
+      stressData = _useState16[0],
+      setStressData = _useState16[1];
 
   var _useState17 = React.useState([]),
-      preparednessData = _useState17[0],
-      setPreparednessData = _useState17[1];
+      safetyData = _useState17[0],
+      setSafetyData = _useState17[1];
 
   var _useState18 = React.useState([]),
-      successIndicatorsData = _useState18[0],
-      setSuccessIndicatorsData = _useState18[1];
+      preparednessData = _useState18[0],
+      setPreparednessData = _useState18[1];
 
   var _useState19 = React.useState([]),
-      avgQuestionLastMonth = _useState19[0],
-      setAvgQuestionLastMonth = _useState19[1];
+      successIndicatorsData = _useState19[0],
+      setSuccessIndicatorsData = _useState19[1];
 
   var _useState20 = React.useState([]),
-      activeColumnSuccessIndicators = _useState20[0],
-      setActiveColumnSuccessIndicators = _useState20[1];
+      avgQuestionLastMonth = _useState20[0],
+      setAvgQuestionLastMonth = _useState20[1];
 
   var _useState21 = React.useState([]),
-      activeColumnPreparedness = _useState21[0],
-      setActiveColumnPreparedness = _useState21[1];
+      activeColumnSuccessIndicators = _useState21[0],
+      setActiveColumnSuccessIndicators = _useState21[1];
 
   var _useState22 = React.useState([]),
-      dataConvertedOneToOne = _useState22[0],
-      setDataConvertedOneToOne = _useState22[1];
+      activeColumnPreparedness = _useState22[0],
+      setActiveColumnPreparedness = _useState22[1];
 
   var _useState23 = React.useState([]),
-      monthsOneToOne = _useState23[0],
-      setMonthsOneToOne = _useState23[1];
+      dataConvertedOneToOne = _useState23[0],
+      setDataConvertedOneToOne = _useState23[1];
 
   var _useState24 = React.useState([]),
-      dayOfWeekOneToOne = _useState24[0],
-      setDayOfWeekOneToOne = _useState24[1];
+      monthsOneToOne = _useState24[0],
+      setMonthsOneToOne = _useState24[1];
+
+  var _useState25 = React.useState([]),
+      dayOfWeekOneToOne = _useState25[0],
+      setDayOfWeekOneToOne = _useState25[1];
 
   var handleSetDataChartOneToOne = function handleSetDataChartOneToOne(data) {
     var _data$overviewQuestio;
@@ -29206,6 +29211,7 @@ var useDashboard = function useDashboard() {
       return;
     }
 
+    console.log("run out");
     setGenderOfStudent("");
     setStudentDefault(undefined);
     setFilter(_extends({}, filter, {
@@ -29217,20 +29223,11 @@ var useDashboard = function useDashboard() {
     return;
   };
 
-  var handleSaveGradeFilter = function handleSaveGradeFilter(grades) {
-    setFilter(_extends({}, filter, {
-      grade: grades
-    }));
-  };
-
   var onChangeFilters = function onChangeFilters(filterSelect) {
     setFilter(_extends({}, filter, filterSelect));
   };
 
   var handleChangeAcademicYearFilters = function handleChangeAcademicYearFilters(option) {
-    console.log({
-      option: option
-    });
     setFilter(_extends({}, filter, {
       startDate: option === null || option === void 0 ? void 0 : option.startTime,
       endDate: option === null || option === void 0 ? void 0 : option.endTime
@@ -29246,7 +29243,7 @@ var useDashboard = function useDashboard() {
       dispatch(marioCore.setLoading(true));
 
       var _temp6 = _catch(function () {
-        return Promise.resolve(apiCaller(studentUserId)).then(function (res) {
+        return Promise.resolve(apiCaller(studentUserId, filter.academicYearId)).then(function (res) {
           res && setData(res.data);
         });
       }, function (err) {
@@ -29280,9 +29277,9 @@ var useDashboard = function useDashboard() {
     getData();
   }, [filter]);
   React.useEffect(function () {
-    !!filter.studentUserId && callApiByStudentUserId(getGrades, handleSaveGradeFilter, filter.studentUserId, []);
+    !!filter.studentUserId && callApiByStudentUserId(getGrades, setGradeList, filter.studentUserId, []);
     callApi(getBandScore, setBandScore, []);
-  }, [filter.studentUserId]);
+  }, [filter.studentUserId, filter.academicYearId]);
   React.useEffect(function () {
     callApi(getAllAcademicYearApi, setAcademicYear, [], "academicyear");
   }, []);
@@ -29323,7 +29320,8 @@ var useDashboard = function useDashboard() {
     seriesLearningProgress: seriesLearningProgress,
     monthsLearningProgress: monthsLearningProgress,
     dayOfWeekLearningProgress: dayOfWeekLearningProgress,
-    avgQuestionLastMonth: avgQuestionLastMonth
+    avgQuestionLastMonth: avgQuestionLastMonth,
+    gradeList: gradeList
   };
 };
 
@@ -29353,7 +29351,8 @@ var useChartDatas = function useChartDatas() {
       seriesLearningProgress = _useDashboard.seriesLearningProgress,
       monthsLearningProgress = _useDashboard.monthsLearningProgress,
       dayOfWeekLearningProgress = _useDashboard.dayOfWeekLearningProgress,
-      avgQuestionLastMonth = _useDashboard.avgQuestionLastMonth;
+      avgQuestionLastMonth = _useDashboard.avgQuestionLastMonth,
+      gradeList = _useDashboard.gradeList;
 
   var _useState = React.useState([]),
       selectedToPrint = _useState[0],
@@ -29418,7 +29417,7 @@ var useChartDatas = function useChartDatas() {
     option: [{
       value: -1,
       label: "All"
-    }].concat(gradeOptions(filter.grade, filter.studentUserId))
+    }].concat(gradeOptions(gradeList, filter.studentUserId))
   }, {
     name: FILTER_NAME.BandScore,
     icon: "/images/star-icon.svg",
@@ -29757,7 +29756,8 @@ var SelectFilter = function SelectFilter(_ref) {
     !!onChangeFilters && onChangeFilters(_extends({}, filter, {
       startDate: moment(option === null || option === void 0 ? void 0 : option.startTime).startOf("day").valueOf(),
       endDate: moment(option === null || option === void 0 ? void 0 : option.endTime).endOf("day").valueOf(),
-      academicYearId: option === null || option === void 0 ? void 0 : option.value
+      academicYearId: option === null || option === void 0 ? void 0 : option.value,
+      grade: []
     }));
   };