mario-education 2.4.238-release → 2.4.240-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/index.js +16 -20
- package/dist/index.js.map +1 -1
- package/dist/index.modern.js +16 -20
- package/dist/index.modern.js.map +1 -1
- package/package.json +2 -2
package/dist/index.js
CHANGED
|
@@ -244,7 +244,7 @@ function _finallyRethrows(body, finalizer) {
|
|
|
244
244
|
}
|
|
245
245
|
|
|
246
246
|
var CLASS_URL = marioCore.BASE_URL + "/api/academicclass";
|
|
247
|
-
var STUDENT_URL = marioCore.BASE_URL + "/api/
|
|
247
|
+
var STUDENT_URL = marioCore.BASE_URL + "/api/Student";
|
|
248
248
|
var TEACHER_URL = marioCore.BASE_URL + "/api/teacher";
|
|
249
249
|
var get = function get(filter) {
|
|
250
250
|
return marioCore.api.get(CLASS_URL, {
|
|
@@ -267,10 +267,11 @@ var getStudents = function getStudents(classId) {
|
|
|
267
267
|
return marioCore.api.get(CLASS_URL + "/" + classId + "/students");
|
|
268
268
|
};
|
|
269
269
|
var getAllStudents = function getAllStudents(searchString, userId) {
|
|
270
|
-
return marioCore.api.get(STUDENT_URL + "/
|
|
270
|
+
return marioCore.api.get(STUDENT_URL + "/allStudents", {
|
|
271
271
|
params: {
|
|
272
272
|
searchString: searchString,
|
|
273
|
-
userId: userId
|
|
273
|
+
userId: userId,
|
|
274
|
+
rolesParams: ["Admin"]
|
|
274
275
|
}
|
|
275
276
|
});
|
|
276
277
|
};
|
|
@@ -30012,7 +30013,8 @@ var useChartDatas = function useChartDatas() {
|
|
|
30012
30013
|
handleChangeFilters: handleFilterTeacher,
|
|
30013
30014
|
labelBox: labelBox,
|
|
30014
30015
|
setLabelBox: setLabelBox,
|
|
30015
|
-
studentId: filter.studentId
|
|
30016
|
+
studentId: filter.studentId,
|
|
30017
|
+
studentUserId: filter.studentUserId
|
|
30016
30018
|
}];
|
|
30017
30019
|
var totalCardData = [{
|
|
30018
30020
|
icon: "images/icon_chart.png",
|
|
@@ -30115,7 +30117,6 @@ var StudentItemSelector = function StudentItemSelector(_ref) {
|
|
|
30115
30117
|
isLoading = _useState3[0],
|
|
30116
30118
|
setLoading = _useState3[1];
|
|
30117
30119
|
|
|
30118
|
-
var timeout = React.useRef();
|
|
30119
30120
|
var loadData = React.useCallback(function () {
|
|
30120
30121
|
try {
|
|
30121
30122
|
var _temp5 = function _temp5() {
|
|
@@ -30129,19 +30130,20 @@ var StudentItemSelector = function StudentItemSelector(_ref) {
|
|
|
30129
30130
|
if (!value) {
|
|
30130
30131
|
var _temp7 = function () {
|
|
30131
30132
|
if (!isDeleted) {
|
|
30132
|
-
return Promise.resolve(getAllStudents(
|
|
30133
|
-
|
|
30133
|
+
return Promise.resolve(getAllStudents("", teacherUserId)).then(function (res) {
|
|
30134
|
+
var _res$data;
|
|
30135
|
+
|
|
30136
|
+
setStudents((_res$data = res.data) != null ? _res$data : []);
|
|
30134
30137
|
});
|
|
30135
30138
|
} else {
|
|
30136
30139
|
var filters = {
|
|
30137
30140
|
currentPage: 1,
|
|
30138
|
-
pageSize: 100
|
|
30139
|
-
searchString: searchString
|
|
30141
|
+
pageSize: 100
|
|
30140
30142
|
};
|
|
30141
30143
|
return Promise.resolve(get$d(filters)).then(function (res) {
|
|
30142
|
-
var _res$
|
|
30144
|
+
var _res$data2;
|
|
30143
30145
|
|
|
30144
|
-
setStudents(((_res$
|
|
30146
|
+
setStudents(((_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.items) || []);
|
|
30145
30147
|
});
|
|
30146
30148
|
}
|
|
30147
30149
|
}();
|
|
@@ -30164,16 +30166,10 @@ var StudentItemSelector = function StudentItemSelector(_ref) {
|
|
|
30164
30166
|
} catch (e) {
|
|
30165
30167
|
return Promise.reject(e);
|
|
30166
30168
|
}
|
|
30167
|
-
}, [
|
|
30169
|
+
}, [teacherUserId]);
|
|
30168
30170
|
React.useEffect(function () {
|
|
30169
|
-
|
|
30170
|
-
|
|
30171
|
-
if (!searchString || searchString.trim().length < 2) {
|
|
30172
|
-
setStudents([]);
|
|
30173
|
-
} else {
|
|
30174
|
-
timeout.current = setTimeout(loadData, 300);
|
|
30175
|
-
}
|
|
30176
|
-
}, [searchString]);
|
|
30171
|
+
loadData();
|
|
30172
|
+
}, [teacherUserId]);
|
|
30177
30173
|
var options = value ? [studentDefault] : students.filter(function (student) {
|
|
30178
30174
|
return !externalStudentIds || externalStudentIds && !externalStudentIds.includes(student.studentId);
|
|
30179
30175
|
}).map(function (student) {
|