mario-education 2.4.21-beta → 2.4.23-beta

package/dist/MarioFramework.Education/ClientApp/src/containers/SwitchAssistant/hooks/useSwitchAssistant.d.ts

@@ -13,5 +13,6 @@ declare const useSwitchAssistant: () => {
     removeData: (teacherUserId: string, studentId: number) => Promise<void>;
     resetData: () => void;
     choiceUser: (userChoiced: IStudentAssistantItem) => void;
+    onDeleteAssistant: (studentId: number) => Promise<void>;
 };
 export default useSwitchAssistant;

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

@@ -4,3 +4,4 @@ export declare const getStudentAssistant: (data: IStudentWidthAssistant) => Prom
 export declare const getAssistant: () => Promise<import("axios").AxiosResponse<any>>;
 export declare const getAssistantByStudentId: (studentId: number) => Promise<import("axios").AxiosResponse<any>>;
 export declare const changeAssistantOfStudent: (id: number, assistantUserId: string) => Promise<import("axios").AxiosResponse<any>>;
+export declare const removeAssistantForStudent: (studentId: number) => Promise<import("axios").AxiosResponse<any>>;

package/dist/index.js

@@ -8413,6 +8413,13 @@ var changeAssistantOfStudent = function changeAssistantOfStudent(id, assistantUs
     assistantUserId: assistantUserId
   });
 };
+var removeAssistantForStudent = function removeAssistantForStudent(studentId) {
+  return marioCore.api["delete"](USER_URL$2 + "/remove-assistant", {
+    params: {
+      studentId: studentId
+    }
+  });
+};
 
 var INITIAL_USER_CHOICE = {
   id: 0,
@@ -8460,7 +8467,6 @@ var useSwitchAssistant = function useSwitchAssistant() {
       };
 
       dispatch(marioCore.setLoading(true));
-      console.log(filters);
 
       var _temp4 = _catch(function () {
         return Promise.resolve(getStudentAssistant(filters)).then(function (res) {
@@ -8577,6 +8583,45 @@ var useSwitchAssistant = function useSwitchAssistant() {
     }
   };
 
+  var onDeleteAssistant = function onDeleteAssistant(studentId) {
+    try {
+      dispatch(marioCore.setLoading(true));
+      dispatch(marioCore.setModal({
+        isOpen: true,
+        type: "warning",
+        message: "Do you want to remove this Assistant?",
+        onConfirm: function () {
+          try {
+            var _temp12 = _catch(function () {
+              return Promise.resolve(removeAssistantForStudent(studentId)).then(function () {
+                getStudentAssistantData();
+                dispatch(marioCore.setAlert({
+                  type: "success",
+                  message: "Remove assistant successfully"
+                }));
+              });
+            }, function (err) {
+              var _err$response4, _err$response4$data;
+
+              dispatch(marioCore.setAlert({
+                type: "danger",
+                message: ((_err$response4 = err.response) === null || _err$response4 === void 0 ? void 0 : (_err$response4$data = _err$response4.data) === null || _err$response4$data === void 0 ? void 0 : _err$response4$data.title) || err.message
+              }));
+            });
+
+            return Promise.resolve(_temp12 && _temp12.then ? _temp12.then(function () {}) : void 0);
+          } catch (e) {
+            return Promise.reject(e);
+          }
+        }
+      }));
+      dispatch(marioCore.setLoading(false));
+      return Promise.resolve();
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
+
   React.useEffect(function () {
     document.title = TITLE$d;
   }, []);
@@ -8598,7 +8643,8 @@ var useSwitchAssistant = function useSwitchAssistant() {
     assistantChangeId: assistantChangeId,
     removeData: removeData,
     resetData: resetData,
-    choiceUser: choiceUser
+    choiceUser: choiceUser,
+    onDeleteAssistant: onDeleteAssistant
   };
 };
 
@@ -8661,7 +8707,8 @@ var SwitchAssistantList = function SwitchAssistantList() {
       assistantChangeId = _useSwitchTeacher.assistantChangeId,
       removeData = _useSwitchTeacher.removeData,
       resetData = _useSwitchTeacher.resetData,
-      choiceUser = _useSwitchTeacher.choiceUser;
+      choiceUser = _useSwitchTeacher.choiceUser,
+      onDeleteAssistant = _useSwitchTeacher.onDeleteAssistant;
 
   return React__default.createElement("div", {
     className: "fadeIn animated"
@@ -8700,7 +8747,9 @@ var SwitchAssistantList = function SwitchAssistantList() {
     className: "align-top"
   }, "Current Assistant Name"), React__default.createElement("th", {
     className: "align-top"
-  }, "Current Assistant Email"))), React__default.createElement("tbody", null, !!userList && userList.length > 0 && userList.map(function (record) {
+  }, "Current Assistant Email"), React__default.createElement("th", {
+    className: "align-top"
+  }, "Remove Assistant"))), React__default.createElement("tbody", null, !!userList && userList.length > 0 && userList.map(function (record) {
     return React__default.createElement("tr", {
       key: record.id
     }, React__default.createElement("td", {
@@ -8716,7 +8765,13 @@ var SwitchAssistantList = function SwitchAssistantList() {
       className: "align-middle"
     }, record.assistantName), React__default.createElement("td", {
       className: "align-middle"
-    }, record.emailAssistant));
+    }, record.emailAssistant), React__default.createElement("td", {
+      className: "text-center align-middle"
+    }, React__default.createElement(marioCore.DeleteButtonIcon, {
+      onClick: function onClick() {
+        return onDeleteAssistant(record.id);
+      }
+    })));
   })))) : React__default.createElement(marioCore.EmptyDataAlert, {
     label: "user"
   })), React__default.createElement(reactstrap.Col, {