mario-core 2.9.193-release → 2.9.195-release

package/dist/containers/User/components/TableHeader.d.ts

@@ -5,6 +5,7 @@ interface Props {
     filters: UserFilter;
     fullName?: string;
     onChangeFilters?: (filter: UserFilter) => void;
+    isStudentFilter?: boolean;
 }
 declare const TableHeader: FC<Props>;
 export default TableHeader;

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

@@ -53,6 +53,7 @@ export declare type UserFilterField = {
     isDescending?: boolean;
     searchBy?: SearchBy;
     searchStringBy?: string;
+    isStudentFilter?: boolean;
 };
 export declare type UserColumn = {
     name: string;
@@ -61,6 +62,8 @@ export declare type UserColumn = {
     searchBy?: SearchBy;
     getOption?: (user: any, t?: any) => FilterOption;
     options?: FilterOption[];
+    onSelectAll?: Function;
+    isCheckAll?: boolean;
 };
 export declare type StudentAssign = {
     studentId: number;
@@ -84,6 +87,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/useAssignStudentList.d.ts

@@ -10,5 +10,6 @@ declare const useAssignStudentList: () => {
     handleClickCheck: (e: any) => void;
     isCheckAll: boolean;
     isCheck: any;
+    fullName: string;
 };
 export default useAssignStudentList;

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/useTableHeader.d.ts

@@ -2,6 +2,7 @@ import { SearchBy, UserFilter, UserFilterField, UserOrder } from "../constants/t
 interface Props {
     filters: UserFilter;
     onChangeFilters?: (filter: UserFilter) => void;
+    isStudentFilter?: boolean;
 }
 declare const useTableHeader: (props: Props) => {
     popoverFilters: UserFilterField;

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

@@ -26681,6 +26681,11 @@ var getFilterRosterUser = function getFilterRosterUser(filter) {
     params: filter
   });
 };
+var getStudentFilter = function getStudentFilter(filter) {
+  return api.get(EDU_USER_URL + "/student-filters", {
+    params: filter
+  });
+};
 var getRosterUserExport = function getRosterUserExport(filter) {
   return api.get(MAPPING_ROSTER_USER_URL + "/export-csv", {
     params: filter
@@ -26869,6 +26874,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),
@@ -27608,7 +27623,8 @@ var HeaderCell = function HeaderCell(_ref) {
 
 var useTableHeader = function useTableHeader(props) {
   var filters = props.filters,
-      onChangeFilters = props.onChangeFilters;
+      onChangeFilters = props.onChangeFilters,
+      isStudentFilter = props.isStudentFilter;
 
   var _useState = React.useState(),
       popoverId = _useState[0],
@@ -27629,7 +27645,7 @@ var useTableHeader = function useTableHeader(props) {
   var getData = React.useCallback(function () {
     try {
       var _temp2 = _catch(function () {
-        return Promise.resolve(getFilterRosterUser(popoverFilters)).then(function (res) {
+        return Promise.resolve(isStudentFilter ? getStudentFilter(popoverFilters) : getFilterRosterUser(popoverFilters)).then(function (res) {
           var _res$data;
 
           var items = ((_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.items) || [];
@@ -27648,7 +27664,7 @@ var useTableHeader = function useTableHeader(props) {
     } catch (e) {
       return Promise.reject(e);
     }
-  }, [JSON.stringify(popoverFilters)]);
+  }, [JSON.stringify(popoverFilters), isStudentFilter]);
   var handleFilterIcon = React.useCallback(function (id, searchBy, searchStringBy, sortBy) {
     setPopoverId(id);
     setPopoverFilters(_extends({}, popoverFilters, {
@@ -27677,7 +27693,7 @@ var useTableHeader = function useTableHeader(props) {
   }, [JSON.stringify(filters)]);
   React.useEffect(function () {
     popoverFilters.searchBy !== undefined && getData();
-  }, [JSON.stringify(popoverFilters)]);
+  }, [JSON.stringify(popoverFilters), isStudentFilter]);
   return {
     popoverFilters: popoverFilters,
     popoverId: popoverId,
@@ -27692,11 +27708,13 @@ var useTableHeader = function useTableHeader(props) {
 var TableHeader = function TableHeader(_ref) {
   var headers = _ref.headers,
       filters = _ref.filters,
-      onChangeFilters = _ref.onChangeFilters;
+      onChangeFilters = _ref.onChangeFilters,
+      isStudentFilter = _ref.isStudentFilter;
 
   var _useTableHeader = useTableHeader({
     filters: filters,
-    onChangeFilters: onChangeFilters
+    onChangeFilters: onChangeFilters,
+    isStudentFilter: isStudentFilter
   }),
       popoverId = _useTableHeader.popoverId,
       users = _useTableHeader.users,
@@ -27706,7 +27724,9 @@ var TableHeader = function TableHeader(_ref) {
       handleChangeFilters = _useTableHeader.handleChangeFilters;
 
   return React__default.createElement("tr", null, headers.map(function (header) {
-    return React__default.createElement(HeaderCell, {
+    var _header$isCheckAll;
+
+    return !header.onSelectAll ? React__default.createElement(HeaderCell, {
       users: users,
       data: header,
       key: header.name,
@@ -27718,7 +27738,17 @@ var TableHeader = function TableHeader(_ref) {
       onOpenFilter: handleFilterIcon,
       onChangeFilters: onChangeFilters,
       onOptionsChange: handleChangeFilters
-    });
+    }) : React__default.createElement("th", {
+      className: "align-middle text-center"
+    }, React__default.createElement("input", {
+      type: "checkbox",
+      onChange: function onChange() {
+        var _header$onSelectAll;
+
+        return (_header$onSelectAll = header.onSelectAll) === null || _header$onSelectAll === void 0 ? void 0 : _header$onSelectAll.call(header);
+      },
+      checked: (_header$isCheckAll = header.isCheckAll) != null ? _header$isCheckAll : false
+    }));
   }));
 };
 
@@ -28060,6 +28090,8 @@ var useAssignStudentList = function useAssignStudentList() {
       isCheck = _useState5[0],
       setIsCheck = _useState5[1];
 
+  var fullName = "";
+
   var changeFilters = function changeFilters(updatedFilters) {
     var newFilters = _extends({}, filters, updatedFilters);
 
@@ -28153,6 +28185,11 @@ var useAssignStudentList = function useAssignStudentList() {
   React.useEffect(function () {
     document.title = "User | Assign student";
   }, []);
+  React.useEffect(function () {
+    changeFilters(_extends({}, filters, {
+      searchString: fullName
+    }));
+  }, [fullName]);
   return {
     handelSort: handelSort,
     handleRetrievedData: handleRetrievedData,
@@ -28163,7 +28200,8 @@ var useAssignStudentList = function useAssignStudentList() {
     handleSelectAll: handleSelectAll,
     handleClickCheck: handleClickCheck,
     isCheckAll: isCheckAll,
-    isCheck: isCheck
+    isCheck: isCheck,
+    fullName: fullName
   };
 };
 
@@ -28214,11 +28252,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();
@@ -28279,11 +28320,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();
@@ -28344,11 +28388,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();
@@ -28411,11 +28458,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();
@@ -28432,6 +28482,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() {
@@ -28561,9 +28630,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
   };
 };
 
@@ -28608,7 +28708,7 @@ var AssignStudentList = function AssignStudentList() {
       handleClickCheck = _useAssignStudentList.handleClickCheck,
       handleSelectAll = _useAssignStudentList.handleSelectAll,
       changeFilters = _useAssignStudentList.changeFilters,
-      handelSort = _useAssignStudentList.handelSort,
+      fullName = _useAssignStudentList.fullName,
       handleRetrievedData = _useAssignStudentList.handleRetrievedData;
 
   var handleResetData = function handleResetData() {
@@ -28621,8 +28721,56 @@ 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;
+
+  var AssignStudentColumns = [{
+    name: "",
+    onSelectAll: handleSelectAll,
+    isCheckAll: isCheckAll,
+    className: "text-center"
+  }, {
+    name: "Student Name",
+    sortBy: UserOrder.Name,
+    searchBy: SearchBy.Name,
+    className: "align-top",
+    getOption: function getOption(user) {
+      return {
+        label: user || "empty",
+        value: user
+      };
+    }
+  }, {
+    name: "Student Email",
+    sortBy: UserOrder.Email,
+    searchBy: SearchBy.Email,
+    className: "align-top",
+    getOption: function getOption(user) {
+      return {
+        label: user || "empty",
+        value: user
+      };
+    }
+  }, {
+    name: "Teacher Email",
+    className: "align-top"
+  }, {
+    name: "Assistant Email",
+    className: "align-top"
+  }, {
+    name: "Counselor Email",
+    className: "align-top"
+  }, {
+    name: "Support Teacher Email",
+    className: "align-top"
+  }, {
+    name: "action",
+    className: "text-center"
+  }];
   return React__default.createElement("div", {
     className: "fadeIn animated"
   }, React__default.createElement("h5", {
@@ -28649,7 +28797,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
@@ -28659,49 +28886,13 @@ var AssignStudentList = function AssignStudentList() {
     striped: true,
     responsive: true,
     size: "sm"
-  }, React__default.createElement("thead", null, React__default.createElement("tr", null, React__default.createElement("th", {
-    className: "align-middle text-center"
-  }, React__default.createElement("input", {
-    type: "checkbox",
-    onChange: handleSelectAll,
-    checked: isCheckAll
-  })), React__default.createElement("th", {
-    className: "align-top " + styles["pointer"],
-    onClick: function onClick() {
-      return handelSort(UserOrder.Name);
-    }
-  }, t("student_name"), filters.sortBy === UserOrder.Name && React__default.createElement(React__default.Fragment, null, filters.orderBy === "DESC" ? React__default.createElement(ai.AiOutlineSortDescending, {
-    className: "ml-1"
-  }) : React__default.createElement(ai.AiOutlineSortAscending, {
-    className: "ml-1"
-  }))), React__default.createElement("th", {
-    className: "align-top " + styles["pointer"],
-    onClick: function onClick() {
-      return handelSort(UserOrder.Email);
-    }
-  }, t("student_email"), filters.sortBy === UserOrder.Email && React__default.createElement(React__default.Fragment, null, filters.orderBy === "DESC" ? React__default.createElement(ai.AiOutlineSortDescending, {
-    className: "ml-1"
-  }) : React__default.createElement(ai.AiOutlineSortAscending, {
-    className: "ml-1"
-  }))), React__default.createElement("th", {
-    style: {
-      width: "15%"
-    }
-  }, t("teacher_email")), React__default.createElement("th", {
-    style: {
-      width: "15%"
-    }
-  }, "Assistant Email"), React__default.createElement("th", {
-    style: {
-      width: "15%"
-    }
-  }, "Counselor Email"), React__default.createElement("th", {
-    style: {
-      width: "15%"
-    }
-  }, "Support Teacher Email"), React__default.createElement("th", {
-    className: "align-top"
-  }, t("action")))), React__default.createElement("tbody", null, userList.map(function (item) {
+  }, React__default.createElement("thead", null, React__default.createElement(TableHeader, {
+    isStudentFilter: true,
+    headers: AssignStudentColumns,
+    filters: filters,
+    fullName: fullName,
+    onChangeFilters: changeFilters
+  })), React__default.createElement("tbody", null, userList.map(function (item) {
     return React__default.createElement("tr", {
       key: item.id
     }, React__default.createElement("td", {
@@ -28728,7 +28919,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"
@@ -28745,7 +28936,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"
@@ -28762,7 +28953,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"
@@ -28779,7 +28970,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"