mario-teacher-student-client 2.1.106-admin → 2.1.109-admin

package/dist/components/Dialog/ConfirmDeleteSessionConference.d.ts

@@ -0,0 +1,11 @@
+/// <reference types="react" />
+interface PropsType {
+    open: boolean;
+    isConference?: boolean;
+    isStudentStarted?: boolean;
+    selectedId: number;
+    handleCloseModalConfirmDelete: () => void;
+    handleDelete: (selectedId: number) => Promise<void>;
+}
+declare const ConfirmDeleteSessionConference: ({ open, isConference, isStudentStarted, handleCloseModalConfirmDelete, handleDelete, selectedId }: PropsType) => JSX.Element;
+export default ConfirmDeleteSessionConference;

package/dist/containers/MyConferences/hooks/useUpComing.d.ts

@@ -1,6 +1,11 @@
 /// <reference types="react" />
 import { FILTER_SESSION } from "../constants/types";
 declare const useUpComing: () => {
+    handleDeleteConference: (conferenceId: number) => Promise<void>;
+    handleCloseModalConfirmDelete: () => void;
+    handleOpenModalConfirmDelete: (itemId: number) => void;
+    selectedConferenceId: number;
+    openModalConfirmDelete: boolean;
     studentData: any;
     sessionData: any;
     teacherNoteData: any;

package/dist/containers/MyOneToOne/hooks/useUpComing.d.ts

@@ -1,6 +1,11 @@
 /// <reference types="react" />
 import { FILTER_SESSION } from "../constants/types";
 declare const useUpComing: () => {
+    handleDeleteSession: (sessionId: number) => Promise<void>;
+    handleOpenModalConfirmDelete: (itemId: number) => void;
+    handleCloseModalConfirmDelete: () => void;
+    selectedSessionId: number;
+    openModalConfirmDelete: boolean;
     sessionData: any;
     teacherNoteData: any;
     studentNoteData: any;

package/dist/index.js

@@ -51,6 +51,7 @@ var EventIcon = _interopDefault(require('@material-ui/icons/Event'));
 var ArrowForwardIcon = _interopDefault(require('@material-ui/icons/ArrowForward'));
 var ArrowDownwardIcon = _interopDefault(require('@material-ui/icons/ArrowDownward'));
 var ArrowUpwardIcon = _interopDefault(require('@material-ui/icons/ArrowUpward'));
+var DeleteIcon = _interopDefault(require('@material-ui/icons/Delete'));
 var TableBody = _interopDefault(require('@material-ui/core/TableBody'));
 var TableCell = _interopDefault(require('@material-ui/core/TableCell'));
 var TableHead = _interopDefault(require('@material-ui/core/TableHead'));
@@ -72,7 +73,6 @@ var CheckCircleIcon = _interopDefault(require('@material-ui/icons/CheckCircle'))
 var InsertInvitationIcon = _interopDefault(require('@material-ui/icons/InsertInvitation'));
 var CheckCircleSharpIcon = _interopDefault(require('@material-ui/icons/CheckCircleSharp'));
 var CancelIcon = _interopDefault(require('@material-ui/icons/Cancel'));
-var DeleteIcon = _interopDefault(require('@material-ui/icons/Delete'));
 require('react-dom');
 var ImportIcon = _interopDefault(require('@material-ui/icons/GetApp'));
 var AddIcon = _interopDefault(require('@material-ui/icons/Add'));
@@ -686,7 +686,6 @@ var STEP_PROFILE = {
   message: "Edit your personal settings."
 };
 
-var prioritizedRoles = ["Admin", "Teacher", "Assistant", "EduTeacher", "Student", "Parent"];
 var handleUserRole = function handleUserRole(userRoles) {
   if (userRoles !== null && userRoles !== void 0 && userRoles.includes("Teacher") && userRoles !== null && userRoles !== void 0 && userRoles.includes("Assistant")) {
     var roles = userRoles.filter(function (r) {
@@ -1594,9 +1593,10 @@ var MainLayout = function MainLayout(_ref) {
     try {
       var _temp6 = _catch(function () {
         return Promise.resolve(marioCore.getInfo()).then(function (info) {
-          var _roles, _roles2, _roles3, _roles4, _roles5, _roles6;
+          var _userData$roles, _roles, _roles2, _roles3, _roles4, _roles5, _roles6;
 
           function _temp4() {
+            console.log("end");
             dispatch(marioCore.setUser(_extends({}, user, userData, {
               email: userData.email,
               roles: roles,
@@ -1610,34 +1610,19 @@ var MainLayout = function MainLayout(_ref) {
 
           var roles = [];
           var userData = info.data;
-          console.log({
-            userData: userData
-          });
-
-          for (var _iterator = _createForOfIteratorHelperLoose(prioritizedRoles), _step; !(_step = _iterator()).done;) {
-            var _userData$roles;
-
-            var r = _step.value;
 
-            if (userData !== null && userData !== void 0 && (_userData$roles = userData.roles) !== null && _userData$roles !== void 0 && _userData$roles.includes(r)) {
-              var _userData$roles2;
+          if (userData !== null && userData !== void 0 && (_userData$roles = userData.roles) !== null && _userData$roles !== void 0 && _userData$roles.includes("Teacher")) {
+            var _userData$roles2;
 
-              roles.push(r);
+            roles.push("Teacher");
 
-              if (userData !== null && userData !== void 0 && (_userData$roles2 = userData.roles) !== null && _userData$roles2 !== void 0 && _userData$roles2.includes("Assistant")) {
-                roles.push("Assistant");
-              }
-
-              return;
+            if (userData !== null && userData !== void 0 && (_userData$roles2 = userData.roles) !== null && _userData$roles2 !== void 0 && _userData$roles2.includes("Assistant")) {
+              roles.push("Assistant");
             }
+          } else {
+            roles = userData === null || userData === void 0 ? void 0 : userData.roles;
           }
 
-          roles = roles.filter(function (value, index, self) {
-            return self.indexOf(value) === index;
-          });
-          console.log({
-            roles: roles
-          });
           var isTeacher = ((_roles = roles) === null || _roles === void 0 ? void 0 : _roles.includes("Teacher")) || ((_roles2 = roles) === null || _roles2 === void 0 ? void 0 : _roles2.includes("Assistant"));
           var isStudent = roles.includes("Student");
           var isAssistant = !((_roles3 = roles) !== null && _roles3 !== void 0 && _roles3.includes("Teacher")) && ((_roles4 = roles) === null || _roles4 === void 0 ? void 0 : _roles4.includes("Assistant"));
@@ -3835,6 +3820,7 @@ var ITEM_FAVOURITE = marioCore.BASE_URL + "/api/Session";
 var NEXT_TIME_MEETING = marioCore.BASE_URL + "/api/SearchLearning";
 var CONFERENCE_URL = marioCore.BASE_URL + "/api/Conference";
 var LEARNING_SUPPORT_CATEGORY = marioCore.BASE_URL + "/api/teacher/learningsupportcategories";
+var TEACHER_URL$1 = marioCore.BASE_URL + "/api/teacher";
 var getSessionOneToOne = function getSessionOneToOne(filter) {
   return marioCore.api.get(SEARCH_LEARNING + "/oneToOnes", {
     params: filter
@@ -3924,6 +3910,17 @@ var getLearningCategories = function getLearningCategories() {
     return Promise.reject(e);
   }
 };
+var deleteSession = function deleteSession(sessionId) {
+  try {
+    return Promise.resolve(marioCore.api["delete"](TEACHER_URL$1 + "/current/delete-session-conference", {
+      params: {
+        sessionId: sessionId
+      }
+    }));
+  } catch (e) {
+    return Promise.reject(e);
+  }
+};
 
 var LIST_STUDENT = marioCore.BASE_URL + "/api/Teacher/search-students";
 var CLASS_REFLECTIONS = marioCore.BASE_URL + "/api/ClassReflection";
@@ -3938,7 +3935,7 @@ var LEARNING_PLAN = marioCore.BASE_URL + "/api/LearningPlan";
 var ACCOMMODATION_URL = marioCore.BASE_URL + "/api/Accommodation";
 var TOGGLE_ASSIST = marioCore.BASE_URL + "/api/TeacherStudent/toggleAssist";
 var ACTION_POINT$1 = marioCore.BASE_URL + "/api/ActionPoint";
-var TEACHER_URL$1 = marioCore.BASE_URL + "/api/Teacher";
+var TEACHER_URL$2 = marioCore.BASE_URL + "/api/Teacher";
 var UPLOAD_FILE_URL = marioCore.BASE_URL + "/api/file";
 var GENERAL_EDUCATION_TEACHER = marioCore.BASE_URL + "/api/generalEducationTeacher";
 var CHECK_EMAIL = marioCore.BASE_URL + "/api/Teacher/current/student/check-email";
@@ -4076,7 +4073,7 @@ var deleteActionPointApi$1 = function deleteActionPointApi(id) {
   return marioCore.api["delete"](ACTION_POINT$1 + "/" + id);
 };
 var updateTeacherAssignStudent = function updateTeacherAssignStudent(body) {
-  return marioCore.api.post(TEACHER_URL$1 + "/update/teacher-assign-assistant", body);
+  return marioCore.api.post(TEACHER_URL$2 + "/update/teacher-assign-assistant", body);
 };
 var getAllEduTeacher = function getAllEduTeacher() {
   return marioCore.api.get("" + GENERAL_EDUCATION_TEACHER);
@@ -4112,7 +4109,7 @@ var getAllDesginations = function getAllDesginations() {
   return marioCore.api.get(DESIGNATION_URL + "/all");
 };
 var downloadTemplateFile = function downloadTemplateFile() {
-  return marioCore.api.get(TEACHER_URL$1 + "/download-template-file");
+  return marioCore.api.get(TEACHER_URL$2 + "/download-template-file");
 };
 var getStudentName = function getStudentName(studentId) {
   return marioCore.api.get(STUDENT_URL + "/info/" + studentId);
@@ -4763,11 +4760,67 @@ var useUpComing = function useUpComing() {
     }
   };
 
+  var _useState7 = React.useState(false),
+      openModalConfirmDelete = _useState7[0],
+      setOpenModalConfirmDelete = _useState7[1];
+
+  var _useState8 = React.useState(0),
+      selectedSessionId = _useState8[0],
+      setSelectedSessionId = _useState8[1];
+
+  var handleOpenModalConfirmDelete = function handleOpenModalConfirmDelete(itemId) {
+    setOpenModalConfirmDelete(true);
+    setSelectedSessionId(itemId);
+  };
+
+  var handleCloseModalConfirmDelete = function handleCloseModalConfirmDelete() {
+    setOpenModalConfirmDelete(false);
+    setSelectedSessionId(0);
+  };
+
+  var handleDeleteSession = function handleDeleteSession(sessionId) {
+    try {
+      var _temp43 = function _temp43() {
+        dispatch(marioCore.setLoading(false));
+      };
+
+      dispatch(marioCore.setLoading(true));
+
+      var _temp44 = _catch(function () {
+        return Promise.resolve(deleteSession(sessionId)).then(function () {
+          return Promise.resolve(getOneToOneUpComing()).then(function () {
+            handleCloseModalConfirmDelete();
+            dispatch(marioCore.setAlert({
+              type: "success",
+              message: "Deleted successfully"
+            }));
+          });
+        });
+      }, function (err) {
+        var _err$response13, _err$response13$data;
+
+        dispatch(marioCore.setAlert({
+          type: "danger",
+          message: ((_err$response13 = err.response) === null || _err$response13 === void 0 ? void 0 : (_err$response13$data = _err$response13.data) === null || _err$response13$data === void 0 ? void 0 : _err$response13$data.title) || err.message
+        }));
+      });
+
+      return Promise.resolve(_temp44 && _temp44.then ? _temp44.then(_temp43) : _temp43(_temp44));
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
+
   React.useEffect(function () {
     !isTeacher && nextTimeMeeting();
     getOneToOneUpComing();
   }, [filters]);
   return {
+    handleDeleteSession: handleDeleteSession,
+    handleOpenModalConfirmDelete: handleOpenModalConfirmDelete,
+    handleCloseModalConfirmDelete: handleCloseModalConfirmDelete,
+    selectedSessionId: selectedSessionId,
+    openModalConfirmDelete: openModalConfirmDelete,
     sessionData: sessionData,
     teacherNoteData: teacherNoteData,
     studentNoteData: studentNoteData,
@@ -4792,6 +4845,43 @@ var useUpComing = function useUpComing() {
   };
 };
 
+var ConfirmDeleteSessionConference = function ConfirmDeleteSessionConference(_ref) {
+  var open = _ref.open,
+      _ref$isConference = _ref.isConference,
+      isConference = _ref$isConference === void 0 ? false : _ref$isConference,
+      isStudentStarted = _ref.isStudentStarted,
+      handleCloseModalConfirmDelete = _ref.handleCloseModalConfirmDelete,
+      handleDelete = _ref.handleDelete,
+      selectedId = _ref.selectedId;
+  return React__default.createElement(core.Dialog, {
+    open: open,
+    onClose: handleCloseModalConfirmDelete
+  }, React__default.createElement(core.DialogTitle, null, React__default.createElement("p", {
+    style: {
+      fontSize: "18px",
+      fontWeight: 700
+    }
+  }, isStudentStarted ? "Student's started this " + (isConference ? "conference" : "1-to-1") + ". Are you sure to delete ?" : "Student have not started this " + (isConference ? "conference" : "1-to-1") + ". Are you sure to delete ?")), React__default.createElement(core.DialogActions, {
+    style: {
+      padding: "20px"
+    }
+  }, React__default.createElement(core.Button, {
+    style: {
+      color: "red"
+    },
+    onClick: handleCloseModalConfirmDelete
+  }, "CANCEL"), React__default.createElement(core.Button, {
+    variant: "contained",
+    style: {
+      color: "white",
+      backgroundColor: "red"
+    },
+    onClick: function onClick() {
+      return handleDelete(selectedId);
+    }
+  }, "YES, DELETE ", React__default.createElement(DeleteIcon, null))));
+};
+
 var DEFAULT_USER_AVATAR = "/images/image-default.png";
 
 var UpComing = function UpComing() {
@@ -4807,7 +4897,12 @@ var UpComing = function UpComing() {
       changRouteQuestion = _useUpComing.changRouteQuestion,
       studentNameReq = _useUpComing.studentNameReq,
       classFontSize = _useUpComing.classFontSize,
-      useStyles = _useUpComing.useStyles;
+      useStyles = _useUpComing.useStyles,
+      handleDeleteSession = _useUpComing.handleDeleteSession,
+      handleOpenModalConfirmDelete = _useUpComing.handleOpenModalConfirmDelete,
+      selectedSessionId = _useUpComing.selectedSessionId,
+      openModalConfirmDelete = _useUpComing.openModalConfirmDelete,
+      handleCloseModalConfirmDelete = _useUpComing.handleCloseModalConfirmDelete;
 
   var classes = useStyles();
 
@@ -4943,7 +5038,12 @@ var UpComing = function UpComing() {
 
   return React__default.createElement(core.Grid, {
     className: "" + styles$2["up-coming"]
-  }, isTeacher && screenWidth > 600 && React__default.createElement(core.Grid, {
+  }, React__default.createElement(ConfirmDeleteSessionConference, {
+    open: openModalConfirmDelete,
+    handleDelete: handleDeleteSession,
+    handleCloseModalConfirmDelete: handleCloseModalConfirmDelete,
+    selectedId: selectedSessionId
+  }), isTeacher && screenWidth > 600 && React__default.createElement(core.Grid, {
     item: true,
     className: "" + styles$2["gr-action"]
   }, React__default.createElement("div", {
@@ -5173,6 +5273,17 @@ var UpComing = function UpComing() {
     }, React__default.createElement("div", {
       className: styles$2["duration"] + " " + styles$2["request"]
     }, row.isCreatedByTeacher ? "Teacher request" : "Student request"), React__default.createElement(core.Button, {
+      variant: "contained",
+      color: "primary",
+      disableElevation: true,
+      onClick: function onClick() {
+        return handleOpenModalConfirmDelete(parseInt(row.id));
+      },
+      style: {
+        backgroundColor: "red",
+        marginRight: "10px"
+      }
+    }, "Delete"), React__default.createElement(core.Button, {
       variant: "contained",
       color: "primary",
       disableElevation: true,
@@ -6619,6 +6730,7 @@ var GET_STUDENT$2 = marioCore.BASE_URL + "/api/teacher";
 var CREATE_CONFERENCES = marioCore.BASE_URL + "/api/conference";
 var CONFERENCE_NOTE = marioCore.BASE_URL + "/api/Conference";
 var NEXT_TIME_MEETING$1 = marioCore.BASE_URL + "/api/SearchLearning";
+var TEACHER_URL$3 = marioCore.BASE_URL + "/api/teacher";
 var getConference$1 = function getConference(filter) {
   return marioCore.api.get(SEARCH_LEARNING$2 + "/myConference", {
     params: filter
@@ -6649,6 +6761,17 @@ var getNextTimeMeeting$1 = function getNextTimeMeeting() {
     return Promise.reject(e);
   }
 };
+var deleteConference = function deleteConference(conferenceId) {
+  try {
+    return Promise.resolve(marioCore.api["delete"](TEACHER_URL$3 + "/current/delete-session-conference", {
+      params: {
+        conferenceId: conferenceId
+      }
+    }));
+  } catch (e) {
+    return Promise.reject(e);
+  }
+};
 
 var useUpComing$1 = function useUpComing() {
   var dispatch = reactRedux.useDispatch();
@@ -6962,10 +7085,66 @@ var useUpComing$1 = function useUpComing() {
     }
   };
 
+  var _useState8 = React.useState(false),
+      openModalConfirmDelete = _useState8[0],
+      setOpenModalConfirmDelete = _useState8[1];
+
+  var _useState9 = React.useState(0),
+      selectedConferenceId = _useState9[0],
+      setSelectedConferenceId = _useState9[1];
+
+  var handleOpenModalConfirmDelete = function handleOpenModalConfirmDelete(itemId) {
+    setOpenModalConfirmDelete(true);
+    setSelectedConferenceId(itemId);
+  };
+
+  var handleCloseModalConfirmDelete = function handleCloseModalConfirmDelete() {
+    setOpenModalConfirmDelete(false);
+    setSelectedConferenceId(0);
+  };
+
+  var handleDeleteConference = function handleDeleteConference(conferenceId) {
+    try {
+      var _temp35 = function _temp35() {
+        dispatch(marioCore.setLoading(false));
+      };
+
+      dispatch(marioCore.setLoading(true));
+
+      var _temp36 = _catch(function () {
+        return Promise.resolve(deleteConference(conferenceId)).then(function () {
+          return Promise.resolve(getMyConferenceUpComing()).then(function () {
+            handleCloseModalConfirmDelete();
+            dispatch(marioCore.setAlert({
+              type: "success",
+              message: "Deleted successfully"
+            }));
+          });
+        });
+      }, function (err) {
+        var _err$response9, _err$response9$data;
+
+        dispatch(marioCore.setAlert({
+          type: "danger",
+          message: ((_err$response9 = err.response) === null || _err$response9 === void 0 ? void 0 : (_err$response9$data = _err$response9.data) === null || _err$response9$data === void 0 ? void 0 : _err$response9$data.title) || err.message
+        }));
+      });
+
+      return Promise.resolve(_temp36 && _temp36.then ? _temp36.then(_temp35) : _temp35(_temp36));
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
+
   React.useEffect(function () {
     getMyConferenceUpComing();
   }, [filters]);
   return {
+    handleDeleteConference: handleDeleteConference,
+    handleCloseModalConfirmDelete: handleCloseModalConfirmDelete,
+    handleOpenModalConfirmDelete: handleOpenModalConfirmDelete,
+    selectedConferenceId: selectedConferenceId,
+    openModalConfirmDelete: openModalConfirmDelete,
     studentData: studentData,
     sessionData: sessionData,
     teacherNoteData: teacherNoteData,
@@ -7006,7 +7185,12 @@ var UpComing$1 = function UpComing() {
       studentNameReq = _useUpComing.studentNameReq,
       defaultFont = _useUpComing.defaultFont,
       useStyles = _useUpComing.useStyles,
-      classFontSize = _useUpComing.classFontSize;
+      classFontSize = _useUpComing.classFontSize,
+      handleDeleteConference = _useUpComing.handleDeleteConference,
+      handleCloseModalConfirmDelete = _useUpComing.handleCloseModalConfirmDelete,
+      handleOpenModalConfirmDelete = _useUpComing.handleOpenModalConfirmDelete,
+      selectedConferenceId = _useUpComing.selectedConferenceId,
+      openModalConfirmDelete = _useUpComing.openModalConfirmDelete;
 
   var classes = useStyles();
 
@@ -7135,7 +7319,13 @@ var UpComing$1 = function UpComing() {
   }, [isTeacher]);
   return React__default.createElement(core.Grid, {
     className: styles$3["up-coming"] + " " + styles$3[classFontSize]
-  }, isTeacher && screenWidth > 600 && React__default.createElement(core.Grid, {
+  }, React__default.createElement(ConfirmDeleteSessionConference, {
+    open: openModalConfirmDelete,
+    isConference: true,
+    handleCloseModalConfirmDelete: handleCloseModalConfirmDelete,
+    handleDelete: handleDeleteConference,
+    selectedId: selectedConferenceId
+  }), isTeacher && screenWidth > 600 && React__default.createElement(core.Grid, {
     item: true,
     className: "" + styles$3["gr-action"]
   }, React__default.createElement("div", {
@@ -7362,6 +7552,20 @@ var UpComing$1 = function UpComing() {
       align: "right",
       className: "" + styles$3["row_type"]
     }, React__default.createElement(core.Button, {
+      variant: "contained",
+      color: "primary",
+      disableElevation: true,
+      onClick: function onClick() {
+        return handleOpenModalConfirmDelete(parseInt(row.id));
+      },
+      classes: {
+        label: classes.fontCustom
+      },
+      style: {
+        backgroundColor: "red",
+        marginRight: "10px"
+      }
+    }, "Delete"), React__default.createElement(core.Button, {
       variant: "contained",
       color: "primary",
       disableElevation: true,
@@ -33923,7 +34127,7 @@ var Goals = function Goals(_ref) {
 };
 
 var STUDENT_URL$5 = marioCore.BASE_URL + "/api/Student";
-var TEACHER_URL$2 = marioCore.BASE_URL + "/api/Teacher";
+var TEACHER_URL$4 = marioCore.BASE_URL + "/api/Teacher";
 var SESSION_URL$2 = marioCore.BASE_URL + "/api/Session";
 var createDataPersonalInterestApi = function createDataPersonalInterestApi(body) {
   return marioCore.api.post(marioCore.BASE_URL + "/api/PersonalInterest", body);
@@ -33954,7 +34158,7 @@ var getAllowEdit$5 = function getAllowEdit(id) {
   return marioCore.api.get(STUDENT_URL$5 + "/" + id + "/allowEditGoal");
 };
 var getPolarQuestion = function getPolarQuestion(id) {
-  return marioCore.api.get(TEACHER_URL$2 + "/ready-to-learn/" + id);
+  return marioCore.api.get(TEACHER_URL$4 + "/ready-to-learn/" + id);
 };
 var getStudentProfile = function getStudentProfile(studentId) {
   return marioCore.api.get(SESSION_URL$2 + "/partner/student-profile", {