mario-education 2.4.46-admin → 2.4.49-admin

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

@@ -1,4 +1,5 @@
 /// <reference types="react" />
 import { PROPS_FILTERS_COMPONENT } from "../../utils/type";
+import "react-datepicker/dist/react-datepicker.css";
 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/Dashboard/configs/utils.d.ts

@@ -97,7 +97,7 @@ export declare const studentByGradeConvert: (newData: IStudentByGrade[]) => {
 }[];
 export declare const findTotalStudentByGrade: (data: IStudentByGrade[]) => number;
 export declare const getConvertMinuteToHour: (timeSecond: any) => string;
-export declare const readinesToLearnoptions: (seriesName: string[]) => ApexOptions;
+export declare const readinesToLearnoptions: (seriesName: string[], data: any) => ApexOptions;
 export declare const convertDataToSeriesBullderChart: (data: IReadinessToLearning[]) => {
     name: string;
     data: import("react").ReactText[][];

package/dist/MarioFramework.Education/ClientApp/src/containers/QuestionBank/configs/questionDetailSchema.d.ts

@@ -4,8 +4,8 @@ declare const schema: import("yup/lib/object").OptionalObjectSchema<{
     type: import("yup/lib/string").RequiredStringSchema<string | undefined, Record<string, any>>;
     categoryId: import("yup/lib/number").RequiredNumberSchema<number | undefined, Record<string, any>>;
     explainAnswer: yup.StringSchema<string | undefined, Record<string, any>, string | undefined>;
-    fromLabel: yup.StringSchema<string | null | undefined, Record<string, any>, string | null | undefined>;
-    toLabel: yup.StringSchema<string | null | undefined, Record<string, any>, string | null | undefined>;
+    fromLabel: yup.StringSchema<import("yup/lib/types").Maybe<string>, Record<string, any>, import("yup/lib/types").Maybe<string>>;
+    toLabel: yup.StringSchema<import("yup/lib/types").Maybe<string>, Record<string, any>, import("yup/lib/types").Maybe<string>>;
     numberOfStars: yup.NumberSchema<number | null | undefined, Record<string, any>, number | null | undefined>;
     answers: import("yup/lib/array").OptionalArraySchema<yup.AnySchema<any, any, any>, any, any[] | undefined>;
     isDefaultQuestion: yup.BooleanSchema<boolean | undefined, Record<string, any>, boolean | undefined>;
@@ -17,8 +17,8 @@ declare const schema: import("yup/lib/object").OptionalObjectSchema<{
     type: import("yup/lib/string").RequiredStringSchema<string | undefined, Record<string, any>>;
     categoryId: import("yup/lib/number").RequiredNumberSchema<number | undefined, Record<string, any>>;
     explainAnswer: yup.StringSchema<string | undefined, Record<string, any>, string | undefined>;
-    fromLabel: yup.StringSchema<string | null | undefined, Record<string, any>, string | null | undefined>;
-    toLabel: yup.StringSchema<string | null | undefined, Record<string, any>, string | null | undefined>;
+    fromLabel: yup.StringSchema<import("yup/lib/types").Maybe<string>, Record<string, any>, import("yup/lib/types").Maybe<string>>;
+    toLabel: yup.StringSchema<import("yup/lib/types").Maybe<string>, Record<string, any>, import("yup/lib/types").Maybe<string>>;
     numberOfStars: yup.NumberSchema<number | null | undefined, Record<string, any>, number | null | undefined>;
     answers: import("yup/lib/array").OptionalArraySchema<yup.AnySchema<any, any, any>, any, any[] | undefined>;
     isDefaultQuestion: yup.BooleanSchema<boolean | undefined, Record<string, any>, boolean | undefined>;

package/dist/index.css

@@ -182,7 +182,7 @@ tbody._b-AXV tr {
 
 ._I8kqz {
     position: absolute;
-    z-index: -999;
+    z-index: 999;
 }
 ._3DVMZ {
   display: flex;

package/dist/index.js

@@ -21,8 +21,7 @@ var fa = require('react-icons/fa');
 var tinymceReact = require('@tinymce/tinymce-react');
 var Chart = _interopDefault(require('react-apexcharts'));
 var fi = require('react-icons/fi');
-var pickers = require('@material-ui/pickers');
-var MomentUtils = _interopDefault(require('@date-io/moment'));
+require('react-datepicker/dist/react-datepicker.css');
 var jsPDF = _interopDefault(require('jspdf'));
 var html2canvas = _interopDefault(require('html2canvas'));
 
@@ -26118,12 +26117,38 @@ var getConvertMinuteToHour = function getConvertMinuteToHour(timeSecond) {
 
   return hTime;
 };
-var readinesToLearnoptions = function readinesToLearnoptions(seriesName) {
+var readinesToLearnoptions = function readinesToLearnoptions(seriesName, data) {
+  var history = reactRouterDom.useHistory();
+  var listStudentWithId = [];
+  data === null || data === void 0 ? void 0 : data.forEach(function (element) {
+    var _element$studentPerce;
+
+    element === null || element === void 0 ? void 0 : (_element$studentPerce = element.studentPercentQuestion) === null || _element$studentPerce === void 0 ? void 0 : _element$studentPerce.forEach(function (item) {
+      if (!(listStudentWithId !== null && listStudentWithId !== void 0 && listStudentWithId.map(function (i) {
+        return i === null || i === void 0 ? void 0 : i.studentId;
+      }).includes(item.studentId))) listStudentWithId.push({
+        studentName: item.studentName,
+        studentId: item.studentId
+      });
+    });
+  });
   return {
     chart: {
       height: 450,
       toolbar: {
         show: false
+      },
+      events: {
+        markerClick: function markerClick(_e, _chart, options) {
+          var _listStudentWithId$fi;
+
+          var currentStudentId = (_listStudentWithId$fi = listStudentWithId.find(function (i) {
+            var _options$w, _options$w$globals;
+
+            return i.studentName.toLowerCase().trim() == (options === null || options === void 0 ? void 0 : (_options$w = options.w) === null || _options$w === void 0 ? void 0 : (_options$w$globals = _options$w.globals) === null || _options$w$globals === void 0 ? void 0 : _options$w$globals.seriesZ[options === null || options === void 0 ? void 0 : options.dataPointIndex][options === null || options === void 0 ? void 0 : options.dataPointIndex].toLowerCase().trim());
+          })) === null || _listStudentWithId$fi === void 0 ? void 0 : _listStudentWithId$fi.studentId;
+          history.push("/student-detail/overview/" + currentStudentId);
+        }
       }
     },
     dataLabels: {
@@ -26198,7 +26223,7 @@ var convertDataToSeriesBullderChart = function convertDataToSeriesBullderChart(d
     return {
       name: i.questionText.replace("<p>", "").replace("</p>", ""),
       data: ((_i$studentPercentQues = i.studentPercentQuestion) === null || _i$studentPercentQues === void 0 ? void 0 : _i$studentPercentQues.map(function (question) {
-        return [getRandomArbitrary((index + 1) * 1000 - 330, (index + 1) * 1000 + 330), question.percentQuestion, question.studentName];
+        return [getRandomArbitrary((index + 1) * 1000 - 330, (index + 1) * 1000 + 330), question.percentQuestion, question.studentName, question.studentId];
       })) || []
     };
   });
@@ -26393,7 +26418,7 @@ var optionBarChartAndArea = function optionBarChartAndArea(months, activeData, n
     },
     fill: {
       opacity: newseries === null || newseries === void 0 ? void 0 : newseries.map(function (item) {
-        if ((item === null || item === void 0 ? void 0 : item.type) == 'area') {
+        if ((item === null || item === void 0 ? void 0 : item.type) == "area") {
           return 0.2;
         }
 
@@ -26410,7 +26435,7 @@ var optionBarChartAndArea = function optionBarChartAndArea(months, activeData, n
         return activeData[index];
       }),
       width: newseries === null || newseries === void 0 ? void 0 : newseries.map(function (item) {
-        if ((item === null || item === void 0 ? void 0 : item.type) == 'area') {
+        if ((item === null || item === void 0 ? void 0 : item.type) == "area") {
           return 2;
         }
 
@@ -26583,7 +26608,7 @@ var BubbleChartCustom = function BubbleChartCustom(_ref) {
   })), React__default.createElement("div", {
     className: styles$1["chart-buddle"]
   }, React__default.createElement("div", null, React__default.createElement(Chart, {
-    options: readinesToLearnoptions(seriesName),
+    options: readinesToLearnoptions(seriesName, data),
     type: "scatter",
     series: convertDataToSeriesBullderChart(data),
     width: "100%",
@@ -28036,29 +28061,18 @@ var SelectFilter = function SelectFilter(_ref) {
     setIsOpenCollapse(!isOpenCollapse);
   };
 
-  var onChangeYear = function onChangeYear(item) {
-    !!onChangeFilters && onChangeFilters({
-      startDate: item.startDate,
-      endDate: item.endDate
-    });
-    setLabelBox(_extends({}, labelBox, {
-      calendar: {
-        value: item.value,
-        label: item.label
-      }
-    }));
-  };
-
   var handleChangeStartDate = function handleChangeStartDate(date) {
     !!onChangeFilters && onChangeFilters({
       startDate: moment(date).startOf("day").valueOf()
     });
+    setIsOpenCollapse(false);
   };
 
   var handleChangeEndDate = function handleChangeEndDate(date) {
     !!onChangeFilters && onChangeFilters({
       endDate: moment(date).endOf("day").valueOf()
     });
+    setIsOpenCollapse(false);
   };
 
   var onChangeGender = function onChangeGender(item) {
@@ -28078,15 +28092,15 @@ var SelectFilter = function SelectFilter(_ref) {
       grade: grade.value
     }));
 
-    if (grade.value === -1) {
+    if (grade.value == -1) {
       !!onChangeFilters && onChangeFilters({
         grade: []
       });
+    } else {
+      !!onChangeFilters && onChangeFilters({
+        grade: [grade.label]
+      });
     }
-
-    !!onChangeFilters && onChangeFilters({
-      grade: [grade.label]
-    });
   };
 
   var onChangeBandScore = function onChangeBandScore(score) {
@@ -28098,11 +28112,11 @@ var SelectFilter = function SelectFilter(_ref) {
       !!onChangeFilters && onChangeFilters({
         bandScore: ""
       });
+    } else {
+      !!onChangeFilters && onChangeFilters({
+        bandScore: score.label
+      });
     }
-
-    !!onChangeFilters && onChangeFilters({
-      bandScore: score.label
-    });
   };
 
   var handleClickOutSide = function handleClickOutSide(event) {
@@ -28116,45 +28130,6 @@ var SelectFilter = function SelectFilter(_ref) {
   }, []);
 
   var renderSelectFilter = function renderSelectFilter() {
-    if (name === FILTER_NAME.Calendar) {
-      return React__default.createElement("div", {
-        key: "" + name,
-        className: styles["block-filter-component"] + " ",
-        ref: ref
-      }, React__default.createElement("button", {
-        onClick: handleToggleCollapse,
-        className: styles["btn-filter"] + " d-flex align-items-center cursor-pointer"
-      }, React__default.createElement("img", {
-        src: "" + icon,
-        alt: labelBox.calendar.label
-      }), React__default.createElement("p", {
-        className: styles["color-filter"] + " my-0 mx-2"
-      }, labelBox.calendar.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"]
-      }, filterYearData.map(function (item) {
-        return React__default.createElement(reactstrap.FormGroup, {
-          check: true,
-          className: "my-2 px-3"
-        }, React__default.createElement(reactstrap.Input, {
-          id: item.label + "filterYear",
-          name: "filterYear",
-          value: item.value,
-          type: "radio",
-          className: "" + styles["radio-btn"],
-          checked: labelBox.calendar.value === item.value,
-          onChange: function onChange() {
-            return onChangeYear(item);
-          }
-        }), React__default.createElement(reactstrap.Label, {
-          check: true,
-          "for": item.label + "filterYear",
-          className: "" + styles["box-select-label"]
-        }, React__default.createElement("p", null, item.label)));
-      }))));
-    }
-
     if (name === FILTER_NAME.StartDate) {
       return React__default.createElement("div", {
         key: "" + name,
@@ -28168,23 +28143,15 @@ var SelectFilter = function SelectFilter(_ref) {
         alt: labelBox.calendar.label
       }), React__default.createElement("p", {
         className: styles["color-filter"] + " my-0 mx-2"
-      }, "Start Date", !!(filter !== null && filter !== void 0 && filter.startDate) && ": " + moment(filter === null || filter === void 0 ? void 0 : filter.startDate).format("DD/MM/YYYY"))), React__default.createElement("div", {
+      }, "Start Date", !!(filter !== null && filter !== void 0 && filter.startDate) && ": " + moment(filter === null || filter === void 0 ? void 0 : filter.startDate).format("DD/MM/YYYY"))), isOpenCollapse && React__default.createElement("div", {
         className: "" + styles["date-picker"]
-      }, React__default.createElement(pickers.MuiPickersUtilsProvider, {
-        utils: MomentUtils
-      }, React__default.createElement(pickers.KeyboardDatePicker, {
-        open: isOpenCollapse,
-        onClose: handleToggleCollapse,
-        variant: "dialog",
-        disableToolbar: true,
-        id: "date-picker-dialog",
-        format: "MM/dd/yyyy",
-        onChange: handleChangeStartDate,
-        value: filter === null || filter === void 0 ? void 0 : filter.startDate,
-        KeyboardButtonProps: {
-          "aria-label": "change date"
-        }
-      }))));
+      }, React__default.createElement(DatePicker, {
+        selected: moment(filter === null || filter === void 0 ? void 0 : filter.startDate).toDate(),
+        onChange: function onChange(date) {
+          return handleChangeStartDate(date);
+        },
+        inline: true
+      })));
     }
 
     if (name === FILTER_NAME.EndDate) {
@@ -28200,23 +28167,15 @@ var SelectFilter = function SelectFilter(_ref) {
         alt: labelBox.calendar.label
       }), React__default.createElement("p", {
         className: styles["color-filter"] + " my-0 mx-2"
-      }, "End Date", !!(filter !== null && filter !== void 0 && filter.endDate) && ": " + moment(filter === null || filter === void 0 ? void 0 : filter.endDate).format("DD/MM/YYYY"))), React__default.createElement("div", {
+      }, "End Date", !!(filter !== null && filter !== void 0 && filter.endDate) && ": " + moment(filter === null || filter === void 0 ? void 0 : filter.endDate).format("DD/MM/YYYY"))), isOpenCollapse && React__default.createElement("div", {
         className: "" + styles["date-picker"]
-      }, React__default.createElement(pickers.MuiPickersUtilsProvider, {
-        utils: MomentUtils
-      }, React__default.createElement(pickers.KeyboardDatePicker, {
-        open: isOpenCollapse,
-        onClose: handleToggleCollapse,
-        variant: "dialog",
-        disableToolbar: true,
-        id: "date-picker-dialog",
-        format: "MM/dd/yyyy",
-        onChange: handleChangeEndDate,
-        value: filter === null || filter === void 0 ? void 0 : filter.endDate,
-        KeyboardButtonProps: {
-          "aria-label": "change date"
-        }
-      }))));
+      }, React__default.createElement(DatePicker, {
+        selected: moment(filter === null || filter === void 0 ? void 0 : filter.endDate).toDate(),
+        onChange: function onChange(date) {
+          return handleChangeEndDate(date);
+        },
+        inline: true
+      })));
     }
 
     if (name === FILTER_NAME.Gender) {
@@ -28365,7 +28324,7 @@ var SelectFilter = function SelectFilter(_ref) {
       }, React__default.createElement(TeacherItemSelector, {
         onChange: function onChange(e) {
           handleChangeFilters(e);
-          !!changeCurrentTeacherUserId && changeCurrentTeacherUserId(e.teacherUserId || "");
+          !!changeCurrentTeacherUserId && changeCurrentTeacherUserId((e === null || e === void 0 ? void 0 : e.teacherUserId) || "");
 
           if (!(e !== null && e !== void 0 && e.label)) {
             setTeacherName("");