mario-education 2.3.1 → 2.3.2

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

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

package/dist/index.js

@@ -5175,7 +5175,6 @@ var LearningSupportCategoryList = function LearningSupportCategoryList() {
 
 var style = {
   padding: "4px 8px",
-  marginRight: 16,
   marginBottom: 0,
   borderRadius: "2px",
   color: "#fff",
@@ -5209,8 +5208,9 @@ 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);
@@ -5228,25 +5228,9 @@ 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";
@@ -5286,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 = "");
       };
 
@@ -5296,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"
@@ -5333,7 +5317,9 @@ var useCSVImport = function useCSVImport() {
         formData.append("file", dataFile, dataFile.name);
         formData.append("teacherName", values.teacherName);
         formData.append("teacherEmail", values.teacherEmail);
-        formData.append("studentIds", values.studentIds);
+        values.studentIds.forEach(function (item) {
+          formData.append("studentIds", item);
+        });
         return Promise.resolve(importClassReflectionCSV(formData)).then(function () {
           dispatch(marioCore.setAlert({
             type: "success",
@@ -5375,7 +5361,7 @@ var useCSVImport = function useCSVImport() {
 
 var schema$4 = yup.object({
   teacherName: yup.string().required(),
-  teacherEmail: 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;
   }),
@@ -5393,11 +5379,21 @@ var CSVImport = function CSVImport() {
       dataFile = _useCSVImport.dataFile,
       setDataFile = _useCSVImport.setDataFile,
       setArrStudent = _useCSVImport.setArrStudent,
-      arrStudent = _useCSVImport.arrStudent;
+      arrStudent = _useCSVImport.arrStudent,
+      buttons = _useCSVImport.buttons,
+      upload = _useCSVImport.upload;
 
   return React__default.createElement("div", {
     className: "animated fadeIn pt-3"
-  }, React__default.createElement("div", {
+  }, React__default.createElement(reactstrap.Input, {
+    className: "d-none",
+    type: "file",
+    id: "import-student",
+    onChange: function onChange(e) {
+      return upload(e.target.files[0]);
+    },
+    accept: "text/csv"
+  }), React__default.createElement("div", {
     className: "class-reflection"
   }, React__default.createElement(formik.Formik, {
     initialValues: initImportReflection,
@@ -5491,7 +5487,7 @@ var CSVImport = function CSVImport() {
       }
     }), !!dataFile && React__default.createElement("p", {
       style: {
-        color: 'red',
+        color: '#007bff',
         fontStyle: 'italic',
         marginTop: '5px'
       }
@@ -5508,7 +5504,26 @@ var CSVImport = function CSVImport() {
       onClick: function onClick() {
         return handleSubmit();
       }
-    }, "Import"), ' '))));
+    }, "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);
+        }
+      });
+    })))));
   })));
 };