mario-education 2.4.1 → 2.4.2

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

@@ -1,4 +1,5 @@
 /// <reference types="react" />
+import { Option } from "../../Classes/components/TeacherSelector";
 declare enum CSVType {
     Students = "students",
     Subjects = "subjects",
@@ -27,5 +28,12 @@ declare const useCSVImport: () => {
     setArrStudent: import("react").Dispatch<any>;
     arrStudent: any;
     isCheckDomainIBS: boolean;
+    onChangeTeacher: (teacher: Option) => void;
+    uploadByTeacherId: (file: any) => Promise<void>;
+    setDataFileImportStudent: (dataFile: any) => void;
+    onUpLoadStudentFile: () => void;
+    defaultTeacher: number;
+    fileName: string;
+    onStudentSubmit: () => void;
 };
 export default useCSVImport;

package/dist/MarioFramework.Education/ClientApp/src/containers/Classes/components/TeacherSelector.d.ts

@@ -3,5 +3,9 @@ interface Props {
     defaultValue: number | null | undefined;
     onChange: Function;
 }
+export interface Option {
+    label: string;
+    value: number;
+}
 declare const TeacherSelector: FC<Props>;
 export default TeacherSelector;

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

@@ -1,3 +1,4 @@
 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>>;
+export declare const importStudentByTeacher: (teacherId: number, formData: FormData) => Promise<import("axios").AxiosResponse<any>>;

package/dist/index.css

@@ -1,136 +1,136 @@
-/* add css module styles here (optional) */
-:root {
-    --custom-gray: #ccc;
-    --custom-blue: #0090e3;
-}
-
-
-._3ybTi {
-    margin: 2em;
-    padding: 0.5em;
-    border: 2px solid #000;
-    font-size: 2em;
-    text-align: center;
-}
-._1H0W8 {
-    height: 426px !important;
-}
-tbody._b-AXV {
-    height: 300px;
-    display: block;
-    width: 370px;
-    overflow: auto;
-    border: 2px solid #ced4da;
-    margin-top: 15px;
-}
-tbody._b-AXV::-webkit-scrollbar {
-    width: 10px;
-    background-color: #ced4da;
-}
-tbody._b-AXV tr td {
-    display: block;
-    width: 100%;
-    border: none;
-}
-tbody._b-AXV tr {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    display: -webkit-box;
-    -webkit-line-clamp: 2;
-    -webkit-box-orient: vertical;
-}
-
-._1fgfO {
-    width: 40px;
-    height: 40px;
-}
-
-._2YR4l {
-    width: 40px;
-    height: 20px;
-    border-radius: 4px;
-    box-shadow: 1px 1px rgba(0, 0, 0, 0.4);
-}
-
-._114IY {
-    max-height: 600px;
-}
-
-._qE7J0 {
-    width: 70px;
-}
-
-._2BV3o {
-    width: 300px;
-    font-size: 1.5rem;
-    font-weight: 600;
-}
-
-._1P4F2 {
-    height: 40px;
-}
-
-._1SRmg {
-    font-weight: 500;
-}
-._ZDINp img {
-    width: 100px;
-    height: 100px;
-    border-radius: 50%;
-}
-
-._Kzkzd > i {
-    color: #f9e517;
-    font-size: 25px;
-    margin-right: 10px;
-}
-
-._Q0sF1 {
-    max-height: calc(100vh - 200px);
-    overflow-y: auto;
-    margin-bottom: 8px;
-}
-
-._gu_yD {
-    font-weight: 550;
-    padding: 8px 16px;
-    border: 1px solid var(--custom-gray);
-    border-radius: 4px;
-    margin-bottom: 8px;
-    background-color: white;
-}
-
-._33tYy {
-    background-color: var(--custom-blue);
-    color: white
-}
-._3DVMZ {
-  display: flex;
-  flex: 0 0 17%;
-  flex-direction: column;
-  margin-right: 2rem;
-}
-._3DVMZ > div {
-  border: 1px solid #eaeaea;
-}
-h6._3zOGW {
-  text-decoration: underline;
-  font-size: 13px;
-  cursor: pointer;
-}
-._3DQwX {
-  padding: 10px 0px 20px;
-    border-bottom: 1px solid #cdcdcd;
-}
+/* add css module styles here (optional) */
+:root {
+    --custom-gray: #ccc;
+    --custom-blue: #0090e3;
+}
+
+
+._3ybTi {
+    margin: 2em;
+    padding: 0.5em;
+    border: 2px solid #000;
+    font-size: 2em;
+    text-align: center;
+}
+._1H0W8 {
+    height: 426px !important;
+}
+tbody._b-AXV {
+    height: 300px;
+    display: block;
+    width: 370px;
+    overflow: auto;
+    border: 2px solid #ced4da;
+    margin-top: 15px;
+}
+tbody._b-AXV::-webkit-scrollbar {
+    width: 10px;
+    background-color: #ced4da;
+}
+tbody._b-AXV tr td {
+    display: block;
+    width: 100%;
+    border: none;
+}
+tbody._b-AXV tr {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+}
+
+._1fgfO {
+    width: 40px;
+    height: 40px;
+}
+
+._2YR4l {
+    width: 40px;
+    height: 20px;
+    border-radius: 4px;
+    box-shadow: 1px 1px rgba(0, 0, 0, 0.4);
+}
+
+._114IY {
+    max-height: 600px;
+}
 
-._1Jgr2 {
-    border: 1px solid grey;
-    padding: 16px;
-    min-height: 450px;
-    display: flex;
-    flex-direction: column;
-}
-
-._3Thdy {
-    max-width: 200px;
-}
+._qE7J0 {
+    width: 70px;
+}
+
+._2BV3o {
+    width: 300px;
+    font-size: 1.5rem;
+    font-weight: 600;
+}
+
+._1P4F2 {
+    height: 40px;
+}
+
+._1SRmg {
+    font-weight: 500;
+}
+._ZDINp img {
+    width: 100px;
+    height: 100px;
+    border-radius: 50%;
+}
+
+._Kzkzd > i {
+    color: #f9e517;
+    font-size: 25px;
+    margin-right: 10px;
+}
+
+._Q0sF1 {
+    max-height: calc(100vh - 200px);
+    overflow-y: auto;
+    margin-bottom: 8px;
+}
+
+._gu_yD {
+    font-weight: 550;
+    padding: 8px 16px;
+    border: 1px solid var(--custom-gray);
+    border-radius: 4px;
+    margin-bottom: 8px;
+    background-color: white;
+}
+
+._33tYy {
+    background-color: var(--custom-blue);
+    color: white
+}
+._3DVMZ {
+  display: flex;
+  flex: 0 0 17%;
+  flex-direction: column;
+  margin-right: 2rem;
+}
+._3DVMZ > div {
+  border: 1px solid #eaeaea;
+}
+h6._3zOGW {
+  text-decoration: underline;
+  font-size: 13px;
+  cursor: pointer;
+}
+._3DQwX {
+  padding: 10px 0px 20px;
+    border-bottom: 1px solid #cdcdcd;
+}
+
+._1Jgr2 {
+    border: 1px solid grey;
+    padding: 16px;
+    min-height: 450px;
+    display: flex;
+    flex-direction: column;
+}
+
+._3Thdy {
+    max-width: 200px;
+}

package/dist/index.js

@@ -5195,7 +5195,8 @@ var style = {
   color: "#fff",
   fontWeight: 500,
   fontSize: "0.9em",
-  height: "30px"
+  height: "35px",
+  justifyContent: "center"
 };
 
 var UploadCSVButton = function UploadCSVButton(_ref) {
@@ -5209,7 +5210,7 @@ var UploadCSVButton = function UploadCSVButton(_ref) {
     htmlFor: htmlFor,
     role: "button",
     tabIndex: 0,
-    className: "d-flex align-items-center justfy-content-center \n            " + (isClassReflection ? "w-25" : "") + "\n            " + (!isDisabled ? "cursor-pointer hover-opacity" : ""),
+    className: "d-flex align-items-center justfy-content-center\n            " + (isClassReflection ? "w-25" : "") + "\n            " + (!isDisabled ? "cursor-pointer hover-opacity" : ""),
     style: _extends({}, style, {
       backgroundColor: backgroundColor,
       opacity: !isDisabled ? 1 : 0.5
@@ -5234,6 +5235,9 @@ var importStudentCSV = function importStudentCSV(formData) {
 var importClassReflectionCSV = function importClassReflectionCSV(formData) {
   return marioCore.apiUpload.post(CSV_FILE_URL + "/importClassReflection", formData);
 };
+var importStudentByTeacher = function importStudentByTeacher(teacherId, formData) {
+  return marioCore.apiUpload.post(CSV_FILE_TEACHER + "/adminImportStudentByTeacherId/" + teacherId, formData);
+};
 
 var CSVType;
 
@@ -5282,8 +5286,21 @@ var useCSVImport = function useCSVImport() {
       initImportReflection = _useState4[0],
       setInitImportReflection = _useState4[1];
 
+  var _useState5 = React.useState(),
+      studentDataFile = _useState5[0],
+      setStudentDataFile = _useState5[1];
+
   var domainName = window.location.hostname;
   var isCheckDomainIBS = domainName.includes('isb');
+
+  var _useState6 = React.useState(0),
+      defaultTeacher = _useState6[0],
+      setDefaultTeacher = _useState6[1];
+
+  var _useState7 = React.useState(""),
+      fileName = _useState7[0],
+      setFileName = _useState7[1];
+
   React.useEffect(function () {
     document.title = title;
   }, []);
@@ -5353,9 +5370,52 @@ var useCSVImport = function useCSVImport() {
     }
   }, [type]);
 
-  var onConfirm = function onConfirm(values) {
+  var uploadByTeacherId = function uploadByTeacherId(file) {
     try {
       var _temp14 = function _temp14() {
+        dispatch(marioCore.setLoading(false));
+        var input = document.getElementById('teacherSelector');
+        input && (input.value = "");
+      };
+
+      if (!defaultTeacher) {
+        dispatch(marioCore.setAlert({
+          type: "danger",
+          message: "Select teacher before import csv"
+        }));
+        return Promise.resolve();
+      }
+
+      if (!type || !file) return Promise.resolve();
+      dispatch(marioCore.setLoading(true));
+
+      var _temp15 = _catch(function () {
+        var formData = new FormData();
+        formData.append("file", file, file.name);
+        return Promise.resolve(importStudentByTeacher(defaultTeacher, formData)).then(function () {
+          dispatch(marioCore.setAlert({
+            type: "success",
+            message: "Import CSV successfully"
+          }));
+        });
+      }, 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(_temp15 && _temp15.then ? _temp15.then(_temp14) : _temp14(_temp15));
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
+
+  var onConfirm = function onConfirm(values) {
+    try {
+      var _temp18 = function _temp18() {
         dispatch(marioCore.setLoading(false));
         var input = document.getElementById(id);
         input && (input.value = "");
@@ -5364,7 +5424,7 @@ var useCSVImport = function useCSVImport() {
       if (!dataFile || !dataFile) return Promise.resolve();
       dispatch(marioCore.setLoading(true));
 
-      var _temp15 = _catch(function () {
+      var _temp19 = _catch(function () {
         var formData = new FormData();
         formData.append("file", dataFile, dataFile.name);
         formData.append("teacherName", values.teacherName);
@@ -5380,20 +5440,52 @@ var useCSVImport = function useCSVImport() {
           setInitImportReflection(initClassReflect);
         });
       }, function (err) {
-        var _err$response2, _err$response2$data;
+        var _err$response3, _err$response3$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
+          message: ((_err$response3 = err.response) === null || _err$response3 === void 0 ? void 0 : (_err$response3$data = _err$response3.data) === null || _err$response3$data === void 0 ? void 0 : _err$response3$data.title) || err.message
         }));
       });
 
-      return Promise.resolve(_temp15 && _temp15.then ? _temp15.then(_temp14) : _temp14(_temp15));
+      return Promise.resolve(_temp19 && _temp19.then ? _temp19.then(_temp18) : _temp18(_temp19));
     } catch (e) {
       return Promise.reject(e);
     }
   };
 
+  var onChangeTeacher = function onChangeTeacher(teacher) {
+    setDefaultTeacher(teacher.value);
+  };
+
+  var setDataFileImportStudent = function setDataFileImportStudent(dataFile) {
+    setStudentDataFile(dataFile);
+    setFileName((dataFile === null || dataFile === void 0 ? void 0 : dataFile.name) || "");
+  };
+
+  var onUpLoadStudentFile = function onUpLoadStudentFile() {
+    if (!studentDataFile) {
+      dispatch(marioCore.setAlert({
+        type: "danger",
+        message: "Select CSV to import"
+      }));
+      return;
+    }
+
+    uploadByTeacherId(studentDataFile);
+  };
+
+  var onStudentSubmit = function onStudentSubmit() {
+    dispatch(marioCore.setModal({
+      isOpen: true,
+      type: "warning",
+      message: "Are you sure upload this file?",
+      onConfirm: function onConfirm() {
+        onUpLoadStudentFile();
+      }
+    }));
+  };
+
   return {
     isLoading: isLoading,
     buttons: buttons,
@@ -5408,7 +5500,14 @@ var useCSVImport = function useCSVImport() {
     setDataFile: setDataFile,
     setArrStudent: setArrStudent,
     arrStudent: arrStudent,
-    isCheckDomainIBS: isCheckDomainIBS
+    isCheckDomainIBS: isCheckDomainIBS,
+    onChangeTeacher: onChangeTeacher,
+    uploadByTeacherId: uploadByTeacherId,
+    setDataFileImportStudent: setDataFileImportStudent,
+    onUpLoadStudentFile: onUpLoadStudentFile,
+    defaultTeacher: defaultTeacher,
+    fileName: fileName,
+    onStudentSubmit: onStudentSubmit
   };
 };
 
@@ -5435,10 +5534,15 @@ var CSVImport = function CSVImport() {
       setArrStudent = _useCSVImport.setArrStudent,
       buttons = _useCSVImport.buttons,
       upload = _useCSVImport.upload,
-      isCheckDomainIBS = _useCSVImport.isCheckDomainIBS;
+      isCheckDomainIBS = _useCSVImport.isCheckDomainIBS,
+      onChangeTeacher = _useCSVImport.onChangeTeacher,
+      setDataFileImportStudent = _useCSVImport.setDataFileImportStudent,
+      defaultTeacher = _useCSVImport.defaultTeacher,
+      fileName = _useCSVImport.fileName,
+      onStudentSubmit = _useCSVImport.onStudentSubmit;
 
   return React__default.createElement("div", {
-    className: "animated fadeIn pt-3"
+    className: "animated fadeIn pt-5"
   }, isCheckDomainIBS ? React__default.createElement(React__default.Fragment, null, React__default.createElement(reactstrap.Input, {
     className: "d-none",
     type: "file",
@@ -5531,7 +5635,43 @@ var CSVImport = function CSVImport() {
         }
       });
     })))));
-  }))) : React__default.createElement(React__default.Fragment, null, React__default.createElement(reactstrap.Input, {
+  }))) : React__default.createElement(React__default.Fragment, null, React__default.createElement(reactstrap.Row, null, React__default.createElement(reactstrap.Col, {
+    md: 3,
+    className: "mb-3"
+  }, React__default.createElement(TeacherSelector, {
+    defaultValue: defaultTeacher,
+    onChange: onChangeTeacher
+  }), React__default.createElement("div", {
+    className: "mt-3"
+  }, fileName ? React__default.createElement("span", {
+    className: "font-italic mb-1 font-lg"
+  }, fileName) : null, React__default.createElement(reactstrap.Input, {
+    className: "d-none",
+    type: "file",
+    id: "teacherSelector",
+    onChange: function onChange(e) {
+      return setDataFileImportStudent(e.target.files[0]);
+    },
+    accept: "text/csv"
+  }), React__default.createElement(UploadCSVButton, {
+    key: "Import student",
+    htmlFor: "teacherSelector",
+    text: "Select CSV",
+    isDisabled: isLoading,
+    backgroundColor: "#e74c3c",
+    onClick: function onClick() {
+      return setType(CSVType.Students);
+    }
+  })), React__default.createElement(reactstrap.Button, {
+    color: "success",
+    onClick: onStudentSubmit,
+    className: "w-100 mt-3"
+  }, "Import")), React__default.createElement(reactstrap.Col, {
+    md: 3
+  }), React__default.createElement(reactstrap.Col, {
+    md: 3,
+    className: "mb-3"
+  }, React__default.createElement(reactstrap.Input, {
     className: "d-none",
     type: "file",
     id: id,
@@ -5539,9 +5679,7 @@ var CSVImport = function CSVImport() {
       return upload(e.target.files[0]);
     },
     accept: "text/csv"
-  }), React__default.createElement("div", {
-    className: "d-flex align-items-center"
-  }, buttons.map(function (button) {
+  }), buttons.map(function (button) {
     return React__default.createElement(UploadCSVButton, {
       key: button.text,
       htmlFor: id,
@@ -5552,7 +5690,7 @@ var CSVImport = function CSVImport() {
         return setType(button.type);
       }
     });
-  }))));
+  })))));
 };
 
 var schema$5 = yup.object({