mario-teacher-student-client 9000.0.14 → 9000.0.15

package/dist/containers/ActivityCircle/hooks/useListDetailActivity.d.ts

@@ -19,6 +19,6 @@ declare const useListDetailActivity: () => {
     setFile: import("react").Dispatch<any>;
     confirmData: (values: any, cb: any) => Promise<void>;
     getData: () => Promise<void>;
-    deleteActivity: (studentId: number, activityId: number) => Promise<void>;
+    deleteActivity: (studentId: number, activityId: number, cb?: any) => Promise<void>;
 };
 export default useListDetailActivity;

package/dist/index.js

@@ -29610,7 +29610,6 @@ var FriendCircleLearning = function FriendCircleLearning() {
 var styles$q = {"block-friend":"_2Wi6k","block-view":"_npp6I","button-view":"_248rc","block-item-friend-1":"_1DLhQ","block-item-friend-2":"_2bHBT","block-item-friend-3":"_2rdAc","block-item-friend-4":"_32V3N","list-item-note":"_bEQOL","item-note-1":"_2LDWj","item-note-2":"_232v0","item-note-3":"_3Rm0X","item-note-4":"_2o4NX","dialog-box":"_3Xq0t","simple-dialog-title":"_2nK-E","dialog-box-input":"_1bCme","dialog-box-title":"_1cbOw","dialog-box-button":"_XdCJL","dialog-button-add":"_1AFOo","dialog-button-cancel":"_3Jepk","button-edit":"_kb6Ui","gr-action":"_RdA3i","btn-request":"_N2AkR","filter-type":"_1Mg3a","search-input":"_1LH-q","search-input-icon":"_NY-nw","inputInput":"_3-ciL","table-border":"_EK-2y","table-row":"_25sma","row_name":"_13KPp","avatar_user":"_EjXlz","row_grade":"_tel45","row_type":"_r0src","duration":"_fXyit","request":"_3c49N","content-modal":"_MZRHg","form-upload":"_fbKnI","avatarimage":"_xrtuk","icon-upload":"_24zk-"};
 
 var ACTIVITY_CIRCLE = marioCore.BASE_URL + "/api/Student";
-var SYSTEM_PROFILE$2 = marioCore.BASE_URL + "/api/file/system/profile";
 var getTotalActivityCount = function getTotalActivityCount() {
   return marioCore.api.get(ACTIVITY_CIRCLE + "/activityCircleAllStudent");
 };
@@ -29631,9 +29630,6 @@ var update$1 = function update(studentId, activityId, data) {
 var remove = function remove(studentId, activityId) {
   return marioCore.api["delete"](ACTIVITY_CIRCLE + "/" + studentId + "/studentActivities/" + activityId);
 };
-var systemProfileUpload$2 = function systemProfileUpload(formData) {
-  return marioCore.api.post(SYSTEM_PROFILE$2, formData);
-};
 
 var useTotalActivity = function useTotalActivity() {
   var dispatch = reactRedux.useDispatch();
@@ -33854,36 +33850,18 @@ var useListDetailActivity = function useListDetailActivity() {
 
   var confirmData = React.useCallback(function (values, cb) {
     try {
-      var _temp9 = function _temp9() {
+      var _temp7 = function _temp7() {
         dispatch(marioCore.setLoading(false));
       };
 
       dispatch(marioCore.setLoading(true));
 
-      var _temp10 = _catch(function () {
-        function _temp6() {
-          var createOrUpdate = !!acticityId ? update$1(parseInt(studentId || "0"), acticityId, values) : create$1(parseInt(studentId || "0"), values);
-          return Promise.resolve(createOrUpdate).then(function () {
-            !!cb && cb();
-            !!acticityId && setActivityId(0);
-          });
-        }
-
-        var _temp5 = function () {
-          if (!!file) {
-            var formData = new FormData();
-            var name = file.name;
-            formData.append("file", file, name);
-            return Promise.resolve(systemProfileUpload$2(formData)).then(function (res) {
-              var _res$data;
-
-              var imageUrl = res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.key;
-              values.imageUrl = imageUrl;
-            });
-          }
-        }();
-
-        return _temp5 && _temp5.then ? _temp5.then(_temp6) : _temp6(_temp5);
+      var _temp8 = _catch(function () {
+        var createOrUpdate = !!acticityId ? update$1(parseInt(studentId || "0"), acticityId, values) : create$1(parseInt(studentId || "0"), values);
+        return Promise.resolve(createOrUpdate).then(function () {
+          !!cb && cb();
+          !!acticityId && setActivityId(0);
+        });
       }, function (e) {
         var _e$response2, _e$response2$data;
 
@@ -33893,26 +33871,27 @@ var useListDetailActivity = function useListDetailActivity() {
         }));
       });
 
-      return Promise.resolve(_temp10 && _temp10.then ? _temp10.then(_temp9) : _temp9(_temp10));
+      return Promise.resolve(_temp8 && _temp8.then ? _temp8.then(_temp7) : _temp7(_temp8));
     } catch (e) {
       return Promise.reject(e);
     }
   }, [acticityId, myGoalCircle]);
 
-  var deleteActivity = function deleteActivity(studentId, activityId) {
+  var deleteActivity = function deleteActivity(studentId, activityId, cb) {
     try {
-      var _temp13 = function _temp13() {
+      var _temp11 = function _temp11() {
         dispatch(marioCore.setLoading(false));
       };
 
       dispatch(marioCore.setLoading(true));
 
-      var _temp14 = _catch(function () {
+      var _temp12 = _catch(function () {
         return Promise.resolve(remove(studentId, activityId)).then(function () {
           dispatch(marioCore.setAlert({
             type: "success",
             message: "Delete successfully"
           }));
+          !!cb && cb();
         });
       }, function (e) {
         var _e$response3, _e$response3$data;
@@ -33923,7 +33902,7 @@ var useListDetailActivity = function useListDetailActivity() {
         }));
       });
 
-      return Promise.resolve(_temp14 && _temp14.then ? _temp14.then(_temp13) : _temp13(_temp14));
+      return Promise.resolve(_temp12 && _temp12.then ? _temp12.then(_temp11) : _temp11(_temp12));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -34011,6 +33990,8 @@ var useListActivity = function useListActivity() {
   };
 };
 
+var DEFAULT_USER_AVATAR$l = "/images/image-default.png";
+
 var ModalGoalActivity = function ModalGoalActivity(props, ref) {
   var header = props.header,
       confirmText = props.confirmText,
@@ -34020,7 +34001,8 @@ var ModalGoalActivity = function ModalGoalActivity(props, ref) {
       isCreate = props.isCreate,
       setFile = props.setFile,
       deleteActivity = props.deleteActivity,
-      acticityId = props.acticityId;
+      acticityId = props.acticityId,
+      getActivityListData = props.getActivityListData;
   var dispatch = reactRedux.useDispatch();
   var targetImage = React.useRef();
 
@@ -34061,6 +34043,9 @@ var ModalGoalActivity = function ModalGoalActivity(props, ref) {
       handleClose: handleClose
     };
   });
+  React.useEffect(function () {
+    setImagePreviewUrl("");
+  }, [isOpen]);
   var MAX_SIZE = 20097152;
 
   var _useState2 = React.useState(""),
@@ -34089,10 +34074,27 @@ var ModalGoalActivity = function ModalGoalActivity(props, ref) {
     }
   };
 
-  var imageSrc = imagePreviewUrl || marioCore.getFileUrl(myGoalCircle === null || myGoalCircle === void 0 ? void 0 : myGoalCircle.imageUrl);
+  var imageSrc = React.useMemo(function () {
+    if (imagePreviewUrl != '') {
+      return imagePreviewUrl;
+    }
+
+    if ((myGoalCircle === null || myGoalCircle === void 0 ? void 0 : myGoalCircle.imageUrl) != '') {
+      return myGoalCircle === null || myGoalCircle === void 0 ? void 0 : myGoalCircle.imageUrl;
+    } else {
+      if (!!acticityId && (myGoalCircle === null || myGoalCircle === void 0 ? void 0 : myGoalCircle.imageUrl) == '') {
+        return DEFAULT_USER_AVATAR$l;
+      }
+
+      return '';
+    }
+  }, [myGoalCircle, imagePreviewUrl, acticityId]);
 
   var removeAcitivity = function removeAcitivity() {
-    deleteActivity(studentId, acticityId);
+    deleteActivity(studentId, acticityId, function () {
+      setIsOpen(false);
+      getActivityListData();
+    });
   };
 
   return React__default.createElement(formik.Formik, {
@@ -34101,8 +34103,10 @@ var ModalGoalActivity = function ModalGoalActivity(props, ref) {
     validationSchema: schema,
     onSubmit: function onSubmit(values, actions) {
       values.studentId = parseInt(studentId);
+      values.imageUrl = imagePreviewUrl;
       onConfirm(values);
       actions.resetForm();
+      setImagePreviewUrl("");
     }
   }, function (formikProps) {
     var values = formikProps.values,
@@ -34202,7 +34206,7 @@ var ModalGoalActivity = function ModalGoalActivity(props, ref) {
 
 var ModalGoalActivity$1 = React.forwardRef(ModalGoalActivity);
 
-var DEFAULT_USER_AVATAR$l = "/images/image-default.png";
+var DEFAULT_USER_AVATAR$m = "/images/image-default.png";
 
 var ListActivityLearning = function ListActivityLearning() {
   var _useListDetailActivit = useListDetailActivity(),
@@ -34286,7 +34290,8 @@ var ListActivityLearning = function ListActivityLearning() {
     isCreate: isCreate,
     setFile: setFile,
     deleteActivity: deleteActivity,
-    acticityId: acticityId
+    acticityId: acticityId,
+    getActivityListData: getActivityListData
   }), React__default.createElement(HeaderLearningPlan, {
     text: "Activity List",
     isShowButtonBackGround: true,
@@ -34375,7 +34380,7 @@ var ListActivityLearning = function ListActivityLearning() {
       height: 80,
       className: "" + styles$q["row_name"]
     }, React__default.createElement("img", {
-      src: !!row.imageUrl ? row.imageUrl : DEFAULT_USER_AVATAR$l,
+      src: !!row.imageUrl ? row.imageUrl : DEFAULT_USER_AVATAR$m,
       alt: "",
       className: "" + styles$q["avatar_user"]
     }), row.name), React__default.createElement(core.TableCell, {
@@ -37657,7 +37662,7 @@ var useClassReflectionList$1 = function useClassReflectionList() {
 
 var styles$B = {"table-border":"_3DZEC","table-row":"_26P31","row_type":"_1AL56","duration":"_3LIe0","request":"_3xPaL","impact_score":"_3LCKu","row_name":"_-43QB","avatar_user":"_3QuLn","row_grade":"_2qavH","row_time":"_1Jt3s","time":"_1CQc9","row_class_type":"_1Ok_-","box-filter":"_2Im9q","box-filter-item":"_3nSSt","gr-action":"_34QFV","btn-request":"_2m8fl","search-input":"_3j3Pk","search-input-icon":"_h3gqE","inputInput":"_2gDJN","row_state_done":"_3ibCi","row_state_missed":"_2Ssf_","row_state_notsent":"_221OL","row_state_default":"_Px9sV","box-todo-content-gr":"_2vc2E","box-student-mobile":"_2MyQa","box-student-top":"_1XC2j","box-student-top-box":"_1Owjo","box-student-top-name":"_21rcr","box-student-top-class":"_3PDvN","box-student-content":"_2rnGC","class-reflection-box":"_2Wey9","reflection-avatar-content":"_3Tm0l","reflection-avatar":"_hGRgn","reflection-name":"_OXSEg","reflection-content":"_1HBcc","class-reflection-science-class":"_2DStO","reflection-info":"_3wSMy","reflection-info-gr":"_3v_VO","header-box":"_yw424","header-box-title":"_1aJh-","row-send-date":"_1JhNh","table-cell":"_2racV","table-body":"_27Gto","table-class-type":"_1NNAh","table-class-date":"_2XwAn","date":"_2Dt0k","student-detail":"_XWeBE","send-date":"_2Ixp9","send-time":"_3sSJt","table-desktop":"_2Smul","table-mobile":"_3QMOg","arrow-icon":"_B5tAK"};
 
-var DEFAULT_USER_AVATAR$m = "/images/image-default.png";
+var DEFAULT_USER_AVATAR$n = "/images/image-default.png";
 
 var MyClassReflection = function MyClassReflection() {
   var _classReflectionData$, _classReflectionData$2;
@@ -37996,7 +38001,7 @@ var MyClassReflection = function MyClassReflection() {
       className: "" + styles$B["student-detail"]
     }, React__default.createElement("img", {
       className: styles$B["reflection-avatar"] + " " + styles$B["avatar_user"],
-      src: !!(row !== null && row !== void 0 && row.studentAvatar) ? row === null || row === void 0 ? void 0 : row.studentAvatar : DEFAULT_USER_AVATAR$m
+      src: !!(row !== null && row !== void 0 && row.studentAvatar) ? row === null || row === void 0 ? void 0 : row.studentAvatar : DEFAULT_USER_AVATAR$n
     }), row.studentName)), React__default.createElement(core.TableCell, {
       align: "left",
       style: {
@@ -38067,7 +38072,7 @@ var MyClassReflection = function MyClassReflection() {
         marginRight: "10px"
       },
       className: styles$B["reflection-avatar"] + " " + styles$B["avatar_user"],
-      src: !!(row !== null && row !== void 0 && row.teacherAvatar) ? row === null || row === void 0 ? void 0 : row.teacherAvatar : DEFAULT_USER_AVATAR$m
+      src: !!(row !== null && row !== void 0 && row.teacherAvatar) ? row === null || row === void 0 ? void 0 : row.teacherAvatar : DEFAULT_USER_AVATAR$n
     }), React__default.createElement(core.Typography, {
       className: "" + styles$B["reflection-name"]
     }, row.teacherName)), React__default.createElement(core.Grid, {