diff --git a/server/controller/AlumnoHorario/monitor.js b/server/controller/AlumnoHorario/monitor.js index bda875f..04bc8e7 100644 --- a/server/controller/AlumnoHorario/monitor.js +++ b/server/controller/AlumnoHorario/monitor.js @@ -3,8 +3,30 @@ const { validarId } = require(`${dbHelper}/validar`); const dbPath = '../../db/tablas'; const Alumno = require(`${dbPath}/Alumno`); const AlumnoHorario = require(`${dbPath}/AlumnoHorario`); +const Carrera = require(`${dbPath}/Carrera`); const Horario = require(`${dbPath}/Horario`); -const monitor = async (body) => {}; +const monitor = async (body) => { + const data = []; + + return Horario.findAll().then(async (res) => { + for (let i = 0; i < res.length; i++) { + const Asistentes = await AlumnoHorario.findAll({ + where: { idHorario: res[i].idHorario }, + include: [{ model: Alumno, include: [{ model: Carrera }] }], + }).then((res) => { + for (let j = 0; j < res.length; j++) { + delete res[j].dataValues.idHorario; + delete res[j].dataValues.idAlumno; + delete res[j].dataValues.Alumno.dataValues.idCarrera; + } + return res; + }); + + data.push({ Horario: res[i], Asistentes }); + } + return data; + }); +}; module.exports = monitor; diff --git a/server/routes/AlumnoHorario.js b/server/routes/AlumnoHorario.js index 135743f..391148a 100644 --- a/server/routes/AlumnoHorario.js +++ b/server/routes/AlumnoHorario.js @@ -3,6 +3,7 @@ const app = express(); const route = '/alumno_horario'; const controllerPath = '../controller/AlumnoHorario'; const registrar = require(`${controllerPath}/registrar`); +const monitor = require(`${controllerPath}/monitor`); // POST app.post(`${route}/registrar`, (req, res) => { @@ -16,14 +17,14 @@ app.post(`${route}/registrar`, (req, res) => { }); // GET -// app.get(`${route}/monitor`, (req, res) => { -// return monitor(req.body) -// .then((data) => { -// res.status(200).json(data); -// }) -// .catch((err) => { -// res.status(400).json({ message: err.message }); -// }); -// }); +app.get(`${route}/monitor`, (req, res) => { + return monitor() + .then((data) => { + res.status(200).json(data); + }) + .catch((err) => { + res.status(400).json({ message: err.message }); + }); +}); module.exports = app;