mario-education 2.4.29-admin → 2.4.31-admin

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

@@ -101,8 +101,9 @@ export interface IChartComponent {
     children: JSX.Element | undefined;
 }
 export declare enum LegalGenderType {
-    Male = 0,
-    Female = 1
+    None = 0,
+    Male = 1,
+    Female = 2
 }
 export interface IDesignationsQuantity {
     name: string;

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

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from "react";
 import { PROPS_FILTERS_COMPONENT } from "../../../utils/type";
 import { TYPECHART } from "../configs/types";
 declare const useChartDatas: () => {
@@ -39,5 +39,14 @@ declare const useChartDatas: () => {
     })[];
     onChangeFilters: (filterSelect: import("../../../utils/type").IFilter) => void;
     initialTypeChart: (TYPECHART.AREA | TYPECHART)[];
+    handleSelectToPrint: (checked: boolean, data: any, chartType: any) => void;
+    checkSelectedItem: (id: string) => boolean;
+    selectedToPrint: any;
+    setSelectedToPrint: React.Dispatch<any>;
+    chartOneToOneData: import("../configs/types").IColumnChartAndPercent;
+    topLearningStrategies: import("../configs/types").IlearningStrategies;
+    chartClassReflection: import("../configs/types").IColumnChartAndPercent;
+    chartConference: import("../configs/types").IColumnChartAndPercent;
+    safety: import("../configs/types").IColumnChartAndPercent;
 };
 export default useChartDatas;

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

@@ -19,7 +19,6 @@ declare const useDashboard: () => {
     studentByGender: IStudentByGender;
     safety: IColumnChartAndPercent;
     topSkill: never[];
-    onFilter: () => void;
     handleChangeFilters: (event: any) => void;
     bandScore: BAND_SCORE[];
     user: any;
@@ -29,10 +28,6 @@ declare const useDashboard: () => {
     setGenderOfStudent: import("react").Dispatch<import("react").SetStateAction<string>>;
     handleFilterStudent: (option: any) => void;
     handleFilterTeacher: (option: any) => void;
-    handleSelectToPrint: (checked: boolean, data: any, chartType: any) => void;
-    checkSelectedItem: (id: string) => boolean;
-    selectedToPrint: any;
-    setSelectedToPrint: import("react").Dispatch<any>;
     onChangeFilters: (filterSelect: IFilter) => void;
     handleActiveColumnOneToOne: (index: any) => void;
     seriesOneToOne: ISeries[];

package/dist/index.js

@@ -19688,8 +19688,9 @@ var CompareTeacher = function CompareTeacher() {
 var LegalGenderType;
 
 (function (LegalGenderType) {
-  LegalGenderType[LegalGenderType["Male"] = 0] = "Male";
-  LegalGenderType[LegalGenderType["Female"] = 1] = "Female";
+  LegalGenderType[LegalGenderType["None"] = 0] = "None";
+  LegalGenderType[LegalGenderType["Male"] = 1] = "Male";
+  LegalGenderType[LegalGenderType["Female"] = 2] = "Female";
 })(LegalGenderType || (LegalGenderType = {}));
 
 var MtssType;
@@ -20019,13 +20020,13 @@ var COLOR_CHART_AND_PERCENTS = ["#40D2CC", "#78B6E2", "#FFB04F", "#CE4A49", "#1C
 var COLOR_CHART_BUBBLE = ["#53ACF5", "#9DD889", "#FFB04F", "#E15454", "#9747FF"];
 var PERCENT = [100, 80, 60, 40, 20, 0, -20, -40, -60, -80, -100];
 var GENDER_OPTION = [{
-  value: 2,
+  value: -1,
   label: "All"
 }, {
-  value: 0,
+  value: LegalGenderType.Male,
   label: "Male"
 }, {
-  value: 1,
+  value: LegalGenderType.Female,
   label: "Female"
 }];
 
@@ -27295,52 +27296,6 @@ var useDashboard = function useDashboard() {
       return newAvgSafety[idx];
     }));
   }, [safety === null || safety === void 0 ? void 0 : safety.overviewQuestionChoice]);
-
-  var _useState32 = React.useState([]),
-      selectedToPrint = _useState32[0],
-      setSelectedToPrint = _useState32[1];
-
-  var handleSelectToPrint = function handleSelectToPrint(checked, data, chartType) {
-    var updateSelectToPrint = [].concat(selectedToPrint);
-    var foundItem = updateSelectToPrint === null || updateSelectToPrint === void 0 ? void 0 : updateSelectToPrint.find(function (e) {
-      return e.identification == data.id;
-    });
-
-    if (checked) {
-      if (!!data.id && !foundItem) {
-        updateSelectToPrint.push({
-          id: data.id,
-          identification: data.id,
-          label: data.label,
-          children: data.children,
-          chartType: chartType
-        });
-      }
-
-      if (!!data && foundItem && foundItem.id == null) {
-        var itemIndex = updateSelectToPrint.indexOf(foundItem);
-        updateSelectToPrint[itemIndex].id = data.id;
-        updateSelectToPrint[itemIndex].children = data.children;
-      }
-    } else {
-      var _itemIndex = updateSelectToPrint.indexOf(foundItem);
-
-      updateSelectToPrint[_itemIndex].id = null;
-      updateSelectToPrint[_itemIndex].children = null;
-    }
-
-    setSelectedToPrint(updateSelectToPrint);
-  };
-
-  var checkSelectedItem = function checkSelectedItem(id) {
-    for (var _iterator = _createForOfIteratorHelperLoose(selectedToPrint), _step; !(_step = _iterator()).done;) {
-      var item = _step.value;
-      if (item.id === id) return true;
-    }
-
-    return false;
-  };
-
   var callApi = React.useCallback(function (apiCaller, setData, defaultData, type) {
     try {
       var _temp2 = _catch(function () {
@@ -27384,7 +27339,7 @@ var useDashboard = function useDashboard() {
       setGenderOfStudent(option === null || option === void 0 ? void 0 : option.gender);
       setStudentDefault(option);
       setFilter(_extends({}, filter, {
-        gender: [LegalGenderType.Male, LegalGenderType.Female],
+        gender: [LegalGenderType.None, LegalGenderType.Male, LegalGenderType.Female],
         teacherId: undefined,
         studentId: option ? option === null || option === void 0 ? void 0 : option.studentId : undefined,
         studentUserId: option === null || option === void 0 ? void 0 : option.id
@@ -27395,7 +27350,7 @@ var useDashboard = function useDashboard() {
     setGenderOfStudent("");
     setStudentDefault(undefined);
     setFilter(_extends({}, filter, {
-      gender: [LegalGenderType.Male, LegalGenderType.Female],
+      gender: [LegalGenderType.None, LegalGenderType.Male, LegalGenderType.Female],
       teacherId: undefined,
       grade: [],
       studentId: undefined,
@@ -27453,11 +27408,6 @@ var useDashboard = function useDashboard() {
       return Promise.reject(e);
     }
   }, [filter]);
-
-  var onFilter = function onFilter() {
-    getData();
-  };
-
   React.useEffect(function () {
     getData();
   }, [filter]);
@@ -27483,7 +27433,6 @@ var useDashboard = function useDashboard() {
     studentByGender: studentByGender,
     safety: safety,
     topSkill: topSkill,
-    onFilter: onFilter,
     handleChangeFilters: handleChangeFilters,
     bandScore: bandScore,
     user: user,
@@ -27493,10 +27442,6 @@ var useDashboard = function useDashboard() {
     setGenderOfStudent: setGenderOfStudent,
     handleFilterStudent: handleFilterStudent,
     handleFilterTeacher: handleFilterTeacher,
-    handleSelectToPrint: handleSelectToPrint,
-    checkSelectedItem: checkSelectedItem,
-    selectedToPrint: selectedToPrint,
-    setSelectedToPrint: setSelectedToPrint,
     onChangeFilters: onChangeFilters,
     handleActiveColumnOneToOne: handleActiveColumnOneToOne,
     seriesOneToOne: seriesOneToOne,
@@ -27564,7 +27509,56 @@ var useChartDatas = function useChartDatas() {
       avgSafety = _useDashboard.avgSafety,
       monthsSafety = _useDashboard.monthsSafety,
       dataConvertedSafety = _useDashboard.dataConvertedSafety,
-      activeColumnSafety = _useDashboard.activeColumnSafety;
+      activeColumnSafety = _useDashboard.activeColumnSafety,
+      chartOneToOneData = _useDashboard.chartOneToOneData,
+      chartClassReflection = _useDashboard.chartClassReflection,
+      chartConference = _useDashboard.chartConference,
+      safety = _useDashboard.safety;
+
+  var _useState = React.useState([]),
+      selectedToPrint = _useState[0],
+      setSelectedToPrint = _useState[1];
+
+  var handleSelectToPrint = function handleSelectToPrint(checked, data, chartType) {
+    var updateSelectToPrint = [].concat(selectedToPrint);
+    var foundItem = updateSelectToPrint === null || updateSelectToPrint === void 0 ? void 0 : updateSelectToPrint.find(function (e) {
+      return e.identification == data.id;
+    });
+
+    if (checked) {
+      if (!!data.id && !foundItem) {
+        updateSelectToPrint.push({
+          id: data.id,
+          identification: data.id,
+          label: data.label,
+          children: data.children,
+          chartType: chartType
+        });
+      }
+
+      if (!!data && foundItem && foundItem.id == null) {
+        var itemIndex = updateSelectToPrint.indexOf(foundItem);
+        updateSelectToPrint[itemIndex].id = data.id;
+        updateSelectToPrint[itemIndex].children = data.children;
+      }
+    } else {
+      var _itemIndex = updateSelectToPrint.indexOf(foundItem);
+
+      updateSelectToPrint[_itemIndex].id = null;
+      updateSelectToPrint[_itemIndex].children = null;
+    }
+
+    setSelectedToPrint(updateSelectToPrint);
+  };
+
+  var checkSelectedItem = function checkSelectedItem(id) {
+    for (var _iterator = _createForOfIteratorHelperLoose(selectedToPrint), _step; !(_step = _iterator()).done;) {
+      var item = _step.value;
+      if (item.id === id) return true;
+    }
+
+    return false;
+  };
 
   var LIST_FILTERS_LEFT = [{
     name: FILTER_NAME.Calendar,
@@ -27788,7 +27782,16 @@ var useChartDatas = function useChartDatas() {
     LIST_FILTERS_RIGHT: LIST_FILTERS_RIGHT,
     totalCardData: totalCardData,
     onChangeFilters: onChangeFilters,
-    initialTypeChart: initialTypeChart
+    initialTypeChart: initialTypeChart,
+    handleSelectToPrint: handleSelectToPrint,
+    checkSelectedItem: checkSelectedItem,
+    selectedToPrint: selectedToPrint,
+    setSelectedToPrint: setSelectedToPrint,
+    chartOneToOneData: chartOneToOneData,
+    topLearningStrategies: topLearningStrategies,
+    chartClassReflection: chartClassReflection,
+    chartConference: chartConference,
+    safety: safety
   };
 };
 
@@ -27955,7 +27958,7 @@ var SelectFilter = function SelectFilter(_ref) {
       label: "This Year"
     },
     gender: {
-      value: 2,
+      value: 0,
       label: "All"
     },
     grade: -1,
@@ -27990,8 +27993,9 @@ var SelectFilter = function SelectFilter(_ref) {
   };
 
   var onChangeGender = function onChangeGender(item) {
+    console.log("item", item);
     !!onChangeFilters && onChangeFilters({
-      gender: item.value === 2 ? [0, 1] : [item.value]
+      gender: item.value === -1 ? [LegalGenderType.None, LegalGenderType.Male, LegalGenderType.Female] : [item.value]
     });
     setLabelBox(_extends({}, labelBox, {
       gender: {
@@ -28084,7 +28088,7 @@ var SelectFilter = function SelectFilter(_ref) {
         alt: labelBox.gender.label
       }), React__default.createElement("p", {
         className: styles["color-filter"] + " my-0 mx-2"
-      }, labelBox.gender.value === 2 ? "Gender" : labelBox.gender.label), !isOpenCollapse ? React__default.createElement(fi.FiChevronDown, null) : React__default.createElement(fi.FiChevronUp, null)), React__default.createElement("div", {
+      }, labelBox.gender.value === -1 ? "Gender" : labelBox.gender.label), !isOpenCollapse ? React__default.createElement(fi.FiChevronDown, null) : React__default.createElement(fi.FiChevronUp, null)), React__default.createElement("div", {
         className: styles["select-filter-component"] + " " + (!isOpenCollapse && "" + styles["hidden"])
       }, React__default.createElement(reactstrap.Form, {
         className: "" + styles["box-select"]
@@ -28289,16 +28293,13 @@ var headerLogo = "../images/logoV1-2.png";
 var DashboardToPDF = function DashboardToPDF(props) {
   var selectedToPDF = props.selectedToPDF,
       initialData = props.initialData,
-      typeChartList = props.typeChartList;
+      typeChartList = props.typeChartList,
+      chartOneToOneData = props.chartOneToOneData,
+      topLearningStrategies = props.topLearningStrategies,
+      chartClassReflection = props.chartClassReflection,
+      chartConference = props.chartConference,
+      safety = props.safety;
   var dispatch = reactRedux.useDispatch();
-
-  var _useDashboard = useDashboard(),
-      chartOneToOneData = _useDashboard.chartOneToOneData,
-      topLearningStrategies = _useDashboard.topLearningStrategies,
-      chartClassReflection = _useDashboard.chartClassReflection,
-      chartConference = _useDashboard.chartConference,
-      safety = _useDashboard.safety;
-
   var chartHightImpactLearningStrategie = selectedToPDF.find(function (i) {
     return i.id === "high_impact_learning_strategie";
   });
@@ -28892,7 +28893,7 @@ var DashboardToPDF = function DashboardToPDF(props) {
                       }
                     }
 
-                    doc.addImage(canvas.toDataURL("image/png", 1.0), 15, line + 25, 420, 170);
+                    doc.addImage(canvas.toDataURL("image/png", 1.0), 15, line + 120, 420, 170);
                   });
                 });
               }
@@ -29065,7 +29066,16 @@ var Dashboard = function Dashboard() {
       LIST_FILTERS_RIGHT = _useChartDatas.LIST_FILTERS_RIGHT,
       totalCardData = _useChartDatas.totalCardData,
       onChangeFilters = _useChartDatas.onChangeFilters,
-      initialTypeChart = _useChartDatas.initialTypeChart;
+      initialTypeChart = _useChartDatas.initialTypeChart,
+      handleSelectToPrint = _useChartDatas.handleSelectToPrint,
+      checkSelectedItem = _useChartDatas.checkSelectedItem,
+      selectedToPrint = _useChartDatas.selectedToPrint,
+      setSelectedToPrint = _useChartDatas.setSelectedToPrint,
+      chartOneToOneData = _useChartDatas.chartOneToOneData,
+      topLearningStrategies = _useChartDatas.topLearningStrategies,
+      chartClassReflection = _useChartDatas.chartClassReflection,
+      chartConference = _useChartDatas.chartConference,
+      safety = _useChartDatas.safety;
 
   var _useBehavior = useBehavior(initialTypeChart),
       chartIsOpened = _useBehavior.chartIsOpened,
@@ -29075,12 +29085,6 @@ var Dashboard = function Dashboard() {
       teacherUserId = _useBehavior.teacherUserId,
       changeCurrentTeacherUserId = _useBehavior.changeCurrentTeacherUserId;
 
-  var _useDashboard = useDashboard(),
-      handleSelectToPrint = _useDashboard.handleSelectToPrint,
-      checkSelectedItem = _useDashboard.checkSelectedItem,
-      selectedToPrint = _useDashboard.selectedToPrint,
-      setSelectedToPrint = _useDashboard.setSelectedToPrint;
-
   var _useState = React.useState(false),
       modal = _useState[0],
       setModal = _useState[1];
@@ -29125,7 +29129,12 @@ var Dashboard = function Dashboard() {
   }, "Cancel"), React__default.createElement(DashboardToPDF, {
     selectedToPDF: selectedToPrint,
     initialData: chartDashBoards,
-    typeChartList: typeChartList
+    typeChartList: typeChartList,
+    chartOneToOneData: chartOneToOneData,
+    topLearningStrategies: topLearningStrategies,
+    chartClassReflection: chartClassReflection,
+    chartConference: chartConference,
+    safety: safety
   }))), React__default.createElement("div", {
     className: "d-flex align-items-center justify-content-between"
   }, React__default.createElement("div", {