From 4822b68407f77a96b8fbfa639b5ae955a8ff19e9 Mon Sep 17 00:00:00 2001 From: lemuel Date: Sun, 24 Oct 2021 14:41:03 -0500 Subject: [PATCH] pasar lsita listo --- server/controller/Alumno/pasarLista.js | 9 +++++++-- server/routes/Alumno.js | 12 ++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/server/controller/Alumno/pasarLista.js b/server/controller/Alumno/pasarLista.js index 6b1e349..dbc9418 100644 --- a/server/controller/Alumno/pasarLista.js +++ b/server/controller/Alumno/pasarLista.js @@ -1,7 +1,7 @@ const moment = require('moment'); const dbHelper = '../../helper'; const gmail = require(`${dbHelper}/gmail`); -const { correoAsistencia } = require(`${dbHelper}/correoAlumno`); +const { correoAsistencia } = require(`${dbHelper}/correos`); const { validarId } = require(`${dbHelper}/validar`); const dbPath = '../../db/tablas'; const Alumno = require(`${dbPath}/Alumno`); @@ -10,7 +10,8 @@ const ahora = moment(); const pasarLista = async (body) => { const idAlumno = validarId(body.idAlumno); - const correo = {}; + let correo = {}; + let horario = moment(); return Alumno.findOne({ where: { idAlumno }, @@ -18,7 +19,11 @@ const pasarLista = async (body) => { }) .then((res) => { if (!res) throw new Error('No existe este alumno.'); + horario = moment(res.Horario.horario); if (res.asistio) throw new Error('Ya paso lista a este alumno.'); + if (ahora < horario) throw new Error('Aun no es la hora del recorrido.'); + horario.add(20, 'm'); + if (ahora > horario) throw new Error('Ya paso la hora del recorrido.'); return Alumno.update({ asistio: true }, { where: { idAlumno } }); }) .then((res) => { diff --git a/server/routes/Alumno.js b/server/routes/Alumno.js index 81c0a46..20046da 100644 --- a/server/routes/Alumno.js +++ b/server/routes/Alumno.js @@ -5,6 +5,7 @@ const controllerPath = '../controller/Alumno'; const get = require(`${controllerPath}/get`); const monitor = require(`${controllerPath}/monitor`); const registrar = require(`${controllerPath}/registrar`); +const pasarLista = require(`${controllerPath}/pasarLista`); // POST app.post(`${route}/registrar`, (req, res) => { @@ -17,6 +18,17 @@ app.post(`${route}/registrar`, (req, res) => { }); }); +// PUT +app.put(`${route}/pasar_lista`, (req, res) => { + return pasarLista(req.body) + .then((data) => { + res.status(200).json(data); + }) + .catch((err) => { + res.status(400).json({ message: err.message }); + }); +}); + // GET app.get(`${route}`, (req, res) => { return get(req.query)