mario-education 2.4.46-admin → 2.4.48-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/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'));
 
@@ -28036,29 +28035,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 +28066,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 +28086,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 +28104,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 +28117,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 +28141,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 +28298,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("");