mario-core 2.9.192-release → 2.9.194-release

package/dist/containers/User/constants/constants.d.ts

@@ -1,4 +1,4 @@
-import { StudentFilter, UserColumn, UserFilter, UserOrder } from "./types";
+import { IStaffAssign, StudentFilter, UserColumn, UserFilter, UserOrder } from "./types";
 export declare const userOrders: {
     0: string;
     1: string;
@@ -18,3 +18,4 @@ export declare const DEFAULT_FILTER: UserFilter;
 export declare const DEFAULT_STUDENT_FILTER: StudentFilter;
 export declare const DEFAULT_FILTER_POPOVER: UserFilter;
 export declare const CSV_PREFIX = "data:text/csv;charset=utf-8,";
+export declare const initialStaffBulk: IStaffAssign;

package/dist/containers/User/constants/types.d.ts

@@ -84,6 +84,16 @@ export declare type StudentAssign = {
     mainTeacherEmail: string;
     mainTeacherId?: number;
 };
+export interface IStaffAssign {
+    teacherId: string;
+    teacherEmail: string;
+    assistantId: string;
+    assistantEmail: string;
+    counselorId: string;
+    counselorEmail: string;
+    secondaryTeacherId: string;
+    secondaryTeacherEmail: string;
+}
 export declare type Counselor = {
     id: string;
     counselorId: number;

package/dist/containers/User/hooks/useAssignStudent.d.ts

@@ -1,5 +1,11 @@
+import { IStaffAssign } from "../constants/types";
 declare const useAssignStudent: (teacherSelected?: object | undefined, assistantSelected?: object | undefined, counselorSelected?: object | undefined, secondaryTeacherSelected?: object | undefined, callback?: Function | undefined) => {
     handleAssignSingleStudent: (id: string) => void;
     handleAssignMultiStudent: (listUserIds: string[]) => void;
+    openModelBulk: boolean;
+    handleToggleModel: () => void;
+    handleChangeStaffBulk: (name: string, id: string) => void;
+    staffBulkAssign: IStaffAssign;
+    handleAssignStaffToStudents: (listUserIds: string[]) => void;
 };
 export default useAssignStudent;

package/dist/containers/User/hooks/useAssistantList.d.ts

@@ -4,7 +4,7 @@ declare const useAssistantList: () => {
     selectedAssistants: object | undefined;
     assistantOptions: IOptions[];
     handleSelectAssistant: (assistantId: string, studentUserId: string) => void;
-    handleCreateAssistantOption: (newAssistant: IOptions, studentUserId: string) => void;
+    handleCreateAssistantOption: (newAssistant: IOptions, studentUserId: string, isSelect?: boolean | undefined) => void;
     setSelectedAssistants: import("react").Dispatch<import("react").SetStateAction<object | undefined>>;
 };
 export default useAssistantList;

package/dist/containers/User/hooks/useCounselorList.d.ts

@@ -4,7 +4,7 @@ declare const useCounselorList: () => {
     selectedCounselors: object | undefined;
     counselorOptions: IOptions[];
     handleSelectCounselor: (counselorId: string, studentUserId: string) => void;
-    handleCreateCounselorOption: (newCounselor: IOptions, studentUserId: string) => void;
+    handleCreateCounselorOption: (newCounselor: IOptions, studentUserId: string, isSelect?: boolean | undefined) => void;
     setSelectedCounselors: import("react").Dispatch<import("react").SetStateAction<object | undefined>>;
 };
 export default useCounselorList;

package/dist/containers/User/hooks/useSecondaryTeacherList.d.ts

@@ -4,7 +4,7 @@ declare const useSecondaryTeacherList: () => {
     selectedSecondaryTeachers: object | undefined;
     secondaryTeacherOptions: IOptions[];
     handleSelectSecondaryTeacher: (secondaryTeacherId: string, studentUserId: string) => void;
-    handleCreateSecondaryTeacherOption: (newSecondaryTeacher: IOptions, studentUserId: string) => void;
+    handleCreateSecondaryTeacherOption: (newSecondaryTeacher: IOptions, studentUserId: string, isSelect?: boolean | undefined) => void;
     setSelectedSecondaryTeachers: import("react").Dispatch<import("react").SetStateAction<object | undefined>>;
 };
 export default useSecondaryTeacherList;

package/dist/containers/User/hooks/useTeacherList.d.ts

@@ -4,7 +4,7 @@ declare const useTeacherList: () => {
     selectedTeachers: object | undefined;
     teacherOptions: IOptions[];
     handleSelectTeacher: (teacherId: string, studentUserId: string) => void;
-    handleCreateTeacherOption: (newTeacher: IOptions, studentUserId: string) => void;
+    handleCreateTeacherOption: (newTeacher: IOptions, studentUserId: string, isSelectTeacher?: boolean | undefined) => void;
     setSelectedTeachers: import("react").Dispatch<import("react").SetStateAction<object | undefined>>;
 };
 export default useTeacherList;

package/dist/index.js

@@ -22979,7 +22979,9 @@ var useForgotPassword = function useForgotPassword() {
       dispatch(setLoading(true));
 
       var _temp12 = _catch(function () {
-        return Promise.resolve(resetPassword(data)).then(function () {
+        return Promise.resolve(resetPassword(_extends({}, data, {
+          key: key
+        }))).then(function () {
           history.push(LOGIN);
           dispatch(setAlert({
             type: "success",
@@ -26867,6 +26869,16 @@ var DEFAULT_FILTER_POPOVER = {
   pageSize: 200
 };
 var CSV_PREFIX = "data:text/csv;charset=utf-8,";
+var initialStaffBulk = {
+  assistantId: "",
+  counselorId: "",
+  secondaryTeacherId: "",
+  teacherId: "",
+  assistantEmail: "",
+  counselorEmail: "",
+  secondaryTeacherEmail: "",
+  teacherEmail: ""
+};
 
 var useFilters$1 = function useFilters() {
   var _useState = React.useState(DEFAULT_FILTER$1),
@@ -28212,11 +28224,14 @@ var useCounselorList = function useCounselorList() {
     });
     setSelectedCounselors(_extends({}, selectedCounselors, (_extends2 = {}, _extends2[studentUserId] = selectedCounselor, _extends2)));
   }, [JSON.stringify(selectedCounselors), JSON.stringify(counselorOptions)]);
-  var handleCreateCounselorOption = React.useCallback(function (newCounselor, studentUserId) {
-    var _extends3;
-
+  var handleCreateCounselorOption = React.useCallback(function (newCounselor, studentUserId, isSelect) {
     setCounselorOptions([].concat(counselorOptions, [newCounselor]));
-    setSelectedCounselors(_extends({}, selectedCounselors, (_extends3 = {}, _extends3[studentUserId] = newCounselor, _extends3)));
+
+    if (!!isSelect) {
+      var _extends3;
+
+      setSelectedCounselors(_extends({}, selectedCounselors, (_extends3 = {}, _extends3[studentUserId] = newCounselor, _extends3)));
+    }
   }, [JSON.stringify(counselorOptions), JSON.stringify(selectedCounselors)]);
   React.useEffect(function () {
     getDataCounselors();
@@ -28277,11 +28292,14 @@ var useAssistantList = function useAssistantList() {
     });
     setSelectedAssistants(_extends({}, selectedAssistants, (_extends2 = {}, _extends2[studentUserId] = selectedAssistant, _extends2)));
   }, [JSON.stringify(selectedAssistants), JSON.stringify(assistantOptions)]);
-  var handleCreateAssistantOption = React.useCallback(function (newAssistant, studentUserId) {
-    var _extends3;
-
+  var handleCreateAssistantOption = React.useCallback(function (newAssistant, studentUserId, isSelect) {
     setAssistantOptions([].concat(assistantOptions, [newAssistant]));
-    setSelectedAssistants(_extends({}, selectedAssistants, (_extends3 = {}, _extends3[studentUserId] = newAssistant, _extends3)));
+
+    if (!!isSelect) {
+      var _extends3;
+
+      setSelectedAssistants(_extends({}, selectedAssistants, (_extends3 = {}, _extends3[studentUserId] = newAssistant, _extends3)));
+    }
   }, [JSON.stringify(assistantOptions), JSON.stringify(selectedAssistants)]);
   React.useEffect(function () {
     getDataAssistants();
@@ -28342,11 +28360,14 @@ var useSecondaryTeacherList = function useSecondaryTeacherList() {
     });
     setSelectedSecondaryTeachers(_extends({}, selectedSecondaryTeachers, (_extends2 = {}, _extends2[studentUserId] = selectedSecondaryTeacher, _extends2)));
   }, [JSON.stringify(selectedSecondaryTeachers), JSON.stringify(secondaryTeacherOptions)]);
-  var handleCreateSecondaryTeacherOption = React.useCallback(function (newSecondaryTeacher, studentUserId) {
-    var _extends3;
-
+  var handleCreateSecondaryTeacherOption = React.useCallback(function (newSecondaryTeacher, studentUserId, isSelect) {
     setSecondaryTeacherOptions([].concat(secondaryTeacherOptions, [newSecondaryTeacher]));
-    setSelectedSecondaryTeachers(_extends({}, selectedSecondaryTeachers, (_extends3 = {}, _extends3[studentUserId] = newSecondaryTeacher, _extends3)));
+
+    if (!!isSelect) {
+      var _extends3;
+
+      setSelectedSecondaryTeachers(_extends({}, selectedSecondaryTeachers, (_extends3 = {}, _extends3[studentUserId] = newSecondaryTeacher, _extends3)));
+    }
   }, [JSON.stringify(secondaryTeacherOptions), JSON.stringify(selectedSecondaryTeachers)]);
   React.useEffect(function () {
     getDataSecondaryTeachers();
@@ -28409,11 +28430,14 @@ var useTeacherList = function useTeacherList() {
     });
     setSelectedTeachers(_extends({}, selectedTeachers, (_extends2 = {}, _extends2[studentUserId] = selectedTeacher, _extends2)));
   }, [JSON.stringify(selectedTeachers), JSON.stringify(teacherOptions)]);
-  var handleCreateTeacherOption = React.useCallback(function (newTeacher, studentUserId) {
-    var _extends3;
-
+  var handleCreateTeacherOption = React.useCallback(function (newTeacher, studentUserId, isSelectTeacher) {
     setTeacherOptions([].concat(teacherOptions, [newTeacher]));
-    setSelectedTeachers(_extends({}, selectedTeachers, (_extends3 = {}, _extends3[studentUserId] = newTeacher, _extends3)));
+
+    if (!!isSelectTeacher) {
+      var _extends3;
+
+      setSelectedTeachers(_extends({}, selectedTeachers, (_extends3 = {}, _extends3[studentUserId] = newTeacher, _extends3)));
+    }
   }, [JSON.stringify(teacherOptions), JSON.stringify(selectedTeachers)]);
   React.useEffect(function () {
     getDataTeachers();
@@ -28430,6 +28454,25 @@ var useTeacherList = function useTeacherList() {
 var useAssignStudent = function useAssignStudent(teacherSelected, assistantSelected, counselorSelected, secondaryTeacherSelected, callback) {
   var dispatch = reactRedux.useDispatch();
 
+  var _useState = React.useState(false),
+      openModelBulk = _useState[0],
+      setOpenModelBulk = _useState[1];
+
+  var _useState2 = React.useState(initialStaffBulk),
+      staffBulkAssign = _useState2[0],
+      setStaffBulkAssign = _useState2[1];
+
+  var handleToggleModel = function handleToggleModel() {
+    setOpenModelBulk(!openModelBulk);
+    setStaffBulkAssign(_extends({}, initialStaffBulk));
+  };
+
+  var handleChangeStaffBulk = function handleChangeStaffBulk(name, id) {
+    var _extends2;
+
+    setStaffBulkAssign(_extends({}, staffBulkAssign, (_extends2 = {}, _extends2[name] = id, _extends2)));
+  };
+
   var assignStudents = function assignStudents(users) {
     try {
       var _temp3 = function _temp3() {
@@ -28559,9 +28602,40 @@ var useAssignStudent = function useAssignStudent(teacherSelected, assistantSelec
 
     assignStudents([studentRequest]);
   }, [JSON.stringify(teacherSelected), JSON.stringify(assistantSelected), JSON.stringify(counselorSelected), JSON.stringify(secondaryTeacherSelected)]);
+  var handleAssignStaffToStudents = React.useCallback(function (listUserIds) {
+    if (listUserIds.length === 0) {
+      dispatch(setAlert({
+        type: "danger",
+        message: "Not found selected student."
+      }));
+      return;
+    }
+
+    var users = listUserIds.map(function (i) {
+      var value = {
+        id: i,
+        mainTeacherUserId: !!(staffBulkAssign !== null && staffBulkAssign !== void 0 && staffBulkAssign.teacherId) ? staffBulkAssign === null || staffBulkAssign === void 0 ? void 0 : staffBulkAssign.teacherId : undefined,
+        mainTeacherEmail: !!(staffBulkAssign !== null && staffBulkAssign !== void 0 && staffBulkAssign.teacherEmail) ? staffBulkAssign === null || staffBulkAssign === void 0 ? void 0 : staffBulkAssign.teacherEmail : undefined,
+        assistantUserId: !!(staffBulkAssign !== null && staffBulkAssign !== void 0 && staffBulkAssign.assistantId) ? staffBulkAssign === null || staffBulkAssign === void 0 ? void 0 : staffBulkAssign.assistantId : undefined,
+        assistantEmail: !!(staffBulkAssign !== null && staffBulkAssign !== void 0 && staffBulkAssign.assistantEmail) ? staffBulkAssign === null || staffBulkAssign === void 0 ? void 0 : staffBulkAssign.assistantEmail : undefined,
+        counselorUserId: !!(staffBulkAssign !== null && staffBulkAssign !== void 0 && staffBulkAssign.counselorId) ? staffBulkAssign === null || staffBulkAssign === void 0 ? void 0 : staffBulkAssign.counselorId : undefined,
+        counselorEmail: !!(staffBulkAssign !== null && staffBulkAssign !== void 0 && staffBulkAssign.counselorEmail) ? staffBulkAssign === null || staffBulkAssign === void 0 ? void 0 : staffBulkAssign.counselorEmail : undefined,
+        secondaryTeacherUserId: !!(staffBulkAssign !== null && staffBulkAssign !== void 0 && staffBulkAssign.secondaryTeacherId) ? staffBulkAssign === null || staffBulkAssign === void 0 ? void 0 : staffBulkAssign.secondaryTeacherId : undefined,
+        secondaryTeacherEmail: !!(staffBulkAssign !== null && staffBulkAssign !== void 0 && staffBulkAssign.secondaryTeacherEmail) ? staffBulkAssign === null || staffBulkAssign === void 0 ? void 0 : staffBulkAssign.secondaryTeacherEmail : undefined
+      };
+      return value;
+    });
+    handleToggleModel();
+    assignStudents([].concat(users));
+  }, [JSON.stringify(staffBulkAssign)]);
   return {
     handleAssignSingleStudent: handleAssignSingleStudent,
-    handleAssignMultiStudent: handleAssignMultiStudent
+    handleAssignMultiStudent: handleAssignMultiStudent,
+    openModelBulk: openModelBulk,
+    handleToggleModel: handleToggleModel,
+    handleChangeStaffBulk: handleChangeStaffBulk,
+    staffBulkAssign: staffBulkAssign,
+    handleAssignStaffToStudents: handleAssignStaffToStudents
   };
 };
 
@@ -28619,7 +28693,12 @@ var AssignStudentList = function AssignStudentList() {
 
   var _useAssignStudent = useAssignStudent(selectedTeachers, selectedAssistants, selectedCounselors, selectedSecondaryTeachers, handleResetData),
       handleAssignSingleStudent = _useAssignStudent.handleAssignSingleStudent,
-      handleAssignMultiStudent = _useAssignStudent.handleAssignMultiStudent;
+      handleAssignMultiStudent = _useAssignStudent.handleAssignMultiStudent,
+      openModelBulk = _useAssignStudent.openModelBulk,
+      handleToggleModel = _useAssignStudent.handleToggleModel,
+      staffBulkAssign = _useAssignStudent.staffBulkAssign,
+      handleChangeStaffBulk = _useAssignStudent.handleChangeStaffBulk,
+      handleAssignStaffToStudents = _useAssignStudent.handleAssignStaffToStudents;
 
   return React__default.createElement("div", {
     className: "fadeIn animated"
@@ -28647,7 +28726,86 @@ var AssignStudentList = function AssignStudentList() {
       return handleAssignMultiStudent(isCheck);
     },
     color: "primary"
-  }, "Assign for Selected Students"))), React__default.createElement(reactstrap.Row, {
+  }, "Assign for Selected Students"), React__default.createElement(reactstrap.Button, {
+    className: "mx-2",
+    onClick: function onClick() {
+      return handleToggleModel();
+    },
+    color: "primary"
+  }, "Assign Bulk"))), React__default.createElement(reactstrap.Modal, {
+    centered: true,
+    isOpen: openModelBulk,
+    toggle: function toggle() {
+      return handleToggleModel();
+    }
+  }, React__default.createElement(reactstrap.ModalHeader, null, "Assign Bulk Student"), React__default.createElement(reactstrap.ModalBody, null, React__default.createElement(TeacherSelector, {
+    value: teacherOptions.find(function (r) {
+      return r.value == staffBulkAssign.teacherId || r.label == staffBulkAssign.teacherEmail;
+    }) || null,
+    options: teacherOptions,
+    onChange: function onChange(e) {
+      return handleChangeStaffBulk("teacherId", e.value);
+    },
+    onCreateOption: function onCreateOption(value) {
+      handleCreateTeacherOption(value, "");
+      handleChangeStaffBulk("teacherEmail", value.label);
+    },
+    placeholder: t("select_teacher"),
+    className: "flex-grow-1 mb-3"
+  }), React__default.createElement(TeacherSelector, {
+    value: assistantOptions.find(function (r) {
+      return r.value == staffBulkAssign.assistantId || r.label == staffBulkAssign.assistantEmail;
+    }) || null,
+    options: assistantOptions,
+    onChange: function onChange(e) {
+      return handleChangeStaffBulk("assistantId", e.value);
+    },
+    onCreateOption: function onCreateOption(value) {
+      handleCreateAssistantOption(value, "");
+      handleChangeStaffBulk("assistantEmail", value.label);
+    },
+    placeholder: t("select_assistant"),
+    className: "flex-grow-1 mb-3"
+  }), React__default.createElement(TeacherSelector, {
+    value: counselorOptions.find(function (r) {
+      return r.value == staffBulkAssign.counselorId || r.label == staffBulkAssign.counselorEmail;
+    }) || null,
+    options: counselorOptions,
+    onChange: function onChange(e) {
+      return handleChangeStaffBulk("counselorId", e.value);
+    },
+    onCreateOption: function onCreateOption(value) {
+      handleCreateCounselorOption(value, "");
+      handleChangeStaffBulk("counselorEmail", value.label);
+    },
+    placeholder: t("select_counselor"),
+    className: "flex-grow-1 mb-3"
+  }), React__default.createElement(TeacherSelector, {
+    value: secondaryTeacherOptions.find(function (r) {
+      return r.value == staffBulkAssign.secondaryTeacherId || r.label == staffBulkAssign.secondaryTeacherEmail;
+    }) || null,
+    options: secondaryTeacherOptions,
+    onChange: function onChange(e) {
+      return handleChangeStaffBulk("secondaryTeacherId", e.value);
+    },
+    onCreateOption: function onCreateOption(value) {
+      handleCreateSecondaryTeacherOption(value, "");
+      handleChangeStaffBulk("secondaryTeacherEmail", value.label);
+    },
+    placeholder: t("select_support_teacher"),
+    className: "flex-grow-1"
+  })), React__default.createElement(reactstrap.ModalFooter, {
+    className: "text-right"
+  }, React__default.createElement(reactstrap.Button, {
+    onClick: function onClick() {
+      return handleToggleModel();
+    }
+  }, "Cancel"), React__default.createElement(reactstrap.Button, {
+    color: "primary",
+    onClick: function onClick() {
+      return handleAssignStaffToStudents(isCheck);
+    }
+  }, "Assign"))), React__default.createElement(reactstrap.Row, {
     className: "mb-2"
   }, React__default.createElement(reactstrap.Col, {
     md: 12
@@ -28726,7 +28884,7 @@ var AssignStudentList = function AssignStudentList() {
         return handleSelectTeacher(e.value, item.id);
       },
       onCreateOption: function onCreateOption(value) {
-        return handleCreateTeacherOption(value, item.id);
+        return handleCreateTeacherOption(value, item.id, true);
       },
       placeholder: t("select_teacher"),
       className: "flex-grow-1 mr-2"
@@ -28743,7 +28901,7 @@ var AssignStudentList = function AssignStudentList() {
         return handleSelectAssistant(e.value, item.id);
       },
       onCreateOption: function onCreateOption(value) {
-        return handleCreateAssistantOption(value, item.id);
+        return handleCreateAssistantOption(value, item.id, true);
       },
       placeholder: t("select_assistant"),
       className: "flex-grow-1 mr-2"
@@ -28760,7 +28918,7 @@ var AssignStudentList = function AssignStudentList() {
         return handleSelectCounselor(e.value, item.id);
       },
       onCreateOption: function onCreateOption(value) {
-        return handleCreateCounselorOption(value, item.id);
+        return handleCreateCounselorOption(value, item.id, true);
       },
       placeholder: t("select_counselor"),
       className: "flex-grow-1 mr-2"
@@ -28777,7 +28935,7 @@ var AssignStudentList = function AssignStudentList() {
         return handleSelectSecondaryTeacher(e.value, item.id);
       },
       onCreateOption: function onCreateOption(value) {
-        return handleCreateSecondaryTeacherOption(value, item.id);
+        return handleCreateSecondaryTeacherOption(value, item.id, true);
       },
       placeholder: t("select_support_teacher"),
       className: "flex-grow-1 mr-2"