mario-education 2.3.3 → 9000.0.1

package/dist/MarioFramework.Education/ClientApp/src/containers/CSVImport/components/UploadCSVButton.d.ts

@@ -5,7 +5,6 @@ interface Props {
     text: string;
     backgroundColor: string;
     onClick: Function;
-    isClassReflection?: boolean;
 }
 declare const UploadCSVButton: FC<Props>;
 export default UploadCSVButton;

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

@@ -26,5 +26,6 @@ declare const useCSVImport: () => {
     setDataFile: import("react").Dispatch<any>;
     setArrStudent: import("react").Dispatch<any>;
     arrStudent: any;
+    isCheckDomainIBS: boolean;
 };
 export default useCSVImport;

package/dist/MarioFramework.Education/ClientApp/src/containers/LearningStrategy/hooks/useStrategyDetail.d.ts

@@ -2,6 +2,7 @@
 declare type StrategyDetail = {
     name: string;
     description?: string;
+    bestfit?: string;
 };
 declare const useStrategyDetail: () => {
     id: number;

package/dist/index.js

@@ -2748,8 +2748,9 @@ var StrategyDetailModal = function StrategyDetailModal(props, ref) {
     }), touched.name && errors.name && React__default.createElement(marioCore.ErrorHandler, {
       text: errors.name
     })), React__default.createElement(reactstrap.Col, {
-      md: 12
-    }, React__default.createElement(reactstrap.Label, null, "Description"), React__default.createElement(reactstrap.Input, {
+      md: 12,
+      className: "mb-2"
+    }, React__default.createElement(reactstrap.Label, null, "Detail"), React__default.createElement(reactstrap.Input, {
       type: "textarea",
       rows: 5,
       name: "description",
@@ -2760,6 +2761,19 @@ var StrategyDetailModal = function StrategyDetailModal(props, ref) {
         setEditedTrue();
       },
       onBlur: handleBlur("description")
+    })), React__default.createElement(reactstrap.Col, {
+      md: 12
+    }, React__default.createElement(reactstrap.Label, null, "Best fit"), React__default.createElement(reactstrap.Input, {
+      type: "textarea",
+      rows: 5,
+      name: "bestfit",
+      placeholder: "Best fit",
+      value: values.bestfit,
+      onChange: function onChange(e) {
+        handleChange(e);
+        setEditedTrue();
+      },
+      onBlur: handleBlur("bestfit")
     }))));
   });
 };
@@ -2885,7 +2899,8 @@ var useStrategyList = function useStrategyList() {
 
 var initValue$3 = {
   name: "",
-  description: ""
+  description: "",
+  bestfit: ""
 };
 
 var useStrategyDetail = function useStrategyDetail() {
@@ -3091,7 +3106,7 @@ var LearningStrategyList = function LearningStrategyList() {
     className: "align-top"
   }, "Strategy name"), React__default.createElement("th", {
     className: "align-top"
-  }, "Description"), React__default.createElement("th", {
+  }, "Detail"), React__default.createElement("th", {
     className: "text-center"
   }, "Action"))), React__default.createElement("tbody", null, strategyList.map(function (record) {
     return React__default.createElement("tr", {
@@ -5188,13 +5203,12 @@ var UploadCSVButton = function UploadCSVButton(_ref) {
       isDisabled = _ref.isDisabled,
       text = _ref.text,
       backgroundColor = _ref.backgroundColor,
-      _onClick = _ref.onClick,
-      isClassReflection = _ref.isClassReflection;
+      _onClick = _ref.onClick;
   return React__default.createElement(reactstrap.Label, {
     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 " + (!isDisabled ? "cursor-pointer hover-opacity" : ""),
     style: _extends({}, style, {
       backgroundColor: backgroundColor,
       opacity: !isDisabled ? 1 : 0.5
@@ -5210,6 +5224,9 @@ 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 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);
 };
@@ -5229,9 +5246,9 @@ var CSVType;
 })(CSVType || (CSVType = {}));
 
 var buttons = [{
-  text: "Import students",
-  backgroundColor: "#0abde3",
-  type: CSVType.Students
+  text: "Import class reflections",
+  backgroundColor: "#e74c3c",
+  type: CSVType.ClassReflection
 }];
 var title = "CSV Import";
 var id = "csvupload";
@@ -5264,29 +5281,62 @@ var useCSVImport = function useCSVImport() {
       initImportReflection = _useState4[0],
       setInitImportReflection = _useState4[1];
 
+  var domainName = window.location.hostname;
+  var isCheckDomainIBS = domainName.includes('isb');
   React.useEffect(function () {
     document.title = title;
   }, []);
   var upload = React.useCallback(function (file) {
     try {
-      var _temp3 = function _temp3() {
+      var _temp8 = function _temp8() {
         dispatch(marioCore.setLoading(false));
+        var inputId = document.getElementById(id);
         var input = document.getElementById('import-student');
+        var importClass = document.getElementById('import-classReflection');
+        inputId && (inputId.value = "");
         input && (input.value = "");
+        importClass && (importClass.value = "");
       };
 
       if (!type || !file) return Promise.resolve();
       dispatch(marioCore.setLoading(true));
 
-      var _temp4 = _catch(function () {
-        var formData = new FormData();
-        formData.append("file", file, file.name);
-        return Promise.resolve(importStudentCSV(formData)).then(function () {
+      var _temp9 = _catch(function () {
+        function _temp5() {
           dispatch(marioCore.setAlert({
             type: "success",
             message: "Import CSV successfully"
           }));
-        });
+        }
+
+        var formData = new FormData();
+        formData.append("file", file, file.name);
+
+        var _temp4 = function () {
+          if (isCheckDomainIBS) {
+            var _temp10 = function _temp10() {
+              var _temp = function () {
+                if (type == CSVType.ClassReflection) {
+                  return Promise.resolve(importClassReflectionCSV(formData)).then(function () {});
+                }
+              }();
+
+              if (_temp && _temp.then) return _temp.then(function () {});
+            };
+
+            var _temp11 = function () {
+              if (type == CSVType.Students) {
+                return Promise.resolve(importStudentCSV(formData)).then(function () {});
+              }
+            }();
+
+            return _temp11 && _temp11.then ? _temp11.then(_temp10) : _temp10(_temp11);
+          } else {
+            return Promise.resolve(importCSV(formData, type.toString())).then(function () {});
+          }
+        }();
+
+        return _temp4 && _temp4.then ? _temp4.then(_temp5) : _temp5(_temp4);
       }, function (err) {
         var _err$response, _err$response$data;
 
@@ -5296,7 +5346,7 @@ var useCSVImport = function useCSVImport() {
         }));
       });
 
-      return Promise.resolve(_temp4 && _temp4.then ? _temp4.then(_temp3) : _temp3(_temp4));
+      return Promise.resolve(_temp9 && _temp9.then ? _temp9.then(_temp8) : _temp8(_temp9));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -5304,7 +5354,7 @@ var useCSVImport = function useCSVImport() {
 
   var onConfirm = function onConfirm(values) {
     try {
-      var _temp7 = function _temp7() {
+      var _temp14 = function _temp14() {
         dispatch(marioCore.setLoading(false));
         var input = document.getElementById(id);
         input && (input.value = "");
@@ -5313,7 +5363,7 @@ var useCSVImport = function useCSVImport() {
       if (!dataFile || !dataFile) return Promise.resolve();
       dispatch(marioCore.setLoading(true));
 
-      var _temp8 = _catch(function () {
+      var _temp15 = _catch(function () {
         var formData = new FormData();
         formData.append("file", dataFile, dataFile.name);
         formData.append("teacherName", values.teacherName);
@@ -5337,7 +5387,7 @@ var useCSVImport = function useCSVImport() {
         }));
       });
 
-      return Promise.resolve(_temp8 && _temp8.then ? _temp8.then(_temp7) : _temp7(_temp8));
+      return Promise.resolve(_temp15 && _temp15.then ? _temp15.then(_temp14) : _temp14(_temp15));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -5356,7 +5406,8 @@ var useCSVImport = function useCSVImport() {
     dataFile: dataFile,
     setDataFile: setDataFile,
     setArrStudent: setArrStudent,
-    arrStudent: arrStudent
+    arrStudent: arrStudent,
+    isCheckDomainIBS: isCheckDomainIBS
   };
 };
 
@@ -5380,13 +5431,13 @@ var CSVImport = function CSVImport() {
       dataFile = _useCSVImport.dataFile,
       setDataFile = _useCSVImport.setDataFile,
       setArrStudent = _useCSVImport.setArrStudent,
-      arrStudent = _useCSVImport.arrStudent,
       buttons = _useCSVImport.buttons,
-      upload = _useCSVImport.upload;
+      upload = _useCSVImport.upload,
+      isCheckDomainIBS = _useCSVImport.isCheckDomainIBS;
 
   return React__default.createElement("div", {
     className: "animated fadeIn pt-3"
-  }, React__default.createElement(reactstrap.Input, {
+  }, isCheckDomainIBS ? React__default.createElement(React__default.Fragment, null, React__default.createElement(reactstrap.Input, {
     className: "d-none",
     type: "file",
     id: "import-student",
@@ -5394,6 +5445,14 @@ var CSVImport = function CSVImport() {
       return upload(e.target.files[0]);
     },
     accept: "text/csv"
+  }), React__default.createElement(reactstrap.Input, {
+    className: "d-none",
+    type: "file",
+    id: "import-classReflection",
+    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, {
@@ -5407,11 +5466,8 @@ var CSVImport = function CSVImport() {
       actions.resetForm();
     }
   }, function (formProps) {
-    var values = formProps.values,
-        touched = formProps.touched,
-        errors = formProps.errors,
-        handleSubmit = formProps.handleSubmit,
-        handleChange = formProps.handleChange;
+    var touched = formProps.touched,
+        errors = formProps.errors;
     return React__default.createElement(reactstrap.Row, {
       className: "mb-2"
     }, React__default.createElement(reactstrap.Input, {
@@ -5432,56 +5488,11 @@ var CSVImport = function CSVImport() {
       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"
+      text: "Import Class Reflection"
     }), React__default.createElement(UploadCSVButton, {
       key: "Import class reflections",
-      isClassReflection: true,
-      htmlFor: id,
-      text: "Upload File",
+      htmlFor: "import-classReflection",
+      text: "Import Class Reflection",
       isDisabled: isLoading,
       backgroundColor: "#e74c3c",
       onClick: function onClick() {
@@ -5498,15 +5509,7 @@ var CSVImport = function CSVImport() {
       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"), ' '))), React__default.createElement(reactstrap.Col, {
+    })))), React__default.createElement(reactstrap.Col, {
       md: 6,
       className: "mb-2"
     }, React__default.createElement(reactstrap.Row, null, React__default.createElement(reactstrap.Col, {
@@ -5526,7 +5529,28 @@ var CSVImport = function CSVImport() {
         }
       });
     })))));
-  })));
+  }))) : React__default.createElement(React__default.Fragment, null, 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,
+      htmlFor: id,
+      text: button.text,
+      isDisabled: isLoading,
+      backgroundColor: button.backgroundColor,
+      onClick: function onClick() {
+        return setType(button.type);
+      }
+    });
+  }))));
 };
 
 var schema$5 = yup.object({