mario-core 2.9.319-release → 2.9.321-release

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

@@ -93,8 +93,10 @@ export interface ITeachers {
     mainTeacherId?: number;
 }
 export interface IStaffAssign {
-    teacherId: string;
-    teacherEmail: string;
+    teacher: {
+        id: string;
+        email: string;
+    }[];
     assistantId: string;
     assistantEmail: string;
     counselorId: string;

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

@@ -3,12 +3,13 @@ declare const useAssignStudent: (teacherSelected?: any, assistantSelected?: obje
     handleAssignSingleStudent: (id: string) => void;
     handleAssignMultiStudent: (listUserIds: string[]) => void;
     openModelBulk: boolean;
-    handleToggleModel: () => void;
+    handleToggleModel: (listUserIds?: string[] | undefined) => void;
     handleChangeStaffBulk: (name: string, id: string) => void;
     staffBulkAssign: IStaffAssign;
     handleAssignStaffToStudents: (listUserIds: string[]) => void;
     handleToggleInactiveModal: (listUserIds?: string[] | undefined) => void;
     openInactiveModal: boolean;
     handleInactiveStudents: (listStudentIds: string[], callback: () => void) => Promise<void>;
+    handleChangeTeacherBulk: (value: any[]) => void;
 };
 export default useAssignStudent;

package/dist/index.js

@@ -39422,10 +39422,7 @@ var Dashboard = function Dashboard() {
   }, React__default.createElement(reactstrap.NavbarBrand, {
     href: "/",
     className: "" + styles["logo-home"]
-  }, React__default.createElement("img", {
-    src: getStaticFileUrl("/images/logo-white.svg"),
-    alt: "mario"
-  })), React__default.createElement(gi.GiHamburgerMenu, {
+  }), React__default.createElement(gi.GiHamburgerMenu, {
     onClick: toggle,
     className: styles["hide-in-desktop"] + " " + styles["hamburger-menu"]
   }), React__default.createElement(reactstrap.Collapse, {
@@ -39439,9 +39436,10 @@ var Dashboard = function Dashboard() {
     className: styles["learn-more"] + " align-self-md-center",
     href: "https://marioframework.com/software",
     target: "blank"
-  }, "Learn More")), React__default.createElement(reactstrap.NavItem, null, React__default.createElement(reactRouterDom.Link, {
-    className: styles["contact"] + " align-self-md-center",
-    to: "/contact"
+  }, "Learn More")), React__default.createElement(reactstrap.NavItem, null, React__default.createElement(reactstrap.NavLink, {
+    className: styles["learn-more"] + " align-self-md-center",
+    href: "mailto: name@email.com",
+    target: "blank"
   }, "Contact")), React__default.createElement(reactstrap.NavItem, null, React__default.createElement(reactstrap.NavLink, {
     className: styles["learn-more"] + " align-self-md-center",
     href: "/privacy-policy",
@@ -42357,11 +42355,10 @@ var initialStaffBulk = {
   assistantId: "",
   counselorId: "",
   secondaryTeacherId: "",
-  teacherId: "",
+  teacher: [],
   assistantEmail: "",
   counselorEmail: "",
-  secondaryTeacherEmail: "",
-  teacherEmail: ""
+  secondaryTeacherEmail: ""
 };
 
 var useFilters$1 = function useFilters() {
@@ -43237,6 +43234,7 @@ var TableHeader = function TableHeader(_ref) {
       onChangeFilters: onChangeFilters,
       onOptionsChange: handleChangeFilters
     }) : React__default.createElement("th", {
+      key: header.name,
       className: "align-middle text-center"
     }, React__default.createElement("input", {
       type: "checkbox",
@@ -43392,7 +43390,6 @@ var UserList = function UserList() {
     bordered: true,
     hover: true,
     striped: true,
-    responsive: true,
     size: "sm"
   }, React__default.createElement("thead", null, React__default.createElement(TableHeader, {
     headers: UserColumns,
@@ -43948,12 +43945,6 @@ var useTeacherList = function useTeacherList() {
     var selectedTeacher = teacherOptions.filter(function (t) {
       return teacherIds.includes(t.value);
     });
-    console.log({
-      teacherIds: teacherIds
-    });
-    console.log({
-      selectedTeacher: selectedTeacher
-    });
     setSelectedTeachers(_extends({}, selectedTeachers, (_extends2 = {}, _extends2[studentUserId] = selectedTeacher, _extends2)));
   }, [JSON.stringify(selectedTeachers), JSON.stringify(teacherOptions)]);
   var handleCreateTeacherOption = React.useCallback(function (newTeacher, studentUserId, isSelectTeacher) {
@@ -43992,7 +43983,15 @@ var useAssignStudent = function useAssignStudent(teacherSelected, assistantSelec
       openInactiveModal = _useState3[0],
       setOpenInactiveModal = _useState3[1];
 
-  var handleToggleModel = function handleToggleModel() {
+  var handleToggleModel = function handleToggleModel(listUserIds) {
+    if (listUserIds && listUserIds.length === 0) {
+      dispatch(setAlert({
+        type: "danger",
+        message: "Please select students!"
+      }));
+      return;
+    }
+
     setOpenModelBulk(!openModelBulk);
     setStaffBulkAssign(_extends({}, initialStaffBulk));
   };
@@ -44015,6 +44014,12 @@ var useAssignStudent = function useAssignStudent(teacherSelected, assistantSelec
     setStaffBulkAssign(_extends({}, staffBulkAssign, (_extends2 = {}, _extends2[name] = id, _extends2)));
   };
 
+  var handleChangeTeacherBulk = function handleChangeTeacherBulk(value) {
+    setStaffBulkAssign(_extends({}, staffBulkAssign, {
+      teacher: value
+    }));
+  };
+
   var assignStudents = function assignStudents(users) {
     try {
       var _temp3 = function _temp3() {
@@ -44071,18 +44076,11 @@ var useAssignStudent = function useAssignStudent(teacherSelected, assistantSelec
       return;
     }
 
-    console.log("list userId");
-    console.log({
-      listUserIds: listUserIds
-    });
     var users = listUserIds.map(function (i) {
       var teacher = teacherSelected === null || teacherSelected === void 0 ? void 0 : teacherSelected[i];
       var assistant = assistantSelected === null || assistantSelected === void 0 ? void 0 : assistantSelected[i];
       var counselor = counselorSelected === null || counselorSelected === void 0 ? void 0 : counselorSelected[i];
       var secondaryTeacher = secondaryTeacherSelected === null || secondaryTeacherSelected === void 0 ? void 0 : secondaryTeacherSelected[i];
-      console.log({
-        teacher: teacher
-      });
       var value = {
         id: i
       };
@@ -44120,10 +44118,6 @@ var useAssignStudent = function useAssignStudent(teacherSelected, assistantSelec
     var assistant = assistantSelected === null || assistantSelected === void 0 ? void 0 : assistantSelected[id];
     var counselor = counselorSelected === null || counselorSelected === void 0 ? void 0 : counselorSelected[id];
     var secondaryTeacher = secondaryTeacherSelected === null || secondaryTeacherSelected === void 0 ? void 0 : secondaryTeacherSelected[id];
-    console.log("assign student");
-    console.log({
-      teacherSelected: teacherSelected
-    });
 
     if (!teacher && !assistant && !counselor && !secondaryTeacher) {
       dispatch(setAlert({
@@ -44164,11 +44158,6 @@ 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) {
-    console.log("staffBulkAssign");
-    console.log({
-      staffBulkAssign: staffBulkAssign
-    });
-
     if (listUserIds.length === 0) {
       dispatch(setAlert({
         type: "danger",
@@ -44177,9 +44166,23 @@ var useAssignStudent = function useAssignStudent(teacherSelected, assistantSelec
       return;
     }
 
+    if (staffBulkAssign.teacher.length === 0) {
+      dispatch(setAlert({
+        type: "danger",
+        message: "Please select teacher before assign!"
+      }));
+      return;
+    }
+
     var users = listUserIds.map(function (i) {
       var value = {
         id: i,
+        mainTeacherUserId: staffBulkAssign.teacher.map(function (t) {
+          return t.id;
+        }) || [],
+        mainTeacherEmail: staffBulkAssign.teacher.map(function (t) {
+          return t.email;
+        }) || [],
         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,
@@ -44237,7 +44240,8 @@ var useAssignStudent = function useAssignStudent(teacherSelected, assistantSelec
     handleAssignStaffToStudents: handleAssignStaffToStudents,
     handleToggleInactiveModal: handleToggleInactiveModal,
     openInactiveModal: openInactiveModal,
-    handleInactiveStudents: handleInactiveStudents
+    handleInactiveStudents: handleInactiveStudents,
+    handleChangeTeacherBulk: handleChangeTeacherBulk
   };
 };
 
@@ -44299,7 +44303,8 @@ var AssignStudentList = function AssignStudentList() {
       handleAssignStaffToStudents = _useAssignStudent.handleAssignStaffToStudents,
       handleToggleInactiveModal = _useAssignStudent.handleToggleInactiveModal,
       openInactiveModal = _useAssignStudent.openInactiveModal,
-      handleInactiveStudents = _useAssignStudent.handleInactiveStudents;
+      handleInactiveStudents = _useAssignStudent.handleInactiveStudents,
+      handleChangeTeacherBulk = _useAssignStudent.handleChangeTeacherBulk;
 
   var AssignStudentColumns = [{
     name: "",
@@ -44376,7 +44381,7 @@ var AssignStudentList = function AssignStudentList() {
   }, t("assign_for_selected_students")), React__default.createElement(reactstrap.Button, {
     className: "ml-2",
     onClick: function onClick() {
-      return handleToggleModel();
+      return handleToggleModel(isCheck);
     },
     color: "primary"
   }, t("assign_bulk")), React__default.createElement(reactstrap.Button, {
@@ -44391,19 +44396,30 @@ var AssignStudentList = function AssignStudentList() {
     toggle: function toggle() {
       return handleToggleModel();
     }
-  }, React__default.createElement(reactstrap.ModalHeader, null, t("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,
+  }, React__default.createElement(reactstrap.ModalHeader, null, t("assign_bulk_student")), React__default.createElement(reactstrap.ModalBody, null, React__default.createElement(CustomSelector, {
+    isMulti: true,
+    value: staffBulkAssign.teacher.map(function (e) {
+      return {
+        label: e.email,
+        value: e.id
+      };
+    }),
     options: teacherOptions,
-    onChange: function onChange(e) {
-      return handleChangeStaffBulk("teacherId", e.value);
-    },
-    onCreateOption: function onCreateOption(value) {
-      handleChangeStaffBulk("teacherEmail", value.label);
-    },
     placeholder: t("select_teacher"),
-    className: "flex-grow-1 mb-3"
+    className: "flex-grow-1 mb-3",
+    onChange: function onChange(value) {
+      var data = value.map(function (e) {
+        return {
+          id: e.value,
+          email: e.label
+        };
+      });
+      handleChangeTeacherBulk(data);
+    },
+    isClearable: true,
+    style: {
+      maxWidth: 120
+    }
   }), React__default.createElement(TeacherSelector, {
     value: assistantOptions.find(function (r) {
       return r.value == staffBulkAssign.assistantId || r.label == staffBulkAssign.assistantEmail;
@@ -44496,7 +44512,6 @@ var AssignStudentList = function AssignStudentList() {
     bordered: true,
     hover: true,
     striped: true,
-    responsive: true,
     size: "sm"
   }, React__default.createElement("thead", null, React__default.createElement(TableHeader, {
     isStudentFilter: true,
@@ -44519,9 +44534,13 @@ var AssignStudentList = function AssignStudentList() {
     }, item.fullName), React__default.createElement("td", {
       className: "align-middle"
     }, item.email), React__default.createElement("td", {
-      className: "align-middle"
+      className: "align-middle",
+      style: {
+        maxWidth: 250
+      }
     }, !!item.teachers && item.teachers.length > 0 ? React__default.createElement(React__default.Fragment, null, item.teachers.map(function (record) {
       return React__default.createElement("p", {
+        key: record.mainTeacherEmail,
         className: "mb-0"
       }, record.mainTeacherName, " - ", record.mainTeacherEmail);
     })) : React__default.createElement(TeacherSelector, {