mario-education 2.2.8 → 2.3.2

package/dist/index.js

@@ -153,9 +153,6 @@ var StudentSelector = function StudentSelector(_ref) {
       id: student.id
     };
   });
-  console.log("teacher assignment");
-  console.log(options);
-  console.log(value);
   return React__default.createElement(marioCore.CustomSelector, {
     options: options,
     inputValue: searchString,
@@ -5178,7 +5175,6 @@ var LearningSupportCategoryList = function LearningSupportCategoryList() {
 
 var style = {
   padding: "4px 8px",
-  marginRight: 16,
   marginBottom: 0,
   borderRadius: "2px",
   color: "#fff",
@@ -5212,8 +5208,12 @@ var UploadCSVButton = function UploadCSVButton(_ref) {
 };
 
 var CSV_FILE_URL = marioCore.BASE_URL + "/api/ImportCsv/csv";
-var importCSV = function importCSV(formData, subFolder) {
-  return marioCore.apiUpload.post(CSV_FILE_URL + "/" + subFolder, formData);
+var CSV_FILE_TEACHER = marioCore.BASE_URL + "/api/Teacher";
+var importStudentCSV = function importStudentCSV(formData) {
+  return marioCore.apiUpload.post(CSV_FILE_TEACHER + "/adminImportStudent", formData);
+};
+var importClassReflectionCSV = function importClassReflectionCSV(formData) {
+  return marioCore.apiUpload.post(CSV_FILE_URL + "/importClassReflection", formData);
 };
 
 var CSVType;
@@ -5228,28 +5228,18 @@ var CSVType;
 })(CSVType || (CSVType = {}));
 
 var buttons = [{
-  text: "Import subjects",
-  backgroundColor: "#1dd1a1",
-  type: CSVType.Subjects
-}, {
-  text: "Import grades",
-  backgroundColor: "#54a0ff",
-  type: CSVType.Grades
-}, {
-  text: "Import attendances",
-  backgroundColor: "#feca57",
-  type: CSVType.Attendances
-}, {
-  text: "Import class reflections",
-  backgroundColor: "#e74c3c",
-  type: CSVType.ClassReflection
-}, {
-  text: "Import others",
-  backgroundColor: "#8395a7",
-  type: CSVType.Others
+  text: "Import students",
+  backgroundColor: "#0abde3",
+  type: CSVType.Students
 }];
 var title = "CSV Import";
 var id = "csvupload";
+var initClassReflect = {
+  teacherName: '',
+  teacherEmail: '',
+  studentIds: [],
+  file: ''
+};
 
 var useCSVImport = function useCSVImport() {
   var dispatch = reactRedux.useDispatch();
@@ -5261,6 +5251,18 @@ var useCSVImport = function useCSVImport() {
       type = _useState[0],
       setType = _useState[1];
 
+  var _useState2 = React.useState(),
+      dataFile = _useState2[0],
+      setDataFile = _useState2[1];
+
+  var _useState3 = React.useState([]),
+      arrStudent = _useState3[0],
+      setArrStudent = _useState3[1];
+
+  var _useState4 = React.useState(initClassReflect),
+      initImportReflection = _useState4[0],
+      setInitImportReflection = _useState4[1];
+
   React.useEffect(function () {
     document.title = title;
   }, []);
@@ -5268,7 +5270,7 @@ var useCSVImport = function useCSVImport() {
     try {
       var _temp3 = function _temp3() {
         dispatch(marioCore.setLoading(false));
-        var input = document.getElementById(id);
+        var input = document.getElementById('import-student');
         input && (input.value = "");
       };
 
@@ -5278,7 +5280,7 @@ var useCSVImport = function useCSVImport() {
       var _temp4 = _catch(function () {
         var formData = new FormData();
         formData.append("file", file, file.name);
-        return Promise.resolve(importCSV(formData, type.toString())).then(function () {
+        return Promise.resolve(importStudentCSV(formData)).then(function () {
           dispatch(marioCore.setAlert({
             type: "success",
             message: "Import CSV successfully"
@@ -5298,21 +5300,87 @@ var useCSVImport = function useCSVImport() {
       return Promise.reject(e);
     }
   }, [type]);
+
+  var onConfirm = function onConfirm(values) {
+    try {
+      var _temp7 = function _temp7() {
+        dispatch(marioCore.setLoading(false));
+        var input = document.getElementById(id);
+        input && (input.value = "");
+      };
+
+      if (!dataFile || !dataFile) return Promise.resolve();
+      dispatch(marioCore.setLoading(true));
+
+      var _temp8 = _catch(function () {
+        var formData = new FormData();
+        formData.append("file", dataFile, dataFile.name);
+        formData.append("teacherName", values.teacherName);
+        formData.append("teacherEmail", values.teacherEmail);
+        values.studentIds.forEach(function (item) {
+          formData.append("studentIds", item);
+        });
+        return Promise.resolve(importClassReflectionCSV(formData)).then(function () {
+          dispatch(marioCore.setAlert({
+            type: "success",
+            message: "Import CSV successfully"
+          }));
+          setInitImportReflection(initClassReflect);
+        });
+      }, function (err) {
+        var _err$response2, _err$response2$data;
+
+        dispatch(marioCore.setAlert({
+          type: "danger",
+          message: ((_err$response2 = err.response) === null || _err$response2 === void 0 ? void 0 : (_err$response2$data = _err$response2.data) === null || _err$response2$data === void 0 ? void 0 : _err$response2$data.title) || err.message
+        }));
+      });
+
+      return Promise.resolve(_temp8 && _temp8.then ? _temp8.then(_temp7) : _temp7(_temp8));
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
+
   return {
     isLoading: isLoading,
     buttons: buttons,
     id: id,
     setType: setType,
-    upload: upload
+    upload: upload,
+    initImportReflection: initImportReflection,
+    setInitImportReflection: setInitImportReflection,
+    onConfirm: onConfirm,
+    CSVType: CSVType,
+    dataFile: dataFile,
+    setDataFile: setDataFile,
+    setArrStudent: setArrStudent,
+    arrStudent: arrStudent
   };
 };
 
+var schema$4 = yup.object({
+  teacherName: yup.string().required(),
+  teacherEmail: yup.string().email('Invalid email').required(),
+  studentIds: yup.array().required().test("test students", "Please choose student", function () {
+    return !!this.parent.studentIds && !!this.parent.studentIds.length;
+  }),
+  file: yup.string().required()
+});
+
 var CSVImport = function CSVImport() {
   var _useCSVImport = useCSVImport(),
+      initImportReflection = _useCSVImport.initImportReflection,
+      onConfirm = _useCSVImport.onConfirm,
       isLoading = _useCSVImport.isLoading,
-      buttons = _useCSVImport.buttons,
-      id = _useCSVImport.id,
       setType = _useCSVImport.setType,
+      id = _useCSVImport.id,
+      CSVType = _useCSVImport.CSVType,
+      dataFile = _useCSVImport.dataFile,
+      setDataFile = _useCSVImport.setDataFile,
+      setArrStudent = _useCSVImport.setArrStudent,
+      arrStudent = _useCSVImport.arrStudent,
+      buttons = _useCSVImport.buttons,
       upload = _useCSVImport.upload;
 
   return React__default.createElement("div", {
@@ -5320,28 +5388,146 @@ var CSVImport = function CSVImport() {
   }, React__default.createElement(reactstrap.Input, {
     className: "d-none",
     type: "file",
-    id: id,
+    id: "import-student",
     onChange: function onChange(e) {
       return upload(e.target.files[0]);
     },
     accept: "text/csv"
   }), React__default.createElement("div", {
-    className: "d-flex align-items-center"
-  }, buttons.map(function (button) {
-    return React__default.createElement(UploadCSVButton, {
-      key: button.text,
+    className: "class-reflection"
+  }, React__default.createElement(formik.Formik, {
+    initialValues: initImportReflection,
+    enableReinitialize: true,
+    validationSchema: schema$4,
+    onSubmit: function onSubmit(values, actions) {
+      onConfirm(values);
+      setDataFile('');
+      setArrStudent([]);
+      actions.resetForm();
+    }
+  }, function (formProps) {
+    var values = formProps.values,
+        touched = formProps.touched,
+        errors = formProps.errors,
+        handleSubmit = formProps.handleSubmit,
+        handleChange = formProps.handleChange;
+    return React__default.createElement(reactstrap.Row, {
+      className: "mb-2"
+    }, React__default.createElement(reactstrap.Input, {
+      className: "d-none",
+      type: "file",
+      id: id,
+      onChange: function onChange(e) {
+        setDataFile(e.target.files[0]);
+        formProps.setFieldValue('file', 'imported');
+        var input = document.getElementById(id);
+        input && (input.value = "");
+      },
+      accept: "text/csv"
+    }), React__default.createElement(reactstrap.Col, {
+      md: 6,
+      className: "mb-2"
+    }, React__default.createElement(reactstrap.Row, null, React__default.createElement(reactstrap.Col, {
+      md: 12,
+      className: "mb-2"
+    }, React__default.createElement(marioCore.RequiredLabel, {
+      text: "Class Teacher Name"
+    }), React__default.createElement(reactstrap.Input, {
+      name: "teacherName",
+      value: values.teacherName,
+      type: "text",
+      onChange: function onChange(e) {
+        handleChange(e);
+      }
+    }), touched.teacherName && errors.teacherName && React__default.createElement(marioCore.ErrorHandler, {
+      text: errors.teacherName
+    })), React__default.createElement(reactstrap.Col, {
+      md: 12,
+      className: "mb-2"
+    }, React__default.createElement(marioCore.RequiredLabel, {
+      text: "Class Teacher Email"
+    }), React__default.createElement(reactstrap.Input, {
+      name: "teacherEmail",
+      value: values.teacherEmail,
+      type: "text",
+      onChange: function onChange(e) {
+        handleChange(e);
+      }
+    }), touched.teacherEmail && errors.teacherEmail && React__default.createElement(marioCore.ErrorHandler, {
+      text: errors.teacherEmail
+    })), React__default.createElement(reactstrap.Col, {
+      md: 12,
+      className: "mb-2"
+    }, React__default.createElement(reactstrap.Label, null, "Students"), React__default.createElement(StudentSelector, {
+      onChange: function onChange(e) {
+        setArrStudent(e);
+        formProps.setFieldValue("studentIds", e.map(function (i) {
+          return i.value;
+        }) || []);
+      },
+      value: arrStudent
+    })), React__default.createElement(reactstrap.Col, {
+      md: 12,
+      className: "mb-2"
+    }, touched.studentIds && errors.studentIds && React__default.createElement(marioCore.ErrorHandler, {
+      text: errors.studentIds
+    })), React__default.createElement(reactstrap.Col, {
+      md: 12,
+      className: "mb-2"
+    }, React__default.createElement(marioCore.RequiredLabel, {
+      text: "Upload File Class Reflection"
+    }), React__default.createElement(UploadCSVButton, {
+      key: "Import class reflections",
       htmlFor: id,
-      text: button.text,
+      text: "Import class reflections",
       isDisabled: isLoading,
-      backgroundColor: button.backgroundColor,
+      backgroundColor: "#e74c3c",
       onClick: function onClick() {
-        return setType(button.type);
+        setType(CSVType.ClassReflection);
       }
-    });
+    }), !!dataFile && React__default.createElement("p", {
+      style: {
+        color: '#007bff',
+        fontStyle: 'italic',
+        marginTop: '5px'
+      }
+    }, dataFile.name)), !dataFile && React__default.createElement(reactstrap.Col, {
+      md: 12,
+      className: "mb-2"
+    }, touched.file && errors.file && React__default.createElement(marioCore.ErrorHandler, {
+      text: errors.file
+    })), React__default.createElement(reactstrap.Col, {
+      md: 12
+    }, React__default.createElement(reactstrap.Button, {
+      color: "primary",
+      className: "float-right",
+      onClick: function onClick() {
+        return handleSubmit();
+      }
+    }, "Import"), ' '))), React__default.createElement(reactstrap.Col, {
+      md: 6,
+      className: "mb-2"
+    }, React__default.createElement(reactstrap.Row, null, React__default.createElement(reactstrap.Col, {
+      md: 12,
+      className: "mb-2"
+    }, React__default.createElement(marioCore.RequiredLabel, {
+      text: "Import student"
+    }), buttons.map(function (button) {
+      return React__default.createElement(UploadCSVButton, {
+        key: button.text,
+        htmlFor: 'import-student',
+        text: button.text,
+        isDisabled: isLoading,
+        backgroundColor: button.backgroundColor,
+        onClick: function onClick() {
+          return setType(button.type);
+        }
+      });
+    })))));
   })));
 };
 
-var schema$4 = yup.object({
+var schema$5 = yup.object({
   name: yup.string().required("Name is required"),
   startTime: yup.string().required("Start time is required"),
   endTime: yup.string().required("End time is required")
@@ -5360,7 +5546,7 @@ var SemesterDetailModal = function SemesterDetailModal(props, ref) {
   return React__default.createElement(formik.Formik, {
     initialValues: semesterDetail,
     enableReinitialize: true,
-    validationSchema: schema$4,
+    validationSchema: schema$5,
     onSubmit: function onSubmit(values, actions) {
       onConfirm(values);
       actions.resetForm();
@@ -5413,7 +5599,7 @@ var SemesterDetailModal = function SemesterDetailModal(props, ref) {
     })), React__default.createElement(reactstrap.Col, {
       md: 6
     }, React__default.createElement(DatePicker, {
-      value: marioCore.utcToLocalTime(values.startTime, "MMM dd, yyyy"),
+      value: !!values.startTime ? marioCore.utcToLocalTime(values.startTime, "Do MMMM YYYY") : "",
       todayButton: "Today",
       peekNextMonth: true,
       showMonthDropdown: true,
@@ -5444,7 +5630,7 @@ var SemesterDetailModal = function SemesterDetailModal(props, ref) {
     })), React__default.createElement(reactstrap.Col, {
       md: 6
     }, React__default.createElement(DatePicker, {
-      value: marioCore.utcToLocalTime(values.endTime, "MMM dd, yyyy"),
+      value: !!values.endTime ? marioCore.utcToLocalTime(values.endTime, "Do MMMM YYYY") : "",
       todayButton: "Today",
       peekNextMonth: true,
       showMonthDropdown: true,
@@ -5471,7 +5657,7 @@ var SemesterDetailModal = function SemesterDetailModal(props, ref) {
 
 var SemesterDetailModal$1 = React.forwardRef(SemesterDetailModal);
 
-var schema$5 = yup.object({
+var schema$6 = yup.object({
   value: yup.number().required("Breaking month is required")
 });
 var options = [{
@@ -5524,7 +5710,7 @@ var BreakingMonthModal = function BreakingMonthModal(props, ref) {
   return React__default.createElement(formik.Formik, {
     initialValues: breakingMonthDetail,
     enableReinitialize: true,
-    validationSchema: schema$5,
+    validationSchema: schema$6,
     onSubmit: function onSubmit(values, actions) {
       onConfirm(values);
       actions.resetForm();
@@ -6060,9 +6246,9 @@ var SemesterList = function SemesterList() {
       }
     })), React__default.createElement("td", {
       className: "align-middle"
-    }, marioCore.utcToLocalTime(record.startTime, "MMM dd, yyyy")), React__default.createElement("td", {
+    }, marioCore.utcToLocalTime(record.startTime, "Do MMMM YYYY")), React__default.createElement("td", {
       className: "align-middle"
-    }, marioCore.utcToLocalTime(record.endTime, "MMM dd, yyyy")), React__default.createElement("td", {
+    }, marioCore.utcToLocalTime(record.endTime, "Do MMMM YYYY")), React__default.createElement("td", {
       className: "text-center align-middle"
     }, React__default.createElement(marioCore.DeleteButtonIcon, {
       onClick: function onClick() {
@@ -6102,7 +6288,7 @@ var SemesterList = function SemesterList() {
   }, "Change breaking month"))))));
 };
 
-var schema$6 = yup.object({
+var schema$7 = yup.object({
   label: yup.string().required("Label is required"),
   value: yup.number().required("Value is required")
 });
@@ -6120,7 +6306,7 @@ var BandScoreDetailModal = function BandScoreDetailModal(props, ref) {
   return React__default.createElement(formik.Formik, {
     initialValues: bandScoreDetail,
     enableReinitialize: true,
-    validationSchema: schema$6,
+    validationSchema: schema$7,
     onSubmit: function onSubmit(values, actions) {
       onConfirm(values);
       actions.resetForm();
@@ -6789,7 +6975,7 @@ var CurrentLicense = function CurrentLicense() {
   }))));
 };
 
-var schema$7 = yup.object({
+var schema$8 = yup.object({
   name: yup.string().required("Name is required"),
   startTime: yup.string().required("Start time is required"),
   endTime: yup.string().required("End time is required")
@@ -6808,7 +6994,7 @@ var SchoolBlankDayDetailModal = function SchoolBlankDayDetailModal(props, ref) {
   return React__default.createElement(formik.Formik, {
     initialValues: schoolBlankDayDetail,
     enableReinitialize: true,
-    validationSchema: schema$7,
+    validationSchema: schema$8,
     onSubmit: function onSubmit(values, actions) {
       onConfirm(values);
       actions.resetForm();
@@ -7244,9 +7430,9 @@ var SchoolBlankDayList = function SchoolBlankDayList() {
       }
     })), React__default.createElement("td", {
       className: "align-middle"
-    }, marioCore.utcToLocalTime(record.startTime, marioCore.DATE_FORMAT)), React__default.createElement("td", {
+    }, marioCore.utcToLocalTime(record.startTime, "Do MMMM YYYY")), React__default.createElement("td", {
       className: "align-middle"
-    }, marioCore.utcToLocalTime(record.endTime, marioCore.DATE_FORMAT)), React__default.createElement("td", {
+    }, marioCore.utcToLocalTime(record.endTime, "Do MMMM YYYY")), React__default.createElement("td", {
       className: "text-center align-middle"
     }, React__default.createElement(marioCore.DeleteButtonIcon, {
       onClick: function onClick() {
@@ -8338,7 +8524,7 @@ var QuestionSplitPaneSelector = function QuestionSplitPaneSelector(props) {
   }, " ", "v", " ")) : "");
 };
 
-var schema$8 = yup.object({
+var schema$9 = yup.object({
   name: yup.string().required("Name is required")
 });
 
@@ -8364,7 +8550,7 @@ var ReflectionDetailModal = function ReflectionDetailModal(props, ref) {
   return React__default.createElement(formik.Formik, {
     initialValues: reflectionformDetail,
     enableReinitialize: true,
-    validationSchema: schema$8,
+    validationSchema: schema$9,
     onSubmit: function onSubmit(values, actions) {
       values.questionIds = arrId;
       onConfirm(values);
@@ -9745,7 +9931,7 @@ var AdditionalComponent = function AdditionalComponent(_ref) {
   return null;
 };
 
-var schema$9 = yup.object({
+var schema$a = yup.object({
   text: yup.string().required("Question text is required"),
   type: yup.string().required("Question type is required"),
   categoryId: yup.number().test("test category id", "Category is required", function (value) {
@@ -9998,7 +10184,7 @@ var QuestionDetail = function QuestionDetail() {
   return React__default.createElement(formik.Formik, {
     initialValues: questionDetail,
     enableReinitialize: true,
-    validationSchema: schema$9,
+    validationSchema: schema$a,
     onSubmit: function onSubmit(values) {
       if (values.type == marioCore.QUESTION_TYPES.EMOTIONAL && !!values.answers) {
         for (var index in values.answers) {
@@ -10264,7 +10450,7 @@ var QuestionSplitPaneSelector$1 = function QuestionSplitPaneSelector(props) {
   }, " ", "v", " ")) : "");
 };
 
-var schema$a = yup.object({
+var schema$b = yup.object({
   name: yup.string().required("Name is required")
 });
 
@@ -10290,7 +10476,7 @@ var AssessmentDetailModal = function AssessmentDetailModal(props, ref) {
   return React__default.createElement(formik.Formik, {
     initialValues: assessmentDetail,
     enableReinitialize: true,
-    validationSchema: schema$a,
+    validationSchema: schema$b,
     onSubmit: function onSubmit(values, actions) {
       values.questionIds = arrId;
       onConfirm(values);
@@ -11232,7 +11418,7 @@ var FeedbackList = function FeedbackList() {
   }))));
 };
 
-var schema$b = yup.object({
+var schema$c = yup.object({
   name: yup.string().required("Name is required")
 });
 
@@ -11252,7 +11438,7 @@ var TutorialScreenDetailModal = function TutorialScreenDetailModal(props, ref) {
       typeRole: typeRole
     }),
     enableReinitialize: true,
-    validationSchema: schema$b,
+    validationSchema: schema$c,
     onSubmit: function onSubmit(values, actions) {
       onConfirm(values);
       actions.resetForm();
@@ -11732,110 +11918,7 @@ var TutorialScreenContainer = function TutorialScreenContainer() {
   });
 };
 
-var QuestionBankList$1 = function QuestionBankList(_ref) {
-  var isDefaultQuestion = _ref.isDefaultQuestion,
-      isDefaultQuestionGeneral = _ref.isDefaultQuestionGeneral;
-
-  var _useQuestionList = useQuestionList(isDefaultQuestion, isDefaultQuestionGeneral),
-      totalItems = _useQuestionList.totalItems,
-      gridOptions = _useQuestionList.gridOptions,
-      setRef = _useQuestionList.setRef,
-      goToDetail = _useQuestionList.goToDetail,
-      filters = _useQuestionList.filters,
-      changeFilters = _useQuestionList.changeFilters,
-      updateOrderQuestions = _useQuestionList.updateOrderQuestions;
-
-  var onRowDragEnd = function onRowDragEnd(e) {
-    var dataAfterDrag = e.node.parent.childrenAfterFilter.map(function (item, index) {
-      return {
-        id: item.data.id,
-        orderDrag: ++index
-      };
-    });
-    updateOrderQuestions(dataAfterDrag, isDefaultQuestionGeneral);
-  };
-
-  return React__default.createElement("div", {
-    className: "animated fadeIn"
-  }, React__default.createElement(reactstrap.Row, {
-    className: "my-2"
-  }, React__default.createElement(reactstrap.Col, {
-    md: 8
-  }, React__default.createElement(marioCore.SearchBoxContainer, {
-    text: "Create question",
-    onClick: function onClick() {
-      return goToDetail();
-    },
-    initValue: filters.searchString,
-    onSearch: function onSearch(searchString) {
-      return changeFilters({
-        searchString: searchString
-      });
-    },
-    placeholder: "Type something to Search question"
-  })), isDefaultQuestion && React__default.createElement(reactstrap.Col, {
-    md: 2
-  }, React__default.createElement(DefaultQuestionStudentTeacherFilter, {
-    isDefaultQuestionTeacher: filters.isDefaultQuestionTeacher,
-    onChange: function onChange(e) {
-      return changeFilters({
-        isDefaultQuestionTeacher: e ? e.value : null
-      });
-    }
-  })), isDefaultQuestionGeneral && React__default.createElement(reactstrap.Col, {
-    md: 2
-  }, React__default.createElement(DefaultQuestionStudentTeacherFilter, {
-    isDefaultQuestionTeacher: filters.isDefaultQuestionGeneralClassTeacher,
-    onChange: function onChange(e) {
-      return changeFilters({
-        isDefaultQuestionGeneralClassTeacher: e ? e.value : null
-      });
-    },
-    isDefaultGeneralClass: true
-  })), React__default.createElement(reactstrap.Col, {
-    md: isDefaultQuestion || isDefaultQuestionGeneral ? 2 : 4,
-    className: "d-flex align-items-center justify-content-end"
-  }, "Total of questions: ", totalItems)), React__default.createElement(reactstrap.Row, {
-    className: "mb-2"
-  }, React__default.createElement(reactstrap.Col, {
-    md: 12,
-    className: "mb-2"
-  }, React__default.createElement("div", {
-    className: "ag-theme-balham w-100"
-  }, React__default.createElement(react.AgGridReact, {
-    domLayout: "autoHeight",
-    gridOptions: gridOptions,
-    masterDetail: true,
-    onGridReady: function onGridReady(params) {
-      setRef(params.api);
-    },
-    rowDragManaged: true,
-    animateRows: true,
-    modules: [masterDetail.MasterDetailModule, clientSideRowModel.ClientSideRowModelModule],
-    onRowDragEnd: onRowDragEnd
-  }))), React__default.createElement(reactstrap.Col, {
-    md: 12
-  }, React__default.createElement(marioCore.CustomPagination, {
-    filters: filters,
-    totalRecordCount: totalItems,
-    changePageSize: function changePageSize(pageSize) {
-      return changeFilters({
-        pageSize: pageSize
-      });
-    },
-    changePage: function changePage(currentPage) {
-      return changeFilters({
-        currentPage: currentPage
-      });
-    }
-  }))));
-};
-
-QuestionBankList$1.defaultProps = {
-  isDefaultQuestion: false
-};
-
-var schema$c = yup.object({
+var schema$d = yup.object({
   name: yup.string().required("Name is required")
 });
 
@@ -11852,7 +11935,7 @@ var QuestionCateModal = function QuestionCateModal(props, ref) {
   return React__default.createElement(formik.Formik, {
     initialValues: questionCateDetail,
     enableReinitialize: true,
-    validationSchema: schema$c,
+    validationSchema: schema$d,
     onSubmit: function onSubmit(values, actions) {
       onConfirm(values);
       actions.resetForm();
@@ -12263,25 +12346,7 @@ var QuestionCateList = function QuestionCateList() {
 var tabs$3 = [{
   path: "/admin/question/question-list",
   title: "Question list",
-  component: QuestionBankList$1
-}, {
-  path: "/admin/question/default-question-list",
-  title: "Default question list",
-  component: function component() {
-    return React__default.createElement(QuestionBankList$1, {
-      isDefaultQuestion: true,
-      isDefaultQuestionGeneral: false
-    });
-  }
-}, {
-  path: "/admin/question/default-question-general-list",
-  title: "Default question general class list",
-  component: function component() {
-    return React__default.createElement(QuestionBankList$1, {
-      isDefaultQuestion: false,
-      isDefaultQuestionGeneral: true
-    });
-  }
+  component: QuestionBankList
 }, {
   path: "/admin/question/question-category",
   title: "Question category",
@@ -12457,7 +12522,7 @@ var SemesterSelector = function SemesterSelector(_ref) {
   }));
 };
 
-var schema$d = yup.object({
+var schema$e = yup.object({
   beginDate: yup.string().required("Begin date is required"),
   endDate: yup.string().required("End date is required"),
   timeSemester: yup.string().required("Time Semester is required"),
@@ -12493,7 +12558,7 @@ var AssignmentDetailModal = function AssignmentDetailModal(props, ref) {
   return React__default.createElement(formik.Formik, {
     initialValues: assignmentDetail,
     enableReinitialize: true,
-    validationSchema: schema$d,
+    validationSchema: schema$e,
     onSubmit: function onSubmit(values, actions) {
       onConfirm(values);
       actions.resetForm();
@@ -14181,7 +14246,7 @@ var SkillSelector$1 = function SkillSelector(_ref) {
   });
 };
 
-var schema$e = yup.object({
+var schema$f = yup.object({
   name: yup.string().required("Name is required"),
   isConference: yup.boolean().required("Is conference is required"),
   conferenceRubricId: yup.number().nullable().test("Test conference rubric id", "Conference rubric is required", function () {
@@ -14569,7 +14634,7 @@ var SessionTemplateDetail = function SessionTemplateDetail() {
   return React__default.createElement(formik.Formik, {
     initialValues: sessionTemplateDetail,
     enableReinitialize: true,
-    validationSchema: schema$e,
+    validationSchema: schema$f,
     onSubmit: function onSubmit(values) {
       confirmData(values);
       setEdited(false);
@@ -15122,7 +15187,7 @@ var useSessionTemplateGeneralClassDetail = function useSessionTemplateGeneralCla
 };
 
 var LINK_TO_DEFAULT_QUESTION_GENERAL_CLASS = "/admin/question/default-question-general-list";
-var schema$f = yup.object({
+var schema$g = yup.object({
   name: yup.string().trim().required("Name is required"),
   subjectId: yup.number().required("Subject is required").test("Test subject", "Subject is required", function (value) {
     return value > 0;
@@ -15206,7 +15271,7 @@ var SessionTemplateGeneralClassDetail = function SessionTemplateGeneralClassDeta
   return React__default.createElement(formik.Formik, {
     initialValues: sessionTemplateGeneralClassDetail,
     enableReinitialize: true,
-    validationSchema: schema$f,
+    validationSchema: schema$g,
     onSubmit: function onSubmit(values) {
       confirmData(values);
       setEdited(false);
@@ -15413,7 +15478,7 @@ var SessionTemplateGeneralClassDetail = function SessionTemplateGeneralClassDeta
   });
 };
 
-var schema$g = yup.object({
+var schema$h = yup.object({
   learningSupportCategoryId: yup.number().test("testLearningSupportCategoryId", "Invalid category", function (number) {
     return !!number && number >= 1;
   }),
@@ -15443,7 +15508,7 @@ var CustomAlertDetailModal = function CustomAlertDetailModal(props, ref) {
   return React__default.createElement(formik.Formik, {
     initialValues: customAlertDetail,
     enableReinitialize: true,
-    validationSchema: schema$g,
+    validationSchema: schema$h,
     onSubmit: function onSubmit(values, actions) {
       onConfirm(values);
       actions.resetForm();
@@ -16017,7 +16082,7 @@ var CustomAlertList = function CustomAlertList() {
 
 var certificate = {"certificate-item":"_3DVMZ","add-breakpoint":"_3zOGW","box-item":"_3DQwX"};
 
-var schema$h = yup.object({
+var schema$i = yup.object({
   name: yup.string().required("Name is required"),
   certificateItems: yup.array().test("Text label required", "Text is required", function (value) {
     return value === null || value === void 0 ? void 0 : value.every(function (item) {
@@ -16042,7 +16107,7 @@ var CertificateDetailModal = function CertificateDetailModal(props, ref) {
   return React__default.createElement(formik.Formik, {
     initialValues: certificateDetail,
     enableReinitialize: true,
-    validationSchema: schema$h,
+    validationSchema: schema$i,
     onSubmit: function onSubmit(values, actions) {
       var _values$certificateIt;
 
@@ -17331,6 +17396,7 @@ var HighImpact = function HighImpact(_ref) {
   }, [data]);
   if (!data) return React__default.createElement(Loading, null);
   var series = [{
+    name: "",
     data: ratings
   }];
   var options = {
@@ -17524,7 +17590,10 @@ var Quantity = function Quantity(_ref) {
   if (!data) return React__default.createElement(Loading, null);
   var teacherPercentage = data.teacherPercentage,
       studentPercentage = data.studentPercentage,
-      assistantPercentage = data.assistantPercentage;
+      assistantPercentage = data.assistantPercentage,
+      numberOfTeachers = data.numberOfTeachers,
+      numberOfStudents = data.numberOfStudents,
+      numberOfAssistants = data.numberOfAssistants;
   var series = [teacherPercentage, studentPercentage, assistantPercentage].map(function (number) {
     return Number(number.toFixed(2));
   });
@@ -17550,15 +17619,15 @@ var Quantity = function Quantity(_ref) {
   var details = [{
     label: "Teachers",
     color: colors$3[0],
-    value: teacherPercentage
+    value: numberOfTeachers
   }, {
     label: "Students",
     color: colors$3[1],
-    value: studentPercentage
+    value: numberOfStudents
   }, {
     label: "Assistants",
     color: colors$3[2],
-    value: assistantPercentage
+    value: numberOfAssistants
   }];
   return React__default.createElement("div", {
     className: "d-flex h-100"
@@ -17572,8 +17641,6 @@ var Quantity = function Quantity(_ref) {
     bordered: true,
     size: "sm"
   }, React__default.createElement("tbody", null, details.map(function (item) {
-    var _item$value;
-
     return React__default.createElement("tr", {
       key: item.label
     }, React__default.createElement("td", null, item.label), React__default.createElement("td", {
@@ -17583,8 +17650,8 @@ var Quantity = function Quantity(_ref) {
       style: {
         backgroundColor: item.color
       }
-    })), React__default.createElement("td", null, Number(((_item$value = item.value) === null || _item$value === void 0 ? void 0 : _item$value.toFixed(2)) || "0"), "%"));
-  }))))), React__default.createElement("div", {
+    })), React__default.createElement("td", null, item.value));
+  }))), React__default.createElement("p", null, "The number of user for each role"))), React__default.createElement("div", {
     className: "d-flex align-items-end"
   }, React__default.createElement(ReactApexChart, {
     options: options,