mario-education 2.4.195-level → 2.4.196-level

package/dist/MarioFramework.Education/ClientApp/src/containers/OneRosterSystem/configs/types.d.ts

@@ -9,9 +9,16 @@ export declare type UserRosterFilter = {
     searchString?: string;
     isCreated?: boolean;
     roles?: string[];
+    orderBy?: string;
+    sortBy?: UserRosterSortBy;
 };
 export declare type CreateRosterUserDto = {
     sourcedId?: string;
     teacherUserId?: string;
     teacherEmail?: string;
 };
+export declare enum UserRosterSortBy {
+    USERNAME = "Username",
+    EMAIL = "Email",
+    ROLE = "Role"
+}

package/dist/MarioFramework.Education/ClientApp/src/containers/OneRosterSystem/hooks/useCreateRosterUser.d.ts

@@ -1,4 +1,4 @@
-declare const useCreateRosterUser: (callback?: Function | undefined) => {
+declare const useCreateRosterUser: (userList: any[], callback?: Function | undefined) => {
     handleCreateMultiUsers: (listUserIds: string[], teachers?: object | undefined) => void;
     handleCreateSingleUser: (sourcedId: string, isStudent: boolean, teacher?: any) => void;
 };

package/dist/MarioFramework.Education/ClientApp/src/containers/OneRosterSystem/hooks/useOneRosterUserList.d.ts

@@ -1,5 +1,6 @@
-import { UserRosterFilter } from "../configs/types";
+import { UserRosterFilter, UserRosterSortBy } from "../configs/types";
 declare const useOneRosterUserList: () => {
+    handelSort: (sortBy: UserRosterSortBy) => void;
     handelRetrievedData: () => void;
     handleCreateTeacherOption: (newTeacher: any, userId: string) => void;
     selectedTeachers: object | undefined;

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

@@ -4,4 +4,4 @@ export declare const getTeacher: () => Promise<import("axios").AxiosResponse<any
 export declare const getStudentAll: (filter: any) => Promise<import("axios").AxiosResponse<any>>;
 export declare const changeTeacherOfStudent: (id: number, teacherUserId: any) => Promise<import("axios").AxiosResponse<any>>;
 export declare const getTeachersByStudentId: (studentId: number) => Promise<import("axios").AxiosResponse<any>>;
-export declare const getAllTeachers: () => Promise<import("axios").AxiosResponse<any>>;
+export declare const getAllTeachers: (filters: any) => Promise<import("axios").AxiosResponse<any>>;

package/dist/index.css

@@ -1290,6 +1290,10 @@ h6._3zOGW {
 ._3eCPL{
     list-style-type: none;
 }
+
+._4NzlA{
+    cursor: pointer;
+}
 ._3U9cF {
   padding: 16px;
   min-height: 530px;

package/dist/index.js

@@ -7773,8 +7773,10 @@ var changeTeacherOfStudent = function changeTeacherOfStudent(id, teacherUserId)
 var getTeachersByStudentId = function getTeachersByStudentId(studentId) {
   return marioCore.api.get(USER_URL$1 + "/teachers/" + studentId);
 };
-var getAllTeachers$1 = function getAllTeachers() {
-  return marioCore.api.get(USER_URL$1 + "/all/teacher");
+var getAllTeachers$1 = function getAllTeachers(filters) {
+  return marioCore.api.get(USER_URL$1 + "/all/teacher", {
+    params: filters
+  });
 };
 
 var useUserDeletedModal = function useUserDeletedModal() {
@@ -34224,7 +34226,7 @@ var RosterConfigForm = function RosterConfigForm(_ref) {
       md: 12
     }, React__default.createElement("h5", {
       className: "mt-4 font-weight-bold"
-    }, "Roster Config")), React__default.createElement(reactstrap.Col, {
+    }, "OneRoster Config")), React__default.createElement(reactstrap.Col, {
       md: 12,
       className: "my-4 mt-2"
     }, React__default.createElement(reactstrap.Label, {
@@ -34303,7 +34305,7 @@ var createUserBySourcedIdApi = function createUserBySourcedIdApi(data) {
   return marioCore.api.post("" + EDU_ROSTER_USER_URL, data);
 };
 
-var styles$2 = {"spinner":"_1g-gv","spin":"_aoKNi","success-block":"_1iTWy","middle-block":"_3XHDS","list-block":"_3eCPL"};
+var styles$2 = {"spinner":"_1g-gv","spin":"_aoKNi","success-block":"_1iTWy","middle-block":"_3XHDS","list-block":"_3eCPL","pointer":"_4NzlA"};
 
 var CSV_FILE_NAMES = ["academicSession", "classes", "resources", "courses", "orgs", "categories", "lineItems", "results", "users", "enrollments", "demographics"];
 var INVALID_CLIENT_ROSTER_CONFIG = "Response status code does not indicate success: 403 ().";
@@ -34592,7 +34594,7 @@ var ImportOneRoster = function ImportOneRoster(_ref) {
     style: {
       fontWeight: 700
     }
-  }, "Import One Roster")), React__default.createElement(reactstrap.Col, {
+  }, "Import OneRoster")), React__default.createElement(reactstrap.Col, {
     md: 6
   }, React__default.createElement("input", {
     type: "file",
@@ -34783,6 +34785,22 @@ var useOneRosterUserList = function useOneRosterUserList() {
     setFilters(newFilters);
   };
 
+  var handelSort = React.useCallback(function (sortBy) {
+    if (sortBy !== filters.sortBy) {
+      changeFilters({
+        sortBy: sortBy,
+        orderBy: "ASC",
+        currentPage: 1
+      });
+    } else {
+      changeFilters({
+        sortBy: sortBy,
+        orderBy: filters.orderBy !== "DESC" ? "DESC" : "ASC",
+        currentPage: 1
+      });
+    }
+  }, [JSON.stringify(filters)]);
+
   var getDataUserList = function getDataUserList() {
     try {
       var _temp3 = function _temp3() {
@@ -34822,7 +34840,9 @@ var useOneRosterUserList = function useOneRosterUserList() {
       dispatch(marioCore.setLoading(true));
 
       var _temp8 = _catch(function () {
-        return Promise.resolve(getAllTeachers$1()).then(function (res) {
+        return Promise.resolve(getAllTeachers$1({
+          sortBy: "Email"
+        })).then(function (res) {
           var _res$data3;
 
           setTeachers(res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.map(function (i) {
@@ -34858,51 +34878,19 @@ var useOneRosterUserList = function useOneRosterUserList() {
 
   var handleSelectAll = function handleSelectAll() {
     setIsCheckAll(!isCheckAll);
-    var hasStudentMissingTeacher = false;
-    var users = userList.filter(function (i) {
-      var _i$role, _i$role$includes;
-
-      if ((_i$role = i.role) !== null && _i$role !== void 0 && (_i$role$includes = _i$role.includes) !== null && _i$role$includes !== void 0 && _i$role$includes.call(_i$role, "student") && !(selectedTeachers !== null && selectedTeachers !== void 0 && selectedTeachers[i.sourcedId])) {
-        hasStudentMissingTeacher = true;
-        return false;
-      }
-
-      return true;
-    });
-    setIsCheck(users.map(function (i) {
+    setIsCheck(userList.map(function (i) {
       return i.sourcedId;
     }));
 
-    if (hasStudentMissingTeacher) {
-      dispatch(marioCore.setAlert({
-        type: "danger",
-        message: "Missing teacher for some of students"
-      }));
-    }
-
     if (isCheckAll) {
       setIsCheck([]);
     }
   };
 
   var handleClickCheck = function handleClickCheck(e) {
-    var _selectedItem$role, _selectedItem$role$in;
-
     var _e$target = e.target,
         id = _e$target.id,
         checked = _e$target.checked;
-    var selectedItem = userList.find(function (i) {
-      return i.sourcedId === id;
-    });
-
-    if (!!selectedItem && selectedItem !== null && selectedItem !== void 0 && (_selectedItem$role = selectedItem.role) !== null && _selectedItem$role !== void 0 && (_selectedItem$role$in = _selectedItem$role.includes) !== null && _selectedItem$role$in !== void 0 && _selectedItem$role$in.call(_selectedItem$role, "student") && !(selectedTeachers !== null && selectedTeachers !== void 0 && selectedTeachers[id])) {
-      dispatch(marioCore.setAlert({
-        type: "danger",
-        message: "Please select a teacher"
-      }));
-      return;
-    }
-
     setIsCheck([].concat(isCheck, [id]));
 
     if (!checked) {
@@ -34928,6 +34916,7 @@ var useOneRosterUserList = function useOneRosterUserList() {
     });
     setIsCheck([]);
     setSelectedTeachers(undefined);
+    setIsCheckAll(false);
   }, [JSON.stringify(filters)]);
   React.useEffect(function () {
     getDataUserList();
@@ -34936,6 +34925,7 @@ var useOneRosterUserList = function useOneRosterUserList() {
     getTeacherList();
   }, []);
   return {
+    handelSort: handelSort,
     handelRetrievedData: handelRetrievedData,
     handleCreateTeacherOption: handleCreateTeacherOption,
     selectedTeachers: selectedTeachers,
@@ -34953,7 +34943,7 @@ var useOneRosterUserList = function useOneRosterUserList() {
   };
 };
 
-var useCreateRosterUser = function useCreateRosterUser(callback) {
+var useCreateRosterUser = function useCreateRosterUser(userList, callback) {
   var dispatch = reactRedux.useDispatch();
 
   var createUserBySourcedId = function createUserBySourcedId(users) {
@@ -34988,6 +34978,26 @@ var useCreateRosterUser = function useCreateRosterUser(callback) {
   };
 
   var handleCreateMultiUsers = function handleCreateMultiUsers(listUserIds, teachers) {
+    var isMissingTeacher = listUserIds.some(function (i) {
+      var _user$role, _user$role$includes;
+
+      var user = userList.find(function (u) {
+        return u.sourcedId == i;
+      });
+      var teacher = teachers === null || teachers === void 0 ? void 0 : teachers[i];
+      var isStudent = user === null || user === void 0 ? void 0 : (_user$role = user.role) === null || _user$role === void 0 ? void 0 : (_user$role$includes = _user$role.includes) === null || _user$role$includes === void 0 ? void 0 : _user$role$includes.call(_user$role, "student");
+      if (isStudent && !teacher) return true;
+      return false;
+    });
+
+    if (isMissingTeacher) {
+      dispatch(marioCore.setAlert({
+        type: "danger",
+        message: "Please select/add teacher for all selected student first."
+      }));
+      return;
+    }
+
     var users = listUserIds.map(function (i) {
       var teacher = teachers === null || teachers === void 0 ? void 0 : teachers[i];
       var value = {
@@ -35010,7 +35020,7 @@ var useCreateRosterUser = function useCreateRosterUser(callback) {
     if (!teacher && isStudent) {
       dispatch(marioCore.setAlert({
         type: "danger",
-        message: "Teacher is required for student"
+        message: "Please select/add teacher for all selected student first."
       }));
       return;
     }
@@ -42972,8 +42982,17 @@ var TeacherSelector$1 = function TeacherSelector(_ref) {
   }, errorMessage));
 };
 
+var UserRosterSortBy;
+
+(function (UserRosterSortBy) {
+  UserRosterSortBy["USERNAME"] = "Username";
+  UserRosterSortBy["EMAIL"] = "Email";
+  UserRosterSortBy["ROLE"] = "Role";
+})(UserRosterSortBy || (UserRosterSortBy = {}));
+
 var OneRosterUserList = function OneRosterUserList() {
   var _useOneRosterUserList = useOneRosterUserList(),
+      handelSort = _useOneRosterUserList.handelSort,
       handelRetrievedData = _useOneRosterUserList.handelRetrievedData,
       handleCreateTeacherOption = _useOneRosterUserList.handleCreateTeacherOption,
       selectedTeachers = _useOneRosterUserList.selectedTeachers,
@@ -42992,7 +43011,7 @@ var OneRosterUserList = function OneRosterUserList() {
   var _useTranslation = marioCore.useTranslation(),
       t = _useTranslation.t;
 
-  var _useCreateRosterUser = useCreateRosterUser(handelRetrievedData),
+  var _useCreateRosterUser = useCreateRosterUser(userList, handelRetrievedData),
       handleCreateMultiUsers = _useCreateRosterUser.handleCreateMultiUsers,
       handleCreateSingleUser = _useCreateRosterUser.handleCreateSingleUser;
 
@@ -43000,7 +43019,7 @@ var OneRosterUserList = function OneRosterUserList() {
     className: "fadeIn animated"
   }, React__default.createElement("h5", {
     className: "mt-4 mb-2"
-  }, "Not existed Users"), React__default.createElement(reactstrap.Row, {
+  }, "Non-existent Users"), React__default.createElement(reactstrap.Row, {
     className: "my-2"
   }, React__default.createElement(reactstrap.Col, {
     md: 8
@@ -43022,7 +43041,7 @@ var OneRosterUserList = function OneRosterUserList() {
       return handleCreateMultiUsers(isCheck, selectedTeachers);
     },
     color: "primary"
-  }, "Create for selected users"))), React__default.createElement(reactstrap.Row, {
+  }, "Create Account for Selected Users"))), React__default.createElement(reactstrap.Row, {
     className: "mb-2"
   }, React__default.createElement(reactstrap.Col, {
     md: 12
@@ -43039,12 +43058,33 @@ var OneRosterUserList = function OneRosterUserList() {
     onChange: handleSelectAll,
     checked: isCheckAll
   })), React__default.createElement("th", {
-    className: "align-top"
-  }, t("user_name")), React__default.createElement("th", {
-    className: "align-top"
-  }, t("user_email")), React__default.createElement("th", {
-    className: "align-top"
-  }, t("role")), React__default.createElement("th", {
+    className: "align-top " + styles$2["pointer"],
+    onClick: function onClick() {
+      return handelSort(UserRosterSortBy.USERNAME);
+    }
+  }, t("user_name"), filters.sortBy === UserRosterSortBy.USERNAME && 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$2["pointer"],
+    onClick: function onClick() {
+      return handelSort(UserRosterSortBy.EMAIL);
+    }
+  }, t("user_email"), filters.sortBy === UserRosterSortBy.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", {
+    className: "align-top " + styles$2["pointer"],
+    onClick: function onClick() {
+      return handelSort(UserRosterSortBy.ROLE);
+    }
+  }, t("role"), filters.sortBy === UserRosterSortBy.ROLE && 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"
   }, t("action")))), React__default.createElement("tbody", null, userList.map(function (item) {
     var _item$role$replace, _item$role, _item$role2, _item$role2$includes;
@@ -43063,7 +43103,7 @@ var OneRosterUserList = function OneRosterUserList() {
     }, getFullName(item)), React__default.createElement("td", {
       className: "align-middle"
     }, item.email), React__default.createElement("td", {
-      className: "align-middle"
+      className: "align-middle text-capitalize"
     }, !!item.role && ((_item$role$replace = (_item$role = item.role).replace) === null || _item$role$replace === void 0 ? void 0 : _item$role$replace.call(_item$role, "SecondaryTeacher", "SupportTeacher"))), React__default.createElement("td", {
       className: "align-middle",
       style: {
@@ -43111,15 +43151,15 @@ var OneRosterUserList = function OneRosterUserList() {
 };
 
 var tabs$9 = [{
-  path: "/admin/one-rosters/imports",
-  title: "Imports",
+  path: "/admin/one-rosters/settings",
+  title: "OneRoster Setting",
   component: OneRosterImport
 }, {
   path: "/admin/one-rosters/users",
   title: "Users",
   component: OneRosterUserList
 }];
-var title$b = "One Roster";
+var title$b = "OneRoster";
 
 var OneRosterContainer = function OneRosterContainer() {
   return React__default.createElement(marioCore.CustomTab, {