elangptra/backend_adaptive_learning
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: student activities by class

Browse Source
This commit is contained in:
elangptra 2024-12-05 14:10:35 +07:00
parent b75d3deacc
commit 851d218540
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
controllers/learningControllers/stdLearning.js
View File

@ -716,10 +716,10 @@ export const recentStudentActivities = async (req, res) => {
export const recentStudentActivitiesByClassId = async (req, res) => { export const recentStudentActivitiesByClassId = async (req, res) => {
const { page = 1, limit = 5, search = "" } = req.query; const { page = 1, limit = 5, search = "" } = req.query;
const { ID_CLASS } = req.body; const { idClass } = req.params;
try { try {
const classData = await models.Class.findByPk(ID_CLASS); const classData = await models.Class.findByPk(idClass);
if (!classData) { if (!classData) {
return response(404, null, "Class not found", res); return response(404, null, "Class not found", res);
@ -737,8 +737,8 @@ export const recentStudentActivitiesByClassId = async (req, res) => {
NEXT_LEARNING: { NEXT_LEARNING: {
[models.Sequelize.Op.ne]: null, [models.Sequelize.Op.ne]: null,
}, },
...(ID_CLASS && { ...(idClass && {
"$learningUser.students.ID_CLASS$": ID_CLASS, "$learningUser.students.ID_CLASS$": idClass,
}), }),
...(search && { ...(search && {
[models.Sequelize.Op.or]: [ [models.Sequelize.Op.or]: [

2
routes/learning/stdLearning.js
View File

@ -9,7 +9,7 @@ router.get("/stdLearning", verifyLoginUser, getStdLearnings);
router.get("/stdLearning/activities", verifyLoginUser, recentStudentActivities); router.get("/stdLearning/activities", verifyLoginUser, recentStudentActivities);
router.get("/stdLearning/activities/class", verifyLoginUser, recentStudentActivitiesByClassId); router.get("/stdLearning/activities/class/:idClass", verifyLoginUser, recentStudentActivitiesByClassId);
router.get("/stdLearning/:id", verifyLoginUser, getStdLearningById); router.get("/stdLearning/:id", verifyLoginUser, getStdLearningById);

2
routes/monitoring/monitoring.js
View File

@ -8,7 +8,7 @@ router.get("/monitoring", verifyLoginUser, getMonitorings);
router.get("/monitoring/progress", verifyLoginUser, adminOrTeacherOnly, monitoringStudentsProgress); router.get("/monitoring/progress", verifyLoginUser, adminOrTeacherOnly, monitoringStudentsProgress);
router.get("/monitoring/class", verifyLoginUser, getClassMonitoringDataByClassAndTopic); router.post("/monitoring/class", verifyLoginUser, getClassMonitoringDataByClassAndTopic);
router.get("/monitoring/:id", verifyLoginUser, getMonitoringById); router.get("/monitoring/:id", verifyLoginUser, getMonitoringById);