mario-education 2.4.42-admin → 2.4.43-admin

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<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>>;
+    fromLabel: yup.StringSchema<string | null | undefined, Record<string, any>, string | null | undefined>;
+    toLabel: yup.StringSchema<string | null | undefined, Record<string, any>, string | null | undefined>;
     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<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>>;
+    fromLabel: yup.StringSchema<string | null | undefined, Record<string, any>, string | null | undefined>;
+    toLabel: yup.StringSchema<string | null | undefined, Record<string, any>, string | null | undefined>;
     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/MarioFramework.Education/ClientApp/src/utils/constants.d.ts

@@ -12,5 +12,7 @@ export declare enum FILTER_NAME {
     Grade = "Grade",
     BandScore = "Current Grade",
     StudentName = "Student name",
-    TeacherName = "Teacher name"
+    TeacherName = "Teacher name",
+    StartDate = "Start Date",
+    EndDate = "End Date"
 }

package/dist/index.css

@@ -180,6 +180,10 @@ tbody._b-AXV tr {
     margin-bottom: 0;
 }
 
+._I8kqz {
+    position: absolute;
+    z-index: -999;
+}
 ._3DVMZ {
   display: flex;
   flex: 0 0 17%;

package/dist/index.js

@@ -21,6 +21,8 @@ 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'));
 var jsPDF = _interopDefault(require('jspdf'));
 var html2canvas = _interopDefault(require('html2canvas'));
 
@@ -1054,6 +1056,8 @@ var FILTER_NAME;
   FILTER_NAME["BandScore"] = "Current Grade";
   FILTER_NAME["StudentName"] = "Student name";
   FILTER_NAME["TeacherName"] = "Teacher name";
+  FILTER_NAME["StartDate"] = "Start Date";
+  FILTER_NAME["EndDate"] = "End Date";
 })(FILTER_NAME || (FILTER_NAME = {}));
 
 var header$1 = "Conference rubric";
@@ -1151,7 +1155,7 @@ var ConferenceRubricList = function ConferenceRubricList() {
   }))));
 };
 
-var styles = {"test":"_3ybTi","body-question-right":"_1H0W8","body-question":"_b-AXV","badge-icon":"_1fgfO","input-color-picker":"_2YR4l","question-list-session-template":"_114IY","delete-column-question-list-sesstion-template":"_qE7J0","conference-rubric-skill-column":"_2BV3o","conference-rubric-additional-row":"_1P4F2","conference-rubric-row-test":"_1SRmg","emotional-response":"_ZDINp","star-rating":"_Kzkzd","list-teacher-compare":"_Q0sF1","teacher-item":"_gu_yD","teacher-item-selected":"_33tYy","btn-filter":"_2VZin","color-filter":"_2M0vR","block-filter-component":"_1d6uY","select-filter-component":"_1XSIo","hidden":"_3o8gR","box-select":"_3ru37","radio-btn":"_1tQvL","box-select-label":"_3VNX5"};
+var styles = {"test":"_3ybTi","body-question-right":"_1H0W8","body-question":"_b-AXV","badge-icon":"_1fgfO","input-color-picker":"_2YR4l","question-list-session-template":"_114IY","delete-column-question-list-sesstion-template":"_qE7J0","conference-rubric-skill-column":"_2BV3o","conference-rubric-additional-row":"_1P4F2","conference-rubric-row-test":"_1SRmg","emotional-response":"_ZDINp","star-rating":"_Kzkzd","list-teacher-compare":"_Q0sF1","teacher-item":"_gu_yD","teacher-item-selected":"_33tYy","btn-filter":"_2VZin","color-filter":"_2M0vR","block-filter-component":"_1d6uY","select-filter-component":"_1XSIo","hidden":"_3o8gR","box-select":"_3ru37","radio-btn":"_1tQvL","box-select-label":"_3VNX5","date-picker":"_I8kqz"};
 
 var ToggleInput = function ToggleInput(_ref) {
   var value = _ref.value,
@@ -27588,6 +27592,14 @@ var useChartDatas = function useChartDatas() {
     name: FILTER_NAME.Calendar,
     icon: "/images/calendar.svg",
     handleChangeFilters: handleChangeFilters
+  }, {
+    name: FILTER_NAME.StartDate,
+    icon: "/images/calendar.svg",
+    handleChangeFilters: handleChangeFilters
+  }, {
+    name: FILTER_NAME.EndDate,
+    icon: "/images/calendar.svg",
+    handleChangeFilters: handleChangeFilters
   }, {
     name: FILTER_NAME.Gender,
     icon: "/images/gender-icon.svg",
@@ -28040,8 +28052,19 @@ var SelectFilter = function SelectFilter(_ref) {
     }));
   };
 
+  var handleChangeStartDate = function handleChangeStartDate(date) {
+    !!onChangeFilters && onChangeFilters({
+      startDate: moment(date).startOf("day").valueOf()
+    });
+  };
+
+  var handleChangeEndDate = function handleChangeEndDate(date) {
+    !!onChangeFilters && onChangeFilters({
+      endDate: moment(date).endOf("day").valueOf()
+    });
+  };
+
   var onChangeGender = function onChangeGender(item) {
-    console.log("item", item);
     !!onChangeFilters && onChangeFilters({
       gender: item.value === -1 ? [LegalGenderType.None, LegalGenderType.Male, LegalGenderType.Female] : [item.value]
     });
@@ -28124,6 +28147,62 @@ var SelectFilter = function SelectFilter(_ref) {
       }))));
     }
 
+    if (name === FILTER_NAME.StartDate) {
+      return React__default.createElement("div", {
+        key: "" + name,
+        className: "" + styles["block-filter-component"]
+      }, React__default.createElement("button", {
+        onClick: handleToggleCollapse,
+        className: styles["btn-filter"] + " d-flex align-items-center cursor-pointer"
+      }, 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", {
+        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"
+        }
+      }))));
+    }
+
+    if (name === FILTER_NAME.EndDate) {
+      return React__default.createElement("div", {
+        key: "" + name,
+        className: "" + styles["block-filter-component"]
+      }, React__default.createElement("button", {
+        onClick: handleToggleCollapse,
+        className: styles["btn-filter"] + " d-flex align-items-center cursor-pointer"
+      }, 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", {
+        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"
+        }
+      }))));
+    }
+
     if (name === FILTER_NAME.Gender) {
       return React__default.createElement("div", {
         key: "" + name,