mario-education 2.4.200-level → 2.4.201-level

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

@@ -6,7 +6,8 @@ declare enum CSVType {
     Grades = "grades",
     Attendances = "attendances",
     ClassReflection = "classReflection",
-    Others = "others"
+    Others = "others",
+    AllUser = "allUser"
 }
 interface CSVImportButton {
     text: string;
@@ -35,6 +36,6 @@ declare const useCSVImport: () => {
     defaultTeacher: number;
     fileName: string;
     onStudentSubmit: () => void;
-    downloadTemplateStudentISB: () => Promise<void>;
+    downloadTemplateUser: () => Promise<void>;
 };
 export default useCSVImport;

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

@@ -3,3 +3,5 @@ export declare const importCSV: (formData: FormData, subFolder: string) => Promi
 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>>;
+export declare const importUsersCSV: (formData: FormData) => Promise<import("axios").AxiosResponse<any>>;
+export declare const downloadTemplateFileUser: () => Promise<import("axios").AxiosResponse<any>>;

package/dist/index.js

@@ -5635,21 +5635,21 @@ var UploadCSVButton = function UploadCSVButton(_ref) {
 
 var CSV_FILE_URL = marioCore.BASE_URL + "/api/ImportCsv/csv";
 var CSV_FILE_TEACHER = marioCore.BASE_URL + "/api/Teacher";
-var downloadTemplateFile = function downloadTemplateFile() {
-  return marioCore.api.get(CSV_FILE_TEACHER + "/download-template-file-isb");
-};
 var importCSV = function importCSV(formData, subFolder) {
   return marioCore.apiUpload.post(CSV_FILE_URL + "/" + subFolder, formData);
 };
-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 importStudentByTeacher = function importStudentByTeacher(teacherId, formData) {
   return marioCore.apiUpload.post(CSV_FILE_TEACHER + "/adminImportStudentByTeacherId/" + teacherId, formData);
 };
+var importUsersCSV = function importUsersCSV(formData) {
+  return marioCore.apiUpload.post(CSV_FILE_TEACHER + "/adminImport", formData);
+};
+var downloadTemplateFileUser = function downloadTemplateFileUser() {
+  return marioCore.api.get(CSV_FILE_TEACHER + "/download-template-file-user");
+};
 
 var CSVType;
 
@@ -5660,12 +5660,13 @@ var CSVType;
   CSVType["Attendances"] = "attendances";
   CSVType["ClassReflection"] = "classReflection";
   CSVType["Others"] = "others";
+  CSVType["AllUser"] = "allUser";
 })(CSVType || (CSVType = {}));
 
 var isbButtons = [{
-  text: "Import students",
+  text: "Import users",
   backgroundColor: "#0abde3",
-  type: CSVType.Students
+  type: CSVType.AllUser
 }];
 var othersButtons = [{
   text: "Import class reflections",
@@ -5723,7 +5724,7 @@ var useCSVImport = function useCSVImport() {
   }, []);
   var buttons = isCheckDomainIBS ? isbButtons : othersButtons;
 
-  var downloadTemplateStudentISB = function downloadTemplateStudentISB() {
+  var downloadTemplateUser = function downloadTemplateUser() {
     try {
       var _temp3 = function _temp3() {
         dispatch(marioCore.setLoading(false));
@@ -5732,7 +5733,7 @@ var useCSVImport = function useCSVImport() {
       dispatch(marioCore.setLoading(true));
 
       var _temp4 = _catch(function () {
-        return Promise.resolve(downloadTemplateFile()).then(function (res) {
+        return Promise.resolve(downloadTemplateFileUser()).then(function (res) {
           var data = new Blob([res.data.content], {
             type: 'text/csv'
           });
@@ -5786,8 +5787,8 @@ var useCSVImport = function useCSVImport() {
         formData.append("file", file, file.name);
 
         var _temp7 = function () {
-          if (type == CSVType.Students) {
-            return Promise.resolve(importStudentCSV(formData)).then(function () {});
+          if (type == CSVType.AllUser) {
+            return Promise.resolve(importUsersCSV(formData)).then(function () {});
           } else {
             var _temp13 = function () {
               if (isCheckDomainIBS) {
@@ -5961,7 +5962,7 @@ var useCSVImport = function useCSVImport() {
     defaultTeacher: defaultTeacher,
     fileName: fileName,
     onStudentSubmit: onStudentSubmit,
-    downloadTemplateStudentISB: downloadTemplateStudentISB
+    downloadTemplateUser: downloadTemplateUser
   };
 };
 
@@ -5989,7 +5990,7 @@ var CSVImport = function CSVImport() {
       buttons = _useCSVImport.buttons,
       upload = _useCSVImport.upload,
       isCheckDomainIBS = _useCSVImport.isCheckDomainIBS,
-      downloadTemplateStudentISB = _useCSVImport.downloadTemplateStudentISB;
+      downloadTemplateUser = _useCSVImport.downloadTemplateUser;
 
   var _useTranslation = marioCore.useTranslation(),
       t = _useTranslation.t;
@@ -5999,7 +6000,7 @@ var CSVImport = function CSVImport() {
   }, isCheckDomainIBS ? React__default.createElement(React__default.Fragment, null, React__default.createElement(reactstrap.Input, {
     className: "d-none",
     type: "file",
-    id: "import-student",
+    id: "import-user",
     onChange: function onChange(e) {
       return upload(e.target.files[0]);
     },
@@ -6080,7 +6081,7 @@ var CSVImport = function CSVImport() {
       role: "button",
       color: "primary",
       onClick: function onClick() {
-        return downloadTemplateStudentISB();
+        return downloadTemplateUser();
       }
     }, React__default.createElement("p", {
       className: "d-flex align-items-center mb-0"
@@ -6091,11 +6092,11 @@ var CSVImport = function CSVImport() {
       md: 12,
       className: "mb-2"
     }, React__default.createElement(marioCore.RequiredLabel, {
-      text: "Import student"
+      text: "Import users"
     }), buttons.map(function (button) {
       return React__default.createElement(UploadCSVButton, {
         key: button.text,
-        htmlFor: 'import-student',
+        htmlFor: 'import-user',
         text: button.text,
         isDisabled: isLoading,
         backgroundColor: button.backgroundColor,
@@ -6111,7 +6112,7 @@ var CSVImport = function CSVImport() {
     role: "button",
     color: "primary",
     onClick: function onClick() {
-      return downloadTemplateStudentISB();
+      return downloadTemplateUser();
     }
   }, React__default.createElement("p", {
     className: "d-flex align-items-center mb-0"
@@ -6122,7 +6123,7 @@ var CSVImport = function CSVImport() {
     md: 6,
     className: "mb-2"
   }, React__default.createElement(reactstrap.Input, {
-    id: "import-student",
+    id: "import-user",
     className: "d-none",
     type: "file",
     onChange: function onChange(e) {
@@ -6130,15 +6131,15 @@ var CSVImport = function CSVImport() {
     },
     accept: "text/csv"
   }), React__default.createElement(marioCore.RequiredLabel, {
-    text: "Import student"
+    text: "Import users"
   }), React__default.createElement(UploadCSVButton, {
-    key: "import-students",
-    htmlFor: 'import-student',
-    text: "Import students",
+    key: "import-users",
+    htmlFor: 'import-user',
+    text: "Import users",
     isDisabled: isLoading,
     backgroundColor: "#0abde3",
     onClick: function onClick() {
-      setType(CSVType.Students);
+      setType(CSVType.AllUser);
     }
   })), React__default.createElement(reactstrap.Col, {
     md: 6,