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

refactor: stdLearning student activities bug fix

Browse Source
This commit is contained in:
elangptra 2024-10-24 09:46:11 +07:00
parent f88da97055
commit a3b34c3136
1 changed files with 44 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
controllers/learningControllers/stdLearning.js
View File

@ -251,10 +251,18 @@ export const learningHistory = async (req, res) => {
const { ID } = req.user; const { ID } = req.user;
const stdLearnings = await models.StdLearning.findAll({ const stdLearnings = await models.StdLearning.findAll({
where: { ID }, where: {
ID,
STUDENT_FINISH: { STUDENT_FINISH: {
[models.Sequelize.Op.ne]: null, [models.Sequelize.Op.ne]: null,
}, },
SCORE: {
[models.Sequelize.Op.ne]: null,
},
NEXT_LEARNING: {
[models.Sequelize.Op.ne]: null,
},
},
include: [ include: [
{ {
model: models.Level, model: models.Level,
@ -351,10 +359,18 @@ export const learningHistoryBySectionId = async (req, res) => {
const { sectionId } = req.params; const { sectionId } = req.params;
const stdLearnings = await models.StdLearning.findAll({ const stdLearnings = await models.StdLearning.findAll({
where: { ID }, where: {
ID,
STUDENT_FINISH: { STUDENT_FINISH: {
[models.Sequelize.Op.ne]: null, [models.Sequelize.Op.ne]: null,
}, },
SCORE: {
[models.Sequelize.Op.ne]: null,
},
NEXT_LEARNING: {
[models.Sequelize.Op.ne]: null,
},
},
include: [ include: [
{ {
model: models.Level, model: models.Level,
@ -456,10 +472,18 @@ export const learningHistoryByTopicId = async (req, res) => {
} }
const stdLearnings = await models.StdLearning.findAll({ const stdLearnings = await models.StdLearning.findAll({
where: { ID }, where: {
ID,
STUDENT_FINISH: { STUDENT_FINISH: {
[models.Sequelize.Op.ne]: null, [models.Sequelize.Op.ne]: null,
}, },
SCORE: {
[models.Sequelize.Op.ne]: null,
},
NEXT_LEARNING: {
[models.Sequelize.Op.ne]: null,
},
},
include: [ include: [
{ {
model: models.Level, model: models.Level,
@ -548,6 +572,17 @@ export const learningHistoryByTopicId = async (req, res) => {
export const recentStudentActivities = async (req, res) => { export const recentStudentActivities = async (req, res) => {
try { try {
const stdLearnings = await models.StdLearning.findAll({ const stdLearnings = await models.StdLearning.findAll({
where: {
STUDENT_FINISH: {
[models.Sequelize.Op.ne]: null,
},
SCORE: {
[models.Sequelize.Op.ne]: null,
},
NEXT_LEARNING: {
[models.Sequelize.Op.ne]: null,
},
},
include: [ include: [
{ {
model: models.User, model: models.User,