mario-education 2.3.0 → 2.3.1

package/dist/MarioFramework.Education/ClientApp/src/containers/CSVImport/hooks/useCSVImport.d.ts

@@ -18,5 +18,13 @@ declare const useCSVImport: () => {
     id: string;
     setType: import("react").Dispatch<import("react").SetStateAction<CSVType | null>>;
     upload: (file: any) => Promise<void>;
+    initImportReflection: any;
+    setInitImportReflection: import("react").Dispatch<any>;
+    onConfirm: (values: any) => Promise<void>;
+    CSVType: typeof CSVType;
+    dataFile: any;
+    setDataFile: import("react").Dispatch<any>;
+    setArrStudent: import("react").Dispatch<any>;
+    arrStudent: any;
 };
 export default useCSVImport;

package/dist/MarioFramework.Education/ClientApp/src/services/csvService.d.ts

@@ -1 +1,2 @@
 export declare const importCSV: (formData: FormData, subFolder: string) => Promise<import("axios").AxiosResponse<any>>;
+export declare const importClassReflectionCSV: (formData: FormData) => Promise<import("axios").AxiosResponse<any>>;

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,
@@ -5215,6 +5212,9 @@ 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 importClassReflectionCSV = function importClassReflectionCSV(formData) {
+  return marioCore.apiUpload.post(CSV_FILE_URL + "/importClassReflection", formData);
+};
 
 var CSVType;
 
@@ -5250,6 +5250,12 @@ var buttons = [{
 }];
 var title = "CSV Import";
 var id = "csvupload";
+var initClassReflect = {
+  teacherName: '',
+  teacherEmail: '',
+  studentIds: [],
+  file: ''
+};
 
 var useCSVImport = function useCSVImport() {
   var dispatch = reactRedux.useDispatch();
@@ -5261,6 +5267,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;
   }, []);
@@ -5298,50 +5316,203 @@ 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);
+        formData.append("studentIds", values.studentIds);
+        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().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,
-      upload = _useCSVImport.upload;
+      id = _useCSVImport.id,
+      CSVType = _useCSVImport.CSVType,
+      dataFile = _useCSVImport.dataFile,
+      setDataFile = _useCSVImport.setDataFile,
+      setArrStudent = _useCSVImport.setArrStudent,
+      arrStudent = _useCSVImport.arrStudent;
 
   return React__default.createElement("div", {
     className: "animated fadeIn pt-3"
-  }, React__default.createElement(reactstrap.Input, {
-    className: "d-none",
-    type: "file",
-    id: id,
-    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,
+  }, React__default.createElement("div", {
+    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: 'red',
+        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"), ' '))));
   })));
 };
 
-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 +5531,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();
@@ -5471,7 +5642,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 +5695,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();
@@ -6102,7 +6273,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 +6291,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 +6960,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 +6979,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();
@@ -8338,7 +8509,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 +8535,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 +9916,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 +10169,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 +10435,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 +10461,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 +11403,7 @@ var FeedbackList = function FeedbackList() {
   }))));
 };
 
-var schema$b = yup.object({
+var schema$c = yup.object({
   name: yup.string().required("Name is required")
 });
 
@@ -11252,7 +11423,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,7 +11903,7 @@ var TutorialScreenContainer = function TutorialScreenContainer() {
   });
 };
 
-var schema$c = yup.object({
+var schema$d = yup.object({
   name: yup.string().required("Name is required")
 });
 
@@ -11749,7 +11920,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();
@@ -12336,7 +12507,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"),
@@ -12372,7 +12543,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();
@@ -14060,7 +14231,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 () {
@@ -14448,7 +14619,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);
@@ -15001,7 +15172,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;
@@ -15085,7 +15256,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);
@@ -15292,7 +15463,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;
   }),
@@ -15322,7 +15493,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();
@@ -15896,7 +16067,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) {
@@ -15921,7 +16092,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;