mario-core 2.9.324-release → 2.9.325-release
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/containers/User/hooks/useAssignStudent.d.ts +1 -1
- package/dist/index.js +11 -5
- package/dist/index.js.map +1 -1
- package/dist/index.modern.js +11 -5
- package/dist/index.modern.js.map +1 -1
- package/dist/services/weeklyQuestService.d.ts +1 -0
- package/dist/types/WeeklyQuest.d.ts +37 -0
- package/package.json +1 -1
- package/dist/hooks/useClassFontSize.d.ts +0 -4
|
@@ -6,7 +6,7 @@ declare const useAssignStudent: (teacherSelected?: any, assistantSelected?: obje
|
|
|
6
6
|
handleToggleModel: (listUserIds?: string[] | undefined) => void;
|
|
7
7
|
handleChangeStaffBulk: (name: string, id: string) => void;
|
|
8
8
|
staffBulkAssign: IStaffAssign;
|
|
9
|
-
handleAssignStaffToStudents: (listUserIds: string[]) => void;
|
|
9
|
+
handleAssignStaffToStudents: (listUserIds: string[], isTeacherExit: boolean) => void;
|
|
10
10
|
handleToggleInactiveModal: (listUserIds?: string[] | undefined) => void;
|
|
11
11
|
openInactiveModal: boolean;
|
|
12
12
|
handleInactiveStudents: (listStudentIds: string[], callback: () => void) => Promise<void>;
|
package/dist/index.js
CHANGED
|
@@ -44170,7 +44170,8 @@ var useAssignStudent = function useAssignStudent(teacherSelected, assistantSelec
|
|
|
44170
44170
|
|
|
44171
44171
|
assignStudents([studentRequest]);
|
|
44172
44172
|
}, [JSON.stringify(teacherSelected), JSON.stringify(assistantSelected), JSON.stringify(counselorSelected), JSON.stringify(secondaryTeacherSelected)]);
|
|
44173
|
-
|
|
44173
|
+
|
|
44174
|
+
var handleAssignStaffToStudents = function handleAssignStaffToStudents(listUserIds, isTeacherExit) {
|
|
44174
44175
|
if (listUserIds.length === 0) {
|
|
44175
44176
|
dispatch(setAlert({
|
|
44176
44177
|
type: "danger",
|
|
@@ -44179,7 +44180,7 @@ var useAssignStudent = function useAssignStudent(teacherSelected, assistantSelec
|
|
|
44179
44180
|
return;
|
|
44180
44181
|
}
|
|
44181
44182
|
|
|
44182
|
-
if (staffBulkAssign.teacher.length === 0) {
|
|
44183
|
+
if (staffBulkAssign.teacher.length === 0 && !isTeacherExit) {
|
|
44183
44184
|
dispatch(setAlert({
|
|
44184
44185
|
type: "danger",
|
|
44185
44186
|
message: "Please select teacher before assign!"
|
|
@@ -44207,7 +44208,7 @@ var useAssignStudent = function useAssignStudent(teacherSelected, assistantSelec
|
|
|
44207
44208
|
});
|
|
44208
44209
|
handleToggleModel();
|
|
44209
44210
|
assignStudents([].concat(users));
|
|
44210
|
-
}
|
|
44211
|
+
};
|
|
44211
44212
|
|
|
44212
44213
|
var handleInactiveStudents = function handleInactiveStudents(listStudentIds, callback) {
|
|
44213
44214
|
try {
|
|
@@ -44319,6 +44320,11 @@ var AssignStudentList = function AssignStudentList() {
|
|
|
44319
44320
|
handleInactiveStudents = _useAssignStudent.handleInactiveStudents,
|
|
44320
44321
|
handleChangeTeacherBulk = _useAssignStudent.handleChangeTeacherBulk;
|
|
44321
44322
|
|
|
44323
|
+
var isExitTeachers = React.useMemo(function () {
|
|
44324
|
+
return userList.filter(function (item) {
|
|
44325
|
+
return isCheck.includes(item.id) && item.teachers.length > 0;
|
|
44326
|
+
}).length > 0;
|
|
44327
|
+
}, [JSON.stringify(isCheck)]);
|
|
44322
44328
|
var AssignStudentColumns = [{
|
|
44323
44329
|
name: "",
|
|
44324
44330
|
isCenter: true,
|
|
@@ -44409,7 +44415,7 @@ var AssignStudentList = function AssignStudentList() {
|
|
|
44409
44415
|
toggle: function toggle() {
|
|
44410
44416
|
return handleToggleModel();
|
|
44411
44417
|
}
|
|
44412
|
-
}, React__default.createElement(reactstrap.ModalHeader, null, t("assign_bulk_student")), React__default.createElement(reactstrap.ModalBody, null, React__default.createElement(CustomSelector, {
|
|
44418
|
+
}, React__default.createElement(reactstrap.ModalHeader, null, t("assign_bulk_student")), React__default.createElement(reactstrap.ModalBody, null, !isExitTeachers && React__default.createElement(CustomSelector, {
|
|
44413
44419
|
isMulti: true,
|
|
44414
44420
|
value: staffBulkAssign.teacher.map(function (e) {
|
|
44415
44421
|
return {
|
|
@@ -44481,7 +44487,7 @@ var AssignStudentList = function AssignStudentList() {
|
|
|
44481
44487
|
}, t("cancel")), React__default.createElement(reactstrap.Button, {
|
|
44482
44488
|
color: "primary",
|
|
44483
44489
|
onClick: function onClick() {
|
|
44484
|
-
return handleAssignStaffToStudents(isCheck);
|
|
44490
|
+
return handleAssignStaffToStudents(isCheck, isExitTeachers);
|
|
44485
44491
|
}
|
|
44486
44492
|
}, t("assign")))), React__default.createElement(reactstrap.Modal, {
|
|
44487
44493
|
centered: true,
|