mario-education 2.4.271-release → 2.4.273-release

package/dist/containers/UserRevert/hooks/useRevertUser.d.ts

@@ -10,5 +10,7 @@ declare const useRevertUser: () => {
     setUserTo: import("react").Dispatch<import("react").SetStateAction<Student | null>>;
     handelMergeDataUser: () => Promise<void>;
     handelResetAcademicYear: () => Promise<void>;
+    upload: (file: any) => Promise<void>;
+    isLoading: any;
 };
 export default useRevertUser;

package/dist/index.js

@@ -15372,7 +15372,18 @@ var QuestionDetail = function QuestionDetail() {
     }, React__default.createElement(reactstrap.Row, null, React__default.createElement(reactstrap.Col, {
       md: 12,
       className: "mb-1"
-    }, React__default.createElement(reactstrap.Row, null, [marioCore.QUESTION_TYPES.EMOTIONAL, marioCore.QUESTION_TYPES.LEARNING_STRATEGY, marioCore.QUESTION_TYPES.RATING, marioCore.QUESTION_TYPES.SUMMARIZE, marioCore.QUESTION_TYPES.TEXT_INPUT].includes(values.type) && parseInt(type) == TYPE_QUESTION.OneToOne && React__default.createElement(reactstrap.Col, {
+    }, React__default.createElement(reactstrap.Row, null, parseInt(type) == TYPE_QUESTION.Default && React__default.createElement(reactstrap.Col, {
+      md: 12
+    }, React__default.createElement(reactstrap.CustomInput, {
+      type: "checkbox",
+      id: "question-default-before-session-checkbox",
+      label: t("Is Mandatory"),
+      checked: values.isMandatory,
+      onChange: function onChange() {
+        setFieldValue("isMandatory", !values.isMandatory);
+        setEditedTrue();
+      }
+    })), [marioCore.QUESTION_TYPES.EMOTIONAL, marioCore.QUESTION_TYPES.LEARNING_STRATEGY, marioCore.QUESTION_TYPES.RATING, marioCore.QUESTION_TYPES.SUMMARIZE, marioCore.QUESTION_TYPES.TEXT_INPUT].includes(values.type) && parseInt(type) == TYPE_QUESTION.OneToOne && React__default.createElement(reactstrap.Col, {
       md: 12
     }, React__default.createElement(reactstrap.CustomInput, {
       type: "checkbox",
@@ -44836,22 +44847,28 @@ var useDashboard$1 = function useDashboard() {
         studentUserId: option === null || option === void 0 ? void 0 : option.id
       }));
       return;
+    } else {
+      setGenderOfStudent("");
+      setStudentDefault(undefined);
+      setFilter(_extends({}, filter, {
+        grade: [],
+        studentId: undefined,
+        studentUserId: ""
+      }));
+      return;
     }
-
-    setGenderOfStudent("");
-    setStudentDefault(undefined);
-    setFilter(_extends({}, filter, {
-      grade: [],
-      studentId: undefined,
-      studentUserId: ""
-    }));
-    return;
   };
 
   var handleSaveGradeFilter = function handleSaveGradeFilter(grades) {
-    setFilter(_extends({}, filter, {
-      grade: grades
-    }));
+    var filterGrades = grades.filter(function (g) {
+      return g !== null;
+    });
+
+    if (filterGrades && filterGrades.length > 0) {
+      setFilter(_extends({}, filter, {
+        grade: grades
+      }));
+    }
   };
 
   var onChangeFilters = function onChangeFilters(filterSelect) {
@@ -45035,7 +45052,7 @@ var useDashboard$1 = function useDashboard() {
     getDashboardFlags();
   }, [JSON.stringify(filter)]);
   React.useEffect(function () {
-    !!filter.studentUserId && callApiByStudentUserId(getGrades, handleSaveGradeFilter, filter.studentUserId, []);
+    filter.studentUserId && callApiByStudentUserId(getGrades, handleSaveGradeFilter, filter.studentUserId, []);
   }, [filter.studentUserId]);
   return {
     setFilter: setFilter,
@@ -51056,6 +51073,14 @@ var MultiChoiceComponent = function MultiChoiceComponent(_ref) {
   }, correctQuestionAnswer.join("; "))))));
 };
 
+var useStyles$3 = core$1.makeStyles({
+  customAutocomplete: {
+    '& .MuiFormControl-fullWidth': {
+      width: '89%'
+    }
+  }
+});
+
 var DropDownComponent = function DropDownComponent(_ref) {
   var questionItemName = _ref.questionItemName,
       questionId = _ref.questionId,
@@ -51063,10 +51088,10 @@ var DropDownComponent = function DropDownComponent(_ref) {
       isUserChangeSession = _ref.isUserChangeSession,
       onChangeQuestionAnswer = _ref.onChangeQuestionAnswer,
       questionAnswer = _ref.questionAnswer;
+  var classes = useStyles$3();
   return React__default.createElement(lab.Autocomplete, {
-    fullWidth: true,
     id: "combo-box-demo",
-    className: "mt-1",
+    className: "mt-1 ml-4 " + classes.customAutocomplete,
     disabled: !isUserChangeSession,
     options: (questionAnswer === null || questionAnswer === void 0 ? void 0 : questionAnswer.map(function (r) {
       return r.text;
@@ -76806,7 +76831,7 @@ var lodash = createCommonjsModule(function (module, exports) {
 }.call(commonjsGlobal));
 });
 
-var useStyles$3 = core$1.makeStyles(function () {
+var useStyles$4 = core$1.makeStyles(function () {
   return {
     container: {
       position: "relative"
@@ -76899,7 +76924,7 @@ var InterventionSelector = function InterventionSelector(_ref) {
   var optionSelected = options.find(function (i) {
     return i.name === (value === null || value === void 0 ? void 0 : value.name);
   });
-  var classes = useStyles$3();
+  var classes = useStyles$4();
 
   var handleToggleOpen = function handleToggleOpen() {
     setOpen(function (state) {
@@ -78613,7 +78638,7 @@ var usePreviewSurvey = function usePreviewSurvey() {
   };
 };
 
-var useStyles$4 = core$1.makeStyles(function (theme) {
+var useStyles$5 = core$1.makeStyles(function (theme) {
   var _tabLabel;
 
   return {
@@ -78804,7 +78829,7 @@ var ShareSurveyDialog = function ShareSurveyDialog(_ref) {
 };
 
 var PreviewSurveyAdmin = function PreviewSurveyAdmin() {
-  var classes = useStyles$4();
+  var classes = useStyles$5();
 
   var _usePreviewSurvey = usePreviewSurvey(),
       classFontSize = _usePreviewSurvey.classFontSize,
@@ -83095,7 +83120,7 @@ var TableSelectStudent = function TableSelectStudent(_ref) {
   }, t("no_data")))));
 };
 
-var useStyles$5 = core$1.makeStyles(function () {
+var useStyles$6 = core$1.makeStyles(function () {
   return {
     root: {
       "& > *": {
@@ -83120,7 +83145,7 @@ var InputComponent = function InputComponent(_ref) {
       canSubmit = _ref.canSubmit,
       disabled = _ref.disabled,
       onChangeEvent = _ref.onChangeEvent;
-  var classes = useStyles$5();
+  var classes = useStyles$6();
   return React__default.createElement("div", {
     className: styles["talk-conduct"]
   }, React__default.createElement("div", {
@@ -84736,6 +84761,7 @@ var CreateSurveyAdmin = function CreateSurveyAdmin() {
 };
 
 var USER_URL$4 = marioCore.BASE_URL + "/api/User";
+var EXCEL_FILE_URL = marioCore.BASE_URL + "/api/ExportDataUser";
 var revertUser = function revertUser(id) {
   return marioCore.api.put(USER_URL$4 + "/revert-user/" + id);
 };
@@ -84745,9 +84771,15 @@ var mergeData = function mergeData(fromId, toId) {
 var resetAcademicYear = function resetAcademicYear() {
   return marioCore.api.put(USER_URL$4 + "/reset-academic-year");
 };
+var importUserDataCSV = function importUserDataCSV(formData, studentUserId) {
+  return marioCore.apiUpload.post(EXCEL_FILE_URL + "/" + studentUserId, formData);
+};
 
 var useRevertUser = function useRevertUser() {
   var dispatch = reactRedux.useDispatch();
+  var isLoading = reactRedux.useSelector(function (state) {
+    return state.common.isLoading;
+  });
 
   var _useState = React.useState(null),
       user = _useState[0],
@@ -84843,6 +84875,38 @@ var useRevertUser = function useRevertUser() {
     }
   };
 
+  var upload = React.useCallback(function (file) {
+    try {
+      var _temp10 = function _temp10() {
+        dispatch(marioCore.setLoading(false));
+      };
+
+      if (!file || !userTo) return Promise.resolve();
+      dispatch(marioCore.setLoading(true));
+
+      var _temp11 = _catch(function () {
+        var formData = new FormData();
+        formData.append("file", file, file.name);
+        return Promise.resolve(importUserDataCSV(formData, userTo === null || userTo === void 0 ? void 0 : userTo.id)).then(function () {
+          dispatch(marioCore.setAlert({
+            type: "success",
+            message: "Import data successfully"
+          }));
+        });
+      }, function (err) {
+        var _err$response4, _err$response4$data;
+
+        dispatch(marioCore.setAlert({
+          type: "danger",
+          message: ((_err$response4 = err.response) === null || _err$response4 === void 0 ? void 0 : (_err$response4$data = _err$response4.data) === null || _err$response4$data === void 0 ? void 0 : _err$response4$data.title) || err.message
+        }));
+      });
+
+      return Promise.resolve(_temp11 && _temp11.then ? _temp11.then(_temp10) : _temp10(_temp11));
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  }, [userTo]);
   return {
     user: user,
     setUser: setUser,
@@ -84852,7 +84916,9 @@ var useRevertUser = function useRevertUser() {
     userTo: userTo,
     setUserTo: setUserTo,
     handelMergeDataUser: handelMergeDataUser,
-    handelResetAcademicYear: handelResetAcademicYear
+    handelResetAcademicYear: handelResetAcademicYear,
+    upload: upload,
+    isLoading: isLoading
   };
 };
 
@@ -84865,6 +84931,8 @@ var RevertUser = function RevertUser() {
       setUserFrom = _useRevertUser.setUserFrom,
       userTo = _useRevertUser.userTo,
       setUserTo = _useRevertUser.setUserTo,
+      upload = _useRevertUser.upload,
+      isLoading = _useRevertUser.isLoading,
       handelMergeDataUser = _useRevertUser.handelMergeDataUser,
       handelResetAcademicYear = _useRevertUser.handelResetAcademicYear;
 
@@ -84912,7 +84980,24 @@ var RevertUser = function RevertUser() {
     onClick: function onClick() {
       return handelResetAcademicYear();
     }
-  }, "Reset academic year"))));
+  }, "Reset academic year")), React__default.createElement(reactstrap.Row, null, React__default.createElement(reactstrap.Input, {
+    id: "import-user",
+    className: "d-none",
+    type: "file",
+    onChange: function onChange(e) {
+      return upload(e.target.files[0]);
+    },
+    accept: "text/xlsx"
+  }), React__default.createElement(marioCore.RequiredLabel, {
+    text: "Import users"
+  }), React__default.createElement(UploadCSVButton, {
+    key: "import-users",
+    htmlFor: "import-user",
+    text: "Import data users",
+    isDisabled: isLoading || !userTo,
+    backgroundColor: "#0abde3",
+    onClick: function onClick() {}
+  }))));
 };
 
 var USER_URL$5 = marioCore.BASE_URL + "/api/User";