mario-education 2.4.248-release → 2.4.249-release

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

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { DashboardFilter, IActivityCircle, IlearningStrategies, IReadinessToLearning, IStudentByGrade, IStudentBySpecialNeed, IsyntheticFriendCircle, BAND_SCORE, IStudentByAge, IStudentByGender, IDashboardToTalStudent, IQuestionResponseLastMonth, IStudentPressure, IOverallReadinessToLearn } from "../configs/types";
+import { DashboardFilter, IActivityCircle, IlearningStrategies, IReadinessToLearning, IStudentByGrade, IStudentBySpecialNeed, IsyntheticFriendCircle, BAND_SCORE, IStudentByAge, IStudentByGender, IDashboardToTalStudent, IQuestionResponseLastMonth, IStudentPressure, IOverallReadinessToLearn, ILabelBox } from "../configs/types";
 import { IFilter, Student, ISeries } from "../../../utils/type";
 declare const useDashboard: () => {
     setFilter: import("react").Dispatch<import("react").SetStateAction<DashboardFilter>>;
@@ -46,5 +46,7 @@ declare const useDashboard: () => {
     dayOfWeekConference: string[];
     handleActiveColumnConference: (index: number) => void;
     activeColumnConference: boolean[];
+    labelBox: ILabelBox;
+    setLabelBox: import("react").Dispatch<import("react").SetStateAction<ILabelBox>>;
 };
 export default useDashboard;

package/dist/index.js

@@ -29555,65 +29555,82 @@ var useDashboard = function useDashboard() {
       filter = _useState[0],
       setFilter = _useState[1];
 
-  var _useState2 = React.useState(INITIAl_STUDENT_DASHBOARD),
-      listTotalTime = _useState2[0],
-      setListTotalTime = _useState2[1];
+  var _useState2 = React.useState({
+    calendar: {
+      value: FILTER_YEAR.THIS_YEAR,
+      label: "This Year"
+    },
+    gender: {
+      value: 0,
+      label: "All"
+    },
+    grade: -1,
+    bandScore: -1,
+    favoriteSurvey: -1,
+    academicYearId: -1
+  }),
+      labelBox = _useState2[0],
+      setLabelBox = _useState2[1];
 
-  var _useState3 = React.useState([]),
-      readinessToLearning = _useState3[0],
-      setReadinessToLearning = _useState3[1];
+  var _useState3 = React.useState(INITIAl_STUDENT_DASHBOARD),
+      listTotalTime = _useState3[0],
+      setListTotalTime = _useState3[1];
 
-  var _useState4 = React.useState(LEARNING_STRATEGY_INIT),
-      topLearningStrategies = _useState4[0],
-      setTopLearningStrategies = _useState4[1];
+  var _useState4 = React.useState([]),
+      readinessToLearning = _useState4[0],
+      setReadinessToLearning = _useState4[1];
 
-  var _useState5 = React.useState([]),
-      studentByGrade = _useState5[0],
-      setStudentByGrade = _useState5[1];
+  var _useState5 = React.useState(LEARNING_STRATEGY_INIT),
+      topLearningStrategies = _useState5[0],
+      setTopLearningStrategies = _useState5[1];
 
-  var _useState6 = React.useState(),
-      friendCircles = _useState6[0],
-      setFriendCircles = _useState6[1];
+  var _useState6 = React.useState([]),
+      studentByGrade = _useState6[0],
+      setStudentByGrade = _useState6[1];
 
   var _useState7 = React.useState(),
-      activityCircles = _useState7[0],
-      setActivityCircles = _useState7[1];
+      friendCircles = _useState7[0],
+      setFriendCircles = _useState7[1];
 
-  var _useState8 = React.useState([]),
-      studentBySpecialNeed = _useState8[0],
-      setStudentBySpecialNeed = _useState8[1];
+  var _useState8 = React.useState(),
+      activityCircles = _useState8[0],
+      setActivityCircles = _useState8[1];
 
-  var _useState9 = React.useState(INITIAL_AGE_OF_STUDENT),
-      studentByAge = _useState9[0],
-      setStudentByAge = _useState9[1];
+  var _useState9 = React.useState([]),
+      studentBySpecialNeed = _useState9[0],
+      setStudentBySpecialNeed = _useState9[1];
 
-  var _useState10 = React.useState(INITIAL_STUDENT_BY_GENDER),
-      studentByGender = _useState10[0],
-      setStudentByGender = _useState10[1];
+  var _useState10 = React.useState(INITIAL_AGE_OF_STUDENT),
+      studentByAge = _useState10[0],
+      setStudentByAge = _useState10[1];
 
-  var _useState11 = React.useState([]),
-      bandScore = _useState11[0],
-      setBandScore = _useState11[1];
+  var _useState11 = React.useState(INITIAL_STUDENT_BY_GENDER),
+      studentByGender = _useState11[0],
+      setStudentByGender = _useState11[1];
 
   var _useState12 = React.useState([]),
-      academicYear = _useState12[0],
-      setAcademicYear = _useState12[1];
+      bandScore = _useState12[0],
+      setBandScore = _useState12[1];
+
+  var _useState13 = React.useState([]),
+      academicYear = _useState13[0],
+      setAcademicYear = _useState13[1];
 
   var user = reactRedux.useSelector(function (state) {
     return state.common.user;
   });
 
-  var _useState13 = React.useState(undefined),
-      studentDefault = _useState13[0],
-      setStudentDefault = _useState13[1];
+  var _useState14 = React.useState(undefined),
+      studentDefault = _useState14[0],
+      setStudentDefault = _useState14[1];
 
-  var _useState14 = React.useState(""),
-      genderOfStudent = _useState14[0],
-      setGenderOfStudent = _useState14[1];
+  var _useState15 = React.useState(""),
+      genderOfStudent = _useState15[0],
+      setGenderOfStudent = _useState15[1];
 
-  var _useState15 = React.useState(GRAGE_DEFAULT),
-      gradeList = _useState15[0],
-      setGradeList = _useState15[1];
+  var _useState16 = React.useState(GRAGE_DEFAULT),
+      gradeList = _useState16[0],
+      setGradeList = _useState16[1];
 
   var handleChangeFilters = function handleChangeFilters(event) {
     var _extends2;
@@ -29621,45 +29638,45 @@ var useDashboard = function useDashboard() {
     setFilter(_extends({}, filter, (_extends2 = {}, _extends2[event.target.name] = event.target.value, _extends2)));
   };
 
-  var _useState16 = React.useState([]),
-      stressData = _useState16[0],
-      setStressData = _useState16[1];
-
   var _useState17 = React.useState([]),
-      safetyData = _useState17[0],
-      setSafetyData = _useState17[1];
+      stressData = _useState17[0],
+      setStressData = _useState17[1];
 
   var _useState18 = React.useState([]),
-      preparednessData = _useState18[0],
-      setPreparednessData = _useState18[1];
+      safetyData = _useState18[0],
+      setSafetyData = _useState18[1];
 
   var _useState19 = React.useState([]),
-      successIndicatorsData = _useState19[0],
-      setSuccessIndicatorsData = _useState19[1];
+      preparednessData = _useState19[0],
+      setPreparednessData = _useState19[1];
 
   var _useState20 = React.useState([]),
-      avgQuestionLastMonth = _useState20[0],
-      setAvgQuestionLastMonth = _useState20[1];
+      successIndicatorsData = _useState20[0],
+      setSuccessIndicatorsData = _useState20[1];
 
   var _useState21 = React.useState([]),
-      activeColumnSuccessIndicators = _useState21[0],
-      setActiveColumnSuccessIndicators = _useState21[1];
+      avgQuestionLastMonth = _useState21[0],
+      setAvgQuestionLastMonth = _useState21[1];
 
   var _useState22 = React.useState([]),
-      activeColumnPreparedness = _useState22[0],
-      setActiveColumnPreparedness = _useState22[1];
+      activeColumnSuccessIndicators = _useState22[0],
+      setActiveColumnSuccessIndicators = _useState22[1];
 
   var _useState23 = React.useState([]),
-      dataConvertedOneToOne = _useState23[0],
-      setDataConvertedOneToOne = _useState23[1];
+      activeColumnPreparedness = _useState23[0],
+      setActiveColumnPreparedness = _useState23[1];
 
   var _useState24 = React.useState([]),
-      monthsOneToOne = _useState24[0],
-      setMonthsOneToOne = _useState24[1];
+      dataConvertedOneToOne = _useState24[0],
+      setDataConvertedOneToOne = _useState24[1];
 
   var _useState25 = React.useState([]),
-      dayOfWeekOneToOne = _useState25[0],
-      setDayOfWeekOneToOne = _useState25[1];
+      monthsOneToOne = _useState25[0],
+      setMonthsOneToOne = _useState25[1];
+
+  var _useState26 = React.useState([]),
+      dayOfWeekOneToOne = _useState26[0],
+      setDayOfWeekOneToOne = _useState26[1];
 
   var handleSetDataChartOneToOne = function handleSetDataChartOneToOne(data) {
     var _data$overviewQuestio;
@@ -29737,37 +29754,37 @@ var useDashboard = function useDashboard() {
     }
   };
 
-  var _useState26 = React.useState(initStudentPressure),
-      studentPressure = _useState26[0],
-      setStudentPressure = _useState26[1];
-
-  var _useState27 = React.useState(INITIAL_OVERALL_READY_TO_LEARN),
-      dataOverallReadyToLearn = _useState27[0],
-      setDataOverallReadyToLearn = _useState27[1];
+  var _useState27 = React.useState(initStudentPressure),
+      studentPressure = _useState27[0],
+      setStudentPressure = _useState27[1];
 
-  var _useState28 = React.useState([]),
-      seriesConference = _useState28[0],
-      setSeriesConference = _useState28[1];
+  var _useState28 = React.useState(INITIAL_OVERALL_READY_TO_LEARN),
+      dataOverallReadyToLearn = _useState28[0],
+      setDataOverallReadyToLearn = _useState28[1];
 
   var _useState29 = React.useState([]),
-      activeColumnConference = _useState29[0],
-      setActiveColumnConference = _useState29[1];
+      seriesConference = _useState29[0],
+      setSeriesConference = _useState29[1];
 
   var _useState30 = React.useState([]),
-      avgConferenceLastMonth = _useState30[0],
-      setAvgConferenceLastMonth = _useState30[1];
+      activeColumnConference = _useState30[0],
+      setActiveColumnConference = _useState30[1];
 
   var _useState31 = React.useState([]),
-      dataConvertedConference = _useState31[0],
-      setDataConvertedConference = _useState31[1];
+      avgConferenceLastMonth = _useState31[0],
+      setAvgConferenceLastMonth = _useState31[1];
 
   var _useState32 = React.useState([]),
-      monthsConference = _useState32[0],
-      setMonthsConference = _useState32[1];
+      dataConvertedConference = _useState32[0],
+      setDataConvertedConference = _useState32[1];
 
   var _useState33 = React.useState([]),
-      dayOfWeekConference = _useState33[0],
-      setDayOfWeekConference = _useState33[1];
+      monthsConference = _useState33[0],
+      setMonthsConference = _useState33[1];
+
+  var _useState34 = React.useState([]),
+      dayOfWeekConference = _useState34[0],
+      setDayOfWeekConference = _useState34[1];
 
   var handleSetDataChartConference = function handleSetDataChartConference(data) {
     var _data$overviewQuestio2;
@@ -29870,6 +29887,24 @@ var useDashboard = function useDashboard() {
     return;
   };
 
+  var handleChangeAcademicYears = function handleChangeAcademicYears(items) {
+    setAcademicYear(items || []);
+    var currentAcademic = items === null || items === void 0 ? void 0 : items.find(function (r) {
+      return r.isCurrent;
+    });
+
+    if (!!currentAcademic) {
+      setLabelBox(_extends({}, labelBox, {
+        academicYearId: currentAcademic.id
+      }));
+      onChangeFilters(_extends({}, filter, {
+        startDate: moment(currentAcademic === null || currentAcademic === void 0 ? void 0 : currentAcademic.startTime).startOf("day").valueOf(),
+        endDate: moment(currentAcademic === null || currentAcademic === void 0 ? void 0 : currentAcademic.endTime).endOf("day").valueOf(),
+        academicYearId: currentAcademic === null || currentAcademic === void 0 ? void 0 : currentAcademic.id
+      }));
+    }
+  };
+
   var onChangeFilters = function onChangeFilters(filterSelect) {
     setFilter(_extends({}, filter, filterSelect));
   };
@@ -29912,10 +29947,17 @@ var useDashboard = function useDashboard() {
   var getData = React.useCallback(function () {
     try {
       document.title = TITLE$y;
-      dispatch(marioCore.setLoading(true));
-      return Promise.resolve(Promise.any([callApi(getAllTotalTime, setListTotalTime, []), callApi(getReadinessToLearning, setReadinessToLearning, []), callApi(getTopLearningStrategies, setTopLearningStrategies, []), callApi(getStudentByGrade, setStudentByGrade, []), callApi(getOverviewQuestionChart, handleSetDataChartOneToOne, [], "OneToOne"), callApi(getOverviewQuestionChart, handleSetDataChartConference, [], "Conference"), callApi(getFriendCircleItems, setFriendCircles, INITIAL_BEST_FRIENDS), callApi(getActivityCircleItems, setActivityCircles, INITIAL_ACTIVITY_FRIENDS), callApi(getStudentBySpecialNeed, setStudentBySpecialNeed, []), callApi(getStudentByAge, setStudentByAge, INITIAL_AGE_OF_STUDENT), callApi(getStudentByGender, setStudentByGender, []), callApi(getStudentPressure, setStudentPressure, initStudentPressure), callApi(getOverallReadinessToLearn, setDataOverallReadyToLearn, INITIAL_OVERALL_READY_TO_LEARN)])).then(function () {
-        dispatch(marioCore.setLoading(false));
-      });
+
+      var _temp8 = function () {
+        if (!!academicYear && academicYear.length > 0) {
+          dispatch(marioCore.setLoading(true));
+          return Promise.resolve(Promise.any([callApi(getAllTotalTime, setListTotalTime, []), callApi(getReadinessToLearning, setReadinessToLearning, []), callApi(getTopLearningStrategies, setTopLearningStrategies, []), callApi(getStudentByGrade, setStudentByGrade, []), callApi(getOverviewQuestionChart, handleSetDataChartOneToOne, [], "OneToOne"), callApi(getOverviewQuestionChart, handleSetDataChartConference, [], "Conference"), callApi(getFriendCircleItems, setFriendCircles, INITIAL_BEST_FRIENDS), callApi(getActivityCircleItems, setActivityCircles, INITIAL_ACTIVITY_FRIENDS), callApi(getStudentBySpecialNeed, setStudentBySpecialNeed, []), callApi(getStudentByAge, setStudentByAge, INITIAL_AGE_OF_STUDENT), callApi(getStudentByGender, setStudentByGender, []), callApi(getStudentPressure, setStudentPressure, initStudentPressure), callApi(getOverallReadinessToLearn, setDataOverallReadyToLearn, INITIAL_OVERALL_READY_TO_LEARN)])).then(function () {
+            dispatch(marioCore.setLoading(false));
+          });
+        }
+      }();
+
+      return Promise.resolve(_temp8 && _temp8.then ? _temp8.then(function () {}) : void 0);
     } catch (e) {
       return Promise.reject(e);
     }
@@ -29928,7 +29970,7 @@ var useDashboard = function useDashboard() {
     callApi(getBandScore, setBandScore, []);
   }, [filter.studentUserId, filter.academicYearId]);
   React.useEffect(function () {
-    callApi(getAllAcademicYearApi, setAcademicYear, [], "academicyear");
+    callApi(getAllAcademicYearApi, handleChangeAcademicYears, [], "academicyear");
   }, []);
   return {
     setFilter: setFilter,
@@ -29974,7 +30016,9 @@ var useDashboard = function useDashboard() {
     monthsConference: monthsConference,
     dayOfWeekConference: dayOfWeekConference,
     handleActiveColumnConference: handleActiveColumnConference,
-    activeColumnConference: activeColumnConference
+    activeColumnConference: activeColumnConference,
+    labelBox: labelBox,
+    setLabelBox: setLabelBox
   };
 };
 
@@ -29997,6 +30041,8 @@ var useChartDatas = function useChartDatas() {
       monthsOneToOne = _useDashboard.monthsOneToOne,
       studentPressure = _useDashboard.studentPressure,
       dataOverallReadyToLearn = _useDashboard.dataOverallReadyToLearn,
+      labelBox = _useDashboard.labelBox,
+      setLabelBox = _useDashboard.setLabelBox,
       dayOfWeekOneToOne = _useDashboard.dayOfWeekOneToOne,
       successIndicatorsData = _useDashboard.successIndicatorsData,
       activeColumnSuccessIndicators = _useDashboard.activeColumnSuccessIndicators,
@@ -30024,23 +30070,6 @@ var useChartDatas = function useChartDatas() {
       selectedToPrint = _useState[0],
       setSelectedToPrint = _useState[1];
 
-  var _useState2 = React.useState({
-    calendar: {
-      value: FILTER_YEAR.THIS_YEAR,
-      label: "This Year"
-    },
-    gender: {
-      value: 0,
-      label: "All"
-    },
-    grade: -1,
-    bandScore: -1,
-    favoriteSurvey: -1,
-    academicYearId: -1
-  }),
-      labelBox = _useState2[0],
-      setLabelBox = _useState2[1];
-
   var handleSelectToPrint = function handleSelectToPrint(chartName) {
     var _updateSelectToPrint;
 
@@ -30475,7 +30504,6 @@ var SelectFilter = function SelectFilter(_ref) {
       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,
-      grade: [],
       optionDate: ""
     }));
   };