mario-core 2.9.194-release → 2.9.196-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/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;

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/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/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
@@ -26846,7 +26851,10 @@ var UserColumns = [{
     };
   }
 }, {
-  name: "action",
+  name: "",
+  className: "text-center"
+}, {
+  name: "",
   className: "text-center"
 }];
 var DEFAULT_PAGE_SIZE$1 = {
@@ -27618,7 +27626,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],
@@ -27639,7 +27648,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) || [];
@@ -27658,7 +27667,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, {
@@ -27687,7 +27696,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,
@@ -27702,11 +27711,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,
@@ -27716,7 +27727,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,
@@ -27728,7 +27741,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
+    }));
   }));
 };
 
@@ -27904,17 +27927,22 @@ var UserList = function UserList() {
     }, record.isActive ? t("active") : t("inactive")), React__default.createElement("td", {
       className: "align-middle"
     }, utcToLocalTime(record === null || record === void 0 ? void 0 : record.createTime, "yyyy-MM-DD HH:mm")), React__default.createElement("td", null, rosterUserInfo(record)), React__default.createElement("td", {
-      className: "text-center align-middle"
+      className: "align-middle"
     }, React__default.createElement(fa.FaUsersCog, {
       style: {
         fontSize: "18px",
-        marginRight: "10px",
+        margin: "0 10px",
         cursor: "pointer"
       },
       onClick: function onClick() {
         return swicthUser(record.id);
       }
-    }), React__default.createElement(DeleteButtonIcon, {
+    })), React__default.createElement("td", {
+      className: "align-middle",
+      style: {
+        padding: "0 15px"
+      }
+    }, React__default.createElement(DeleteButtonIcon, {
       onClick: function onClick() {
         return removeData(record.id);
       }
@@ -28070,6 +28098,8 @@ var useAssignStudentList = function useAssignStudentList() {
       isCheck = _useState5[0],
       setIsCheck = _useState5[1];
 
+  var fullName = "";
+
   var changeFilters = function changeFilters(updatedFilters) {
     var newFilters = _extends({}, filters, updatedFilters);
 
@@ -28163,6 +28193,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,
@@ -28173,7 +28208,8 @@ var useAssignStudentList = function useAssignStudentList() {
     handleSelectAll: handleSelectAll,
     handleClickCheck: handleClickCheck,
     isCheckAll: isCheckAll,
-    isCheck: isCheck
+    isCheck: isCheck,
+    fullName: fullName
   };
 };
 
@@ -28680,7 +28716,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() {
@@ -28700,6 +28736,49 @@ var AssignStudentList = function AssignStudentList() {
       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", {
@@ -28815,49 +28894,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", {