mario-education 2.3.4 → 9000.0.0

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/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
@@ -5269,45 +5283,24 @@ var useCSVImport = function useCSVImport() {
   }, []);
   var upload = React.useCallback(function (file) {
     try {
-      var _temp7 = function _temp7() {
+      var _temp3 = function _temp3() {
         dispatch(marioCore.setLoading(false));
         var input = document.getElementById('import-student');
-        var importClass = document.getElementById('import-classReflection');
         input && (input.value = "");
-        importClass && (importClass.value = "");
       };
 
       if (!type || !file) return Promise.resolve();
       dispatch(marioCore.setLoading(true));
 
-      var _temp8 = _catch(function () {
-        function _temp4() {
-          function _temp2() {
-            dispatch(marioCore.setAlert({
-              type: "success",
-              message: "Import CSV successfully"
-            }));
-          }
-
-          var _temp = function () {
-            if (type == CSVType.ClassReflection) {
-              return Promise.resolve(importClassReflectionCSV(formData)).then(function () {});
-            }
-          }();
-
-          return _temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp);
-        }
-
+      var _temp4 = _catch(function () {
         var formData = new FormData();
         formData.append("file", file, file.name);
-
-        var _temp3 = function () {
-          if (type == CSVType.Students) {
-            return Promise.resolve(importStudentCSV(formData)).then(function () {});
-          }
-        }();
-
-        return _temp3 && _temp3.then ? _temp3.then(_temp4) : _temp4(_temp3);
+        return Promise.resolve(importStudentCSV(formData)).then(function () {
+          dispatch(marioCore.setAlert({
+            type: "success",
+            message: "Import CSV successfully"
+          }));
+        });
       }, function (err) {
         var _err$response, _err$response$data;
 
@@ -5317,7 +5310,7 @@ var useCSVImport = function useCSVImport() {
         }));
       });
 
-      return Promise.resolve(_temp8 && _temp8.then ? _temp8.then(_temp7) : _temp7(_temp8));
+      return Promise.resolve(_temp4 && _temp4.then ? _temp4.then(_temp3) : _temp3(_temp4));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -5325,7 +5318,7 @@ var useCSVImport = function useCSVImport() {
 
   var onConfirm = function onConfirm(values) {
     try {
-      var _temp11 = function _temp11() {
+      var _temp7 = function _temp7() {
         dispatch(marioCore.setLoading(false));
         var input = document.getElementById(id);
         input && (input.value = "");
@@ -5334,7 +5327,7 @@ var useCSVImport = function useCSVImport() {
       if (!dataFile || !dataFile) return Promise.resolve();
       dispatch(marioCore.setLoading(true));
 
-      var _temp12 = _catch(function () {
+      var _temp8 = _catch(function () {
         var formData = new FormData();
         formData.append("file", dataFile, dataFile.name);
         formData.append("teacherName", values.teacherName);
@@ -5358,7 +5351,7 @@ var useCSVImport = function useCSVImport() {
         }));
       });
 
-      return Promise.resolve(_temp12 && _temp12.then ? _temp12.then(_temp11) : _temp11(_temp12));
+      return Promise.resolve(_temp8 && _temp8.then ? _temp8.then(_temp7) : _temp7(_temp8));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -5381,14 +5374,13 @@ var useCSVImport = function useCSVImport() {
   };
 };
 
-var _yup$string, _yup$string2, _yup$string3;
 var schema$4 = yup.object({
-  teacherName: (_yup$string = yup.string()) === null || _yup$string === void 0 ? void 0 : _yup$string.trim().required(),
-  teacherEmail: (_yup$string2 = yup.string()) === null || _yup$string2 === void 0 ? void 0 : _yup$string2.trim().email('Invalid email').required(),
+  teacherName: 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;
   }),
-  file: (_yup$string3 = yup.string()) === null || _yup$string3 === void 0 ? void 0 : _yup$string3.trim().required()
+  file: yup.string().required()
 });
 
 var CSVImport = function CSVImport() {
@@ -5402,6 +5394,7 @@ var CSVImport = function CSVImport() {
       dataFile = _useCSVImport.dataFile,
       setDataFile = _useCSVImport.setDataFile,
       setArrStudent = _useCSVImport.setArrStudent,
+      arrStudent = _useCSVImport.arrStudent,
       buttons = _useCSVImport.buttons,
       upload = _useCSVImport.upload;
 
@@ -5415,14 +5408,6 @@ 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, {
@@ -5436,8 +5421,11 @@ var CSVImport = function CSVImport() {
       actions.resetForm();
     }
   }, function (formProps) {
-    var touched = formProps.touched,
-        errors = formProps.errors;
+    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, {
@@ -5458,11 +5446,55 @@ var CSVImport = function CSVImport() {
       md: 12,
       className: "mb-2"
     }, React__default.createElement(marioCore.RequiredLabel, {
-      text: "Import Class Reflection"
+      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: "import-classReflection",
-      text: "Import Class Reflection",
+      htmlFor: id,
+      text: "Import class reflections",
       isDisabled: isLoading,
       backgroundColor: "#e74c3c",
       onClick: function onClick() {
@@ -5479,7 +5511,15 @@ var CSVImport = function CSVImport() {
       className: "mb-2"
     }, touched.file && errors.file && React__default.createElement(marioCore.ErrorHandler, {
       text: errors.file
-    })))), React__default.createElement(reactstrap.Col, {
+    })), 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, {
       md: 6,
       className: "mb-2"
     }, React__default.createElement(reactstrap.Row, null, React__default.createElement(reactstrap.Col, {