diff --git a/server/controller/CasoEspecial/casoEspecial.js b/server/controller/CasoEspecial/casoEspecial.js index 7e67ffc..c0bf8da 100644 --- a/server/controller/CasoEspecial/casoEspecial.js +++ b/server/controller/CasoEspecial/casoEspecial.js @@ -1,9 +1,10 @@ const validar = require('../../helper/validar'); -const CasoEspecial = require('../../db/tablas/CasoEspecial'); -const Usuario = require('../../db/tablas/Usuario'); -const TipoUsuario = require('../../db/tablas/TipoUsuario'); -const Carrera = require('../../db/tablas/Carrera'); -const Status = require('../../db/tablas/Status'); +const dbPath = '../../db/tablas'; +const Carrera = require(`${dbPath}/Carrera`); +const CasoEspecial = require(`${dbPath}/CasoEspecial`); +const Status = require(`${dbPath}/Status`); +const TipoUsuario = require(`${dbPath}/TipoUsuario`); +const Usuario = require(`${dbPath}/Usuario`); const admin = async (body) => { const idCasoEspecial = validar.validarId(body.idCasoEspecial); diff --git a/server/controller/CasoEspecial/liberacion.js b/server/controller/CasoEspecial/liberacion.js index 3292285..6da5f5a 100644 --- a/server/controller/CasoEspecial/liberacion.js +++ b/server/controller/CasoEspecial/liberacion.js @@ -1,8 +1,9 @@ const validar = require('../../helper/validar'); const gmail = require('../../helper/gmail'); const correos = require('../../helper/correos'); -const CasoEspecial = require('../../db/tablas/CasoEspecial'); -const Usuario = require('../../db/tablas/Usuario'); +const dbPath = '../../db/tablas'; +const CasoEspecial = require(`${dbPath}/CasoEspecial`); +const Usuario = require(`${dbPath}/Usuario`); const liberacion = async (body) => { const idCasoEspecial = validar.validarId(body.idCasoEspecial); diff --git a/server/controller/CasoEspecial/nuevo.js b/server/controller/CasoEspecial/nuevo.js index 9fa0860..cb356b3 100644 --- a/server/controller/CasoEspecial/nuevo.js +++ b/server/controller/CasoEspecial/nuevo.js @@ -1,8 +1,9 @@ -const drive = require('../../helper/drive'); -const CasoEspecial = require('../../db/tablas/CasoEspecial'); -const Usuario = require('../../db/tablas/Usuario'); -const Carrera = require('../../db/tablas/Carrera'); const validar = require('../../helper/validar'); +const drive = require('../../helper/drive'); +const dbPath = '../../db/tablas'; +const Carrera = require(`${dbPath}/Carrera`); +const CasoEspecial = require(`${dbPath}/CasoEspecial`); +const Usuario = require(`${dbPath}/Usuario`); const nuevo = async (body, file) => { const idUsuario = validar.validarId(body.idUsuario); diff --git a/server/controller/CasoEspecial/serviciosEspeciales.js b/server/controller/CasoEspecial/serviciosEspeciales.js index fe9baf6..0b4e311 100644 --- a/server/controller/CasoEspecial/serviciosEspeciales.js +++ b/server/controller/CasoEspecial/serviciosEspeciales.js @@ -1,10 +1,11 @@ const { Op } = require('sequelize'); const validar = require('../../helper/validar'); -const CasoEspecial = require('../../db/tablas/CasoEspecial'); -const Usuario = require('../../db/tablas/Usuario'); -const Carrera = require('../../db/tablas/Carrera'); -const Status = require('../../db/tablas/Status'); -const TipoUsuario = require('../../db/tablas/TipoUsuario'); +const dbPath = '../../db/tablas'; +const Carrera = require(`${dbPath}/Carrera`); +const CasoEspecial = require(`${dbPath}/CasoEspecial`); +const Status = require(`${dbPath}/Status`); +const TipoUsuario = require(`${dbPath}/TipoUsuario`); +const Usuario = require(`${dbPath}/Usuario`); const serviciosEspeciales = async (body) => { const pagina = validar.validarId(body.pagina); diff --git a/server/controller/CuestionarioAlumno/get.js b/server/controller/CuestionarioAlumno/get.js index fa6ee41..5c13a33 100644 --- a/server/controller/CuestionarioAlumno/get.js +++ b/server/controller/CuestionarioAlumno/get.js @@ -2,10 +2,11 @@ const fs = require('fs'); const { convertArrayToCSV } = require('convert-array-to-csv'); const { Op } = require('sequelize'); const validar = require('../../helper/validar'); -const CuestionarioAlumno = require('../../db/tablas/CuestionarioAlumno'); -const Servicio = require('../../db/tablas/Servicio'); -const Programa = require('../../db/tablas/Programa'); -const Usuario = require('../../db/tablas/Usuario'); +const dbPath = '../../db/tablas'; +const CuestionarioAlumno = require(`${dbPath}/CuestionarioAlumno`); +const Programa = require(`${dbPath}/Programa`); +const Servicio = require(`${dbPath}/Servicio`); +const Usuario = require(`${dbPath}/Usuario`); const get = async (body) => { const year = validar.validarNumero(body.year, 4); diff --git a/server/controller/CuestionarioAlumno/nuevo.js b/server/controller/CuestionarioAlumno/nuevo.js index 6feb5ae..57a7b59 100644 --- a/server/controller/CuestionarioAlumno/nuevo.js +++ b/server/controller/CuestionarioAlumno/nuevo.js @@ -1,6 +1,7 @@ const validar = require('../../helper/validar'); -const CuestionarioAlumno = require('../../db/tablas/CuestionarioAlumno'); -const Servicio = require('../../db/tablas/Servicio'); +const dbPath = '../../db/tablas'; +const CuestionarioAlumno = require(`${dbPath}/CuestionarioAlumno`); +const Servicio = require(`${dbPath}/Servicio`); const nuevo = async (body) => { const idServicio = validar.validarId(body.idServicio); diff --git a/server/controller/CuestionarioPrograma/get.js b/server/controller/CuestionarioPrograma/get.js index 797bf5a..eec23ed 100644 --- a/server/controller/CuestionarioPrograma/get.js +++ b/server/controller/CuestionarioPrograma/get.js @@ -2,10 +2,11 @@ const fs = require('fs'); const { convertArrayToCSV } = require('convert-array-to-csv'); const { Op } = require('sequelize'); const validar = require('../../helper/validar'); -const CuestionarioPrograma = require('../../db/tablas/CuestionarioPrograma'); -const Servicio = require('../../db/tablas/Servicio'); -const Programa = require('../../db/tablas/Programa'); -const Usuario = require('../../db/tablas/Usuario'); +const dbPath = '../../db/tablas'; +const CuestionarioPrograma = require(`${dbPath}/CuestionarioPrograma`); +const Servicio = require(`${dbPath}/Servicio`); +const Programa = require(`${dbPath}/Programa`); +const Usuario = require(`${dbPath}/Usuario`); const get = async (body) => { const year = validar.validarNumero(body.year, 4); diff --git a/server/controller/CuestionarioPrograma/nuevo.js b/server/controller/CuestionarioPrograma/nuevo.js index 55bb2ff..0ed51ba 100644 --- a/server/controller/CuestionarioPrograma/nuevo.js +++ b/server/controller/CuestionarioPrograma/nuevo.js @@ -1,6 +1,7 @@ const validar = require('../../helper/validar'); -const CuestionarioPrograma = require('../../db/tablas/CuestionarioPrograma'); -const Servicio = require('../../db/tablas/Servicio'); +const dbPath = '../../db/tablas'; +const CuestionarioPrograma = require(`${dbPath}/CuestionarioPrograma`); +const Servicio = require(`${dbPath}/Servicio`); const nuevo = async (body) => { const idServicio = validar.validarId(body.idServicio); diff --git a/server/controller/Programa/cargaMasiva.js b/server/controller/Programa/cargaMasiva.js index 2260380..d3ffe51 100644 --- a/server/controller/Programa/cargaMasiva.js +++ b/server/controller/Programa/cargaMasiva.js @@ -1,12 +1,14 @@ const fs = require('fs'); const moment = require('moment'); const csv = require('csvtojson'); -const gmail = require('../../helper/gmail'); -const correos = require('../../helper/correos'); -const encriptar = require('../../helper/encriptar'); -const validar = require('../../helper/validar'); -const Programa = require('../../db/tablas/Programa'); -const Usuario = require('../../db/tablas/Usuario'); +const helperPath = '../../helper'; +const gmail = require(`${helperPath}/gmail`); +const correos = require(`${helperPath}/correos`); +const encriptar = require(`${helperPath}/encriptar`); +const validar = require(`${helperPath}/validar`); +const dbPath = '../../db/tablas'; +const Programa = require(`${dbPath}/Programa`); +const Usuario = require(`${dbPath}/Usuario`); const cargaMasiva = async (file) => { const path = `server/uploads/${file}`; @@ -133,7 +135,11 @@ const cargaMasiva = async (file) => { } await gmail('Reporte carga masiva', 'lemuel@acatlan.unam.mx', mensaje); await gmail('Reporte carga masiva', 'dscad@acatlan.unam.mx', mensaje); - await gmail('Reporte carga masiva', 'tramites.ss@acatlan.unam.mx', mensaje); + await gmail( + 'Reporte carga masiva', + 'tramites.ss@acatlan.unam.mx', + mensaje + ); fs.unlinkSync(path); }); diff --git a/server/controller/Programa/programasAdmin.js b/server/controller/Programa/programasAdmin.js index 14d0a31..b0fe14a 100644 --- a/server/controller/Programa/programasAdmin.js +++ b/server/controller/Programa/programasAdmin.js @@ -1,6 +1,7 @@ const validar = require('../../helper/validar'); -const Programa = require('../../db/tablas/Programa'); -const Usuario = require('../../db/tablas/Usuario'); +const dbPath = '../../db/tablas'; +const Programa = require(`${dbPath}/Programa`); +const Usuario = require(`${dbPath}/Usuario`); const programasAdmin = async (body) => { const idUsuario = validar.validarId(body.idUsuario); diff --git a/server/controller/Programa/programasResponsable.js b/server/controller/Programa/programasResponsable.js index a81ad02..71e9855 100644 --- a/server/controller/Programa/programasResponsable.js +++ b/server/controller/Programa/programasResponsable.js @@ -1,6 +1,7 @@ const validar = require('../../helper/validar'); -const Programa = require('../../db/tablas/Programa'); -const Usuario = require('../../db/tablas/Usuario'); +const dbPath = '../../db/tablas'; +const Programa = require(`${dbPath}/Programa`); +const Usuario = require(`${dbPath}/Usuario`); const programasResponsable = async (body) => { const idUsuario = validar.validarId(body.idUsuario); diff --git a/server/controller/Servicio/admin.js b/server/controller/Servicio/admin.js index 9c1bcf7..4a40624 100644 --- a/server/controller/Servicio/admin.js +++ b/server/controller/Servicio/admin.js @@ -1,10 +1,11 @@ const validar = require('../../helper/validar'); -const Servicio = require('../../db/tablas/Servicio'); -const Usuario = require('../../db/tablas/Usuario'); -const TipoUsuario = require('../../db/tablas/TipoUsuario'); -const Carrera = require('../../db/tablas/Carrera'); -const Status = require('../../db/tablas/Status'); -const Programa = require('../../db/tablas/Programa'); +const dbPath = '../../db/tablas'; +const Carrera = require(`${dbPath}/Carrera`); +const Programa = require(`${dbPath}/Programa`); +const Servicio = require(`${dbPath}/Servicio`); +const Status = require(`${dbPath}/Status`); +const TipoUsuario = require(`${dbPath}/TipoUsuario`); +const Usuario = require(`${dbPath}/Usuario`); const admin = async (body) => { const idServicio = validar.validarId(body.idServicio); diff --git a/server/controller/Servicio/alumno.js b/server/controller/Servicio/alumno.js index c76c6b0..292ac27 100644 --- a/server/controller/Servicio/alumno.js +++ b/server/controller/Servicio/alumno.js @@ -1,10 +1,11 @@ const { Op } = require('sequelize'); const validar = require('../../helper/validar'); -const Servicio = require('../../db/tablas/Servicio'); -const Usuario = require('../../db/tablas/Usuario'); -const Carrera = require('../../db/tablas/Carrera'); -const Status = require('../../db/tablas/Status'); -const Programa = require('../../db/tablas/Programa'); +const dbPath = '../../db/tablas'; +const Carrera = require(`${dbPath}/Carrera`); +const Programa = require(`${dbPath}/Programa`); +const Servicio = require(`${dbPath}/Servicio`); +const Status = require(`${dbPath}/Status`); +const Usuario = require(`${dbPath}/Usuario`); const alumno = async (body) => { let idUsuario = validar.validarId(body.idUsuario); diff --git a/server/controller/Servicio/cancelar.js b/server/controller/Servicio/cancelar.js index d38b4f2..d503a11 100644 --- a/server/controller/Servicio/cancelar.js +++ b/server/controller/Servicio/cancelar.js @@ -1,9 +1,11 @@ -const validar = require('../../helper/validar'); -const gmail = require('../../helper/gmail'); -const correos = require('../../helper/correos'); -const Servicio = require('../../db/tablas/Servicio'); -const Usuario = require('../../db/tablas/Usuario'); -const Programa = require('../../db/tablas/Programa'); +const helperPath = '../../helper'; +const validar = require(`${helperPath}/validar`); +const gmail = require(`${helperPath}/gmail`); +const correos = require(`${helperPath}/correos`); +const dbPath = '../../db/tablas'; +const Programa = require(`${dbPath}/Programa`); +const Servicio = require(`${dbPath}/Servicio`); +const Usuario = require(`${dbPath}/Usuario`); const cancelar = async (body) => { const idServicio = validar.validarId(body.idServicio); diff --git a/server/controller/Servicio/cartaAceptacion.js b/server/controller/Servicio/cartaAceptacion.js index 9780cb4..c2ee64d 100644 --- a/server/controller/Servicio/cartaAceptacion.js +++ b/server/controller/Servicio/cartaAceptacion.js @@ -1,5 +1,6 @@ -const validar = require('../../helper/validar'); -const drive = require('../../helper/drive'); +const helperPath = '../../helper'; +const validar = require(`${helperPath}/validar`); +const drive = require(`${helperPath}/drive`); const Servicio = require('../../db/tablas/Servicio'); const cartaTermino = async (body, file) => { diff --git a/server/controller/Servicio/cartaTermino.js b/server/controller/Servicio/cartaTermino.js index c9c920d..e27ad14 100644 --- a/server/controller/Servicio/cartaTermino.js +++ b/server/controller/Servicio/cartaTermino.js @@ -1,5 +1,6 @@ -const validar = require('../../helper/validar'); -const drive = require('../../helper/drive'); +const helperPath = '../../helper'; +const validar = require(`${helperPath}/validar`); +const drive = require(`${helperPath}/drive`); const Servicio = require('../../db/tablas/Servicio'); const cartaTermino = async (body, file) => { diff --git a/server/controller/Servicio/gustavoBazPrada.js b/server/controller/Servicio/gustavoBazPrada.js index 230fd1b..294aeb3 100644 --- a/server/controller/Servicio/gustavoBazPrada.js +++ b/server/controller/Servicio/gustavoBazPrada.js @@ -3,9 +3,10 @@ const moment = require('moment'); const { convertArrayToCSV } = require('convert-array-to-csv'); const { Op } = require('sequelize'); const validar = require('../../helper/validar'); -const Servicio = require('../../db/tablas/Servicio'); -const Usuario = require('../../db/tablas/Usuario'); -const Carrera = require('../../db/tablas/Carrera'); +const dbPath = '../../db/tablas'; +const Carrera = require(`${dbPath}/Carrera`); +const Servicio = require(`${dbPath}/Servicio`); +const Usuario = require(`${dbPath}/Usuario`); const gustavoBazPrada = async (body) => { const year = validar.validarNumero(body.year, 4); diff --git a/server/controller/Servicio/informeGlobal.js b/server/controller/Servicio/informeGlobal.js index 0ea0a56..9443122 100644 --- a/server/controller/Servicio/informeGlobal.js +++ b/server/controller/Servicio/informeGlobal.js @@ -1,5 +1,6 @@ -const validar = require('../../helper/validar'); -const drive = require('../../helper/drive'); +const helperPath = '../../helper'; +const validar = require(`${helperPath}/validar`); +const drive = require(`${helperPath}/drive`); const Servicio = require('../../db/tablas/Servicio'); const informeGlobal = async (body, file) => { diff --git a/server/controller/Servicio/liberacion.js b/server/controller/Servicio/liberacion.js index 049b253..b53667d 100644 --- a/server/controller/Servicio/liberacion.js +++ b/server/controller/Servicio/liberacion.js @@ -1,10 +1,12 @@ const moment = require('moment'); -const validar = require('../../helper/validar'); -const gmail = require('../../helper/gmail'); -const correos = require('../../helper/correos'); -const Servicio = require('../../db/tablas/Servicio'); -const Usuario = require('../../db/tablas/Usuario'); -const Programa = require('../../db/tablas/Programa'); +const helperPath = '../../helper'; +const validar = require(`${helperPath}/validar`); +const gmail = require(`${helperPath}/gmail`); +const correos = require(`${helperPath}/correos`); +const dbPath = '../../db/tablas'; +const Programa = require(`${dbPath}/Programa`); +const Servicio = require(`${dbPath}/Servicio`); +const Usuario = require(`${dbPath}/Usuario`); const liberacion = async (body) => { const idServicio = validar.validarId(body.idServicio); diff --git a/server/controller/Servicio/nuevo.js b/server/controller/Servicio/nuevo.js index 0ca68b6..73f13f6 100644 --- a/server/controller/Servicio/nuevo.js +++ b/server/controller/Servicio/nuevo.js @@ -1,10 +1,12 @@ const { Op } = require('sequelize'); +const helperPath = '../../helper'; +const validar = require('../../helper/validar'); const drive = require('../../helper/drive'); +const dbPath = '../../db/tablas'; +const Carrera = require('../../db/tablas/Carrera'); +const Programa = require('../../db/tablas/Programa'); const Servicio = require('../../db/tablas/Servicio'); const Usuario = require('../../db/tablas/Usuario'); -const Programa = require('../../db/tablas/Programa'); -const Carrera = require('../../db/tablas/Carrera'); -const validar = require('../../helper/validar'); const nuevo = async (body, file) => { const idUsuario = validar.validarId(body.idUsuario); diff --git a/server/controller/Servicio/rechazarAceptacion.js b/server/controller/Servicio/rechazarAceptacion.js index 5b087df..764471e 100644 --- a/server/controller/Servicio/rechazarAceptacion.js +++ b/server/controller/Servicio/rechazarAceptacion.js @@ -1,9 +1,11 @@ -const validar = require('../../helper/validar'); -const gmail = require('../../helper/gmail'); -const correos = require('../../helper/correos'); -const Servicio = require('../../db/tablas/Servicio'); -const Usuario = require('../../db/tablas/Usuario'); -const Programa = require('../../db/tablas/Programa'); +const helperPath = '../../helper'; +const validar = require(`${helperPath}/validar`); +const gmail = require(`${helperPath}/gmail`); +const correos = require(`${helperPath}/correos`); +const dbPath = '../../db/tablas'; +const Programa = require(`${dbPath}/Programa`); +const Servicio = require(`${dbPath}/Servicio`); +const Usuario = require(`${dbPath}/Usuario`); const cancelar = async (body) => { const idServicio = validar.validarId(body.idServicio); diff --git a/server/controller/Servicio/rechazarInforme.js b/server/controller/Servicio/rechazarInforme.js index ca00989..04022d3 100644 --- a/server/controller/Servicio/rechazarInforme.js +++ b/server/controller/Servicio/rechazarInforme.js @@ -1,9 +1,11 @@ -const validar = require('../../helper/validar'); -const gmail = require('../../helper/gmail'); -const correos = require('../../helper/correos'); -const Servicio = require('../../db/tablas/Servicio'); -const Usuario = require('../../db/tablas/Usuario'); -const Programa = require('../../db/tablas/Programa'); +const helperPath = '../../helper'; +const validar = require(`${helperPath}/validar`); +const gmail = require(`${helperPath}/gmail`); +const correos = require(`${helperPath}/correos`); +const dbPath = '../../db/tablas'; +const Programa = require(`${dbPath}/Programa`); +const Servicio = require(`${dbPath}/Servicio`); +const Usuario = require(`${dbPath}/Usuario`); const cancelar = async (body) => { const idServicio = validar.validarId(body.idServicio); diff --git a/server/controller/Servicio/rechazarTermino.js b/server/controller/Servicio/rechazarTermino.js index a2cb982..ee25eec 100644 --- a/server/controller/Servicio/rechazarTermino.js +++ b/server/controller/Servicio/rechazarTermino.js @@ -1,9 +1,11 @@ -const validar = require('../../helper/validar'); -const gmail = require('../../helper/gmail'); -const correos = require('../../helper/correos'); -const Servicio = require('../../db/tablas/Servicio'); -const Usuario = require('../../db/tablas/Usuario'); -const Programa = require('../../db/tablas/Programa'); +const helperPath = '../../helper'; +const validar = require(`${helperPath}/validar`); +const gmail = require(`${helperPath}/gmail`); +const correos = require(`${helperPath}/correos`); +const dbPath = '../../db/tablas'; +const Programa = require(`${dbPath}/Programa`); +const Servicio = require(`${dbPath}/Servicio`); +const Usuario = require(`${dbPath}/Usuario`); const cancelar = async (body) => { const idServicio = validar.validarId(body.idServicio); diff --git a/server/controller/Servicio/registro.js b/server/controller/Servicio/registro.js index e3601d1..51fb385 100644 --- a/server/controller/Servicio/registro.js +++ b/server/controller/Servicio/registro.js @@ -1,9 +1,11 @@ -const validar = require('../../helper/validar'); -const encriptar = require('../../helper/encriptar'); -const gmail = require('../../helper/gmail'); -const correos = require('../../helper/correos'); -const Servicio = require('../../db/tablas/Servicio'); -const Usuario = require('../../db/tablas/Usuario'); +const helperPath = '../../helper'; +const validar = require(`${helperPath}/validar`); +const encriptar = require(`${helperPath}/encriptar`); +const gmail = require(`${helperPath}/gmail`); +const correos = require(`${helperPath}/correos`); +const dbPath = '../../db/tablas'; +const Servicio = require(`${dbPath}/Servicio`); +const Usuario = require(`${dbPath}/Usuario`); const registro = async (body) => { const idServicio = validar.validarId(body.idServicio); diff --git a/server/controller/Servicio/registroValidado.js b/server/controller/Servicio/registroValidado.js index 6642178..b6b0217 100644 --- a/server/controller/Servicio/registroValidado.js +++ b/server/controller/Servicio/registroValidado.js @@ -1,9 +1,11 @@ -const validar = require('../../helper/validar'); -const gmail = require('../../helper/gmail'); -const correos = require('../../helper/correos'); -const Servicio = require('../../db/tablas/Servicio'); -const Usuario = require('../../db/tablas/Usuario'); -const Programa = require('../../db/tablas/Programa'); +const helperPath = '../../helper'; +const validar = require(`${helperPath}/validar`); +const gmail = require(`${helperPath}/gmail`); +const correos = require(`${helperPath}/correos`); +const dbPath = '../../db/tablas'; +const Programa = require(`${dbPath}/Programa`); +const Servicio = require(`${dbPath}/Servicio`); +const Usuario = require(`${dbPath}/Usuario`); const registroValidado = async (body) => { const idServicio = validar.validarId(body.idServicio); diff --git a/server/controller/Servicio/reporte.js b/server/controller/Servicio/reporte.js index 23a93fc..e8e371b 100644 --- a/server/controller/Servicio/reporte.js +++ b/server/controller/Servicio/reporte.js @@ -2,11 +2,12 @@ const fs = require('fs'); const { convertArrayToCSV } = require('convert-array-to-csv'); const { Op } = require('sequelize'); const validar = require('../../helper/validar'); -const Servicio = require('../../db/tablas/Servicio'); -const Programa = require('../../db/tablas/Programa'); -const Usuario = require('../../db/tablas/Usuario'); -const Carrera = require('../../db/tablas/Carrera'); -const Status = require('../../db/tablas/Status'); +const dbPath = '../../db/tablas'; +const Carrera = require(`${dbPath}/Carrera`); +const Programa = require(`${dbPath}/Programa`); +const Servicio = require(`${dbPath}/Servicio`); +const Status = require(`${dbPath}/Status`); +const Usuario = require(`${dbPath}/Usuario`); const reporte = async (body) => { const inicio = validar.validarFecha(body.inicio); diff --git a/server/controller/Servicio/serviciosAdmin.js b/server/controller/Servicio/serviciosAdmin.js index 369c98f..31e5694 100644 --- a/server/controller/Servicio/serviciosAdmin.js +++ b/server/controller/Servicio/serviciosAdmin.js @@ -1,10 +1,11 @@ const { Op } = require('sequelize'); const validar = require('../../helper/validar'); -const Servicio = require('../../db/tablas/Servicio'); -const Usuario = require('../../db/tablas/Usuario'); -const Carrera = require('../../db/tablas/Carrera'); -const Status = require('../../db/tablas/Status'); -const TipoUsuario = require('../../db/tablas/TipoUsuario'); +const dbPath = '../../db/tablas'; +const Carrera = require(`${dbPath}/Carrera`); +const Servicio = require(`${dbPath}/Servicio`); +const Status = require(`${dbPath}/Status`); +const TipoUsuario = require(`${dbPath}/TipoUsuario`); +const Usuario = require(`${dbPath}/Usuario`); const serviciosAdmin = async (body) => { const pagina = validar.validarId(body.pagina); diff --git a/server/controller/Servicio/serviciosResponsable.js b/server/controller/Servicio/serviciosResponsable.js index 6ae73c8..bb8e64a 100644 --- a/server/controller/Servicio/serviciosResponsable.js +++ b/server/controller/Servicio/serviciosResponsable.js @@ -1,11 +1,12 @@ const { Op } = require('sequelize'); const validar = require('../../helper/validar'); -const Servicio = require('../../db/tablas/Servicio'); -const Usuario = require('../../db/tablas/Usuario'); -const Carrera = require('../../db/tablas/Carrera'); -const Status = require('../../db/tablas/Status'); -const TipoUsuario = require('../../db/tablas/TipoUsuario'); -const Programa = require('../../db/tablas/Programa'); +const dbPath = '../../db/tablas'; +const Carrera = require(`${dbPath}/Carrera`); +const Programa = require(`${dbPath}/Programa`); +const Servicio = require(`${dbPath}/Servicio`); +const Status = require(`${dbPath}/Status`); +const TipoUsuario = require(`${dbPath}/TipoUsuario`); +const Usuario = require(`${dbPath}/Usuario`); const serviciosResponsable = async (body) => { const pagina = validar.validarId(body.pagina); diff --git a/server/controller/Servicio/update.js b/server/controller/Servicio/update.js index 5d96c7c..a75c4df 100644 --- a/server/controller/Servicio/update.js +++ b/server/controller/Servicio/update.js @@ -1,5 +1,6 @@ -const drive = require('../../helper/drive'); -const validar = require('../../helper/validar'); +const helperPath = '../../helper'; +const validar = require(`${helperPath}/validar`); +const drive = require(`${helperPath}/drive`); const Servicio = require('../../db/tablas/Servicio'); const update = async (body, files) => { diff --git a/server/controller/Usuario/escolares.js b/server/controller/Usuario/escolares.js index 1e78ee9..c4b9f9b 100644 --- a/server/controller/Usuario/escolares.js +++ b/server/controller/Usuario/escolares.js @@ -1,14 +1,14 @@ require('../../config/config'); -const validar = require('../../helper/validar'); const axios = require('axios'); -const Usuario = require('../../db/tablas/Usuario'); -const Carrera = require('../../db/tablas/Carrera'); +const validar = require('../../helper/validar'); +const dbPath = '../../db/tablas'; +const Usuario = require(`${dbPath}/Usuario`); +const Carrera = require(`${dbPath}/Carrera`); const escolares = async (body) => { const numeroCuenta = validar.validarNumeroCuenta(body.numeroCuenta); let alumno; - //return sybase(numeroCuenta) return axios({ method: 'post', url: `${process.env.ESCOLARES}${numeroCuenta}`, @@ -24,13 +24,10 @@ const escolares = async (body) => { creditos: res.data.avance, carrera: res.data.carrconst.trim(), }; - while ( - alumno.nombre.search('‘') != -1 && - alumno.nombre.search('Ã') != -1 - ) { - alumno.nombre = alumno.nombre.replace('Ã', 'Ñ'); + while (alumno.nombre.search('‘') != -1) alumno.nombre = alumno.nombre.replace('‘', ''); - } + while (alumno.nombre.search('Ã') != -1) + alumno.nombre = alumno.nombre.replace('Ã', 'Ñ'); return Carrera.findOne({ where: { carrera: alumno.carrera } }); }) diff --git a/server/controller/Usuario/login.js b/server/controller/Usuario/login.js index 3627937..9eca3dc 100644 --- a/server/controller/Usuario/login.js +++ b/server/controller/Usuario/login.js @@ -1,14 +1,15 @@ -const encriptar = require('../../helper/encriptar'); const validar = require('../../helper/validar'); const { crearToken } = require('../../middleware/autentificacion'); -const Usuario = require('../../db/tablas/Usuario'); -const TipoUsuario = require('../../db/tablas/TipoUsuario'); +const { comparar } = require('../../helper/encriptar'); +const dbPath = '../../db/tablas'; +const Usuario = require(`${dbPath}/Usuario`); +const TipoUsuario = require(`${dbPath}/TipoUsuario`); const login = async (body) => { const usuario = validar.validar(body.usuario, 'El usuario', 60); const password = validar.validarAlfanumerico( body.password, - 'El password', + 'La contraseña', 20 ); @@ -18,7 +19,7 @@ const login = async (body) => { }).then((res) => { if (!res) throw new Error('No existe este usuario.'); if (!res.activo) throw new Error('Este usuario no esta activo.'); - if (encriptar.comparar(password, res.password)) { + if (comparar(password, res.password)) { delete res.dataValues.password; delete res.dataValues.activo; return { diff --git a/server/controller/Usuario/newPasswordAlumno.js b/server/controller/Usuario/newPasswordAlumno.js index ddf4088..bc09e59 100644 --- a/server/controller/Usuario/newPasswordAlumno.js +++ b/server/controller/Usuario/newPasswordAlumno.js @@ -1,9 +1,11 @@ -const gmail = require('../../helper/gmail'); -const correos = require('../../helper/correos'); -const encriptar = require('../../helper/encriptar'); -const validar = require('../../helper/validar'); -const Usuario = require('../../db/tablas/Usuario'); -const Servicio = require('../../db/tablas/Servicio'); +const helperPath = '../../helper'; +const validar = require(`${helperPath}/validar`); +const gmail = require(`${helperPath}/gmail`); +const correos = require(`${helperPath}/correos`); +const encriptar = require(`${helperPath}/encriptar`); +const dbPath = '../../db/tablas'; +const Usuario = require(`${dbPath}/Usuario`); +const Servicio = require(`${dbPath}/Servicio`); const newPasswordAlumno = async (body) => { const idServicio = validar.validarId(body.idServicio); diff --git a/server/controller/Usuario/newPasswordResponsable.js b/server/controller/Usuario/newPasswordResponsable.js index 45d193a..9767461 100644 --- a/server/controller/Usuario/newPasswordResponsable.js +++ b/server/controller/Usuario/newPasswordResponsable.js @@ -1,7 +1,8 @@ -const gmail = require('../../helper/gmail'); -const correos = require('../../helper/correos'); -const encriptar = require('../../helper/encriptar'); -const validar = require('../../helper/validar'); +const helperPath = '../../helper'; +const validar = require(`${helperPath}/validar`); +const gmail = require(`${helperPath}/gmail`); +const correos = require(`${helperPath}/correos`); +const encriptar = require(`${helperPath}/encriptar`); const Usuario = require('../../db/tablas/Usuario'); const newPasswordResponsable = async (body) => { diff --git a/server/controller/Usuario/responsable.js b/server/controller/Usuario/responsable.js index f1e0469..77c8a14 100644 --- a/server/controller/Usuario/responsable.js +++ b/server/controller/Usuario/responsable.js @@ -1,7 +1,8 @@ const { Op } = require('sequelize'); const validar = require('../../helper/validar'); -const Usuario = require('../../db/tablas/Usuario'); -const TipoUsuario = require('../../db/tablas/TipoUsuario'); +const dbPath = '../../db/tablas'; +const Usuario = require(`${dbPath}/Usuario`); +const TipoUsuario = require(`${dbPath}/TipoUsuario`); const responsable = async (body) => { const pagina = validar.validarId(body.pagina); diff --git a/server/routes/CasoEspecial.js b/server/routes/CasoEspecial.js index ece6979..4db1f99 100644 --- a/server/routes/CasoEspecial.js +++ b/server/routes/CasoEspecial.js @@ -5,11 +5,12 @@ const app = express(); const upload = multer({ dest: 'server/uploads' }); const { verificaToken } = require('../middleware/autentificacion'); const route = '/caso_especial'; -const nuevo = require('../controller/CasoEspecial/nuevo'); -const serviciosEspeciales = require('../controller/CasoEspecial/serviciosEspeciales'); -const casoEspecial = require('../controller/CasoEspecial/casoEspecial'); -const liberacion = require('../controller/CasoEspecial/liberacion'); -const update = require('../controller/CasoEspecial/update'); +const controllerPath = '../controller/CasoEspecial'; +const nuevo = require(`${controllerPath}/nuevo`); +const serviciosEspeciales = require(`${controllerPath}/serviciosEspeciales`); +const casoEspecial = require(`${controllerPath}/casoEspecial`); +const liberacion = require(`${controllerPath}/liberacion`); +const update = require(`${controllerPath}/update`); const eliminarArchivo = (filename) => { fs.unlinkSync(`./server/uploads/${filename}`); diff --git a/server/routes/CuestionarioAlumno.js b/server/routes/CuestionarioAlumno.js index 960df15..bcdba3b 100644 --- a/server/routes/CuestionarioAlumno.js +++ b/server/routes/CuestionarioAlumno.js @@ -2,8 +2,9 @@ const express = require('express'); const app = express(); const { verificaToken } = require('../middleware/autentificacion'); const route = '/cuestionario_alumno'; -const nuevo = require('../controller/CuestionarioAlumno/nuevo'); -const get = require('../controller/CuestionarioAlumno/get'); +const controllerPath = '../controller/CuestionarioAlumno'; +const nuevo = require(`${controllerPath}/nuevo`); +const get = require(`${controllerPath}/get`); app.post(`${route}`, verificaToken, (req, res) => { return nuevo(req.body) diff --git a/server/routes/CuestionarioPrograma.js b/server/routes/CuestionarioPrograma.js index 4e0a691..34d61be 100644 --- a/server/routes/CuestionarioPrograma.js +++ b/server/routes/CuestionarioPrograma.js @@ -2,8 +2,9 @@ const express = require('express'); const app = express(); const { verificaToken } = require('../middleware/autentificacion'); const route = '/cuestionario_programa'; -const nuevo = require('../controller/CuestionarioPrograma/nuevo'); -const get = require('../controller/CuestionarioPrograma/get'); +const controllerPath = '../controller/CuestionarioPrograma'; +const nuevo = require(`${controllerPath}/nuevo`); +const get = require(`${controllerPath}/get`); app.post(`${route}`, verificaToken, (req, res) => { return nuevo(req.body) diff --git a/server/routes/Programa.js b/server/routes/Programa.js index 5316452..e0595d8 100644 --- a/server/routes/Programa.js +++ b/server/routes/Programa.js @@ -4,9 +4,10 @@ const app = express(); const upload = multer({ dest: 'server/uploads' }); const { verificaToken } = require('../middleware/autentificacion'); const route = '/programa'; -const programasResponsable = require('../controller/Programa/programasResponsable'); -const programasAdmin = require('../controller/Programa/programasAdmin'); -const cargaMasiva = require('../controller/Programa/cargaMasiva'); +const controllerPath = '../controller/Programa'; +const programasResponsable = require(`${controllerPath}/programasResponsable`); +const programasAdmin = require(`${controllerPath}/programasAdmin`); +const cargaMasiva = require(`${controllerPath}/cargaMasiva`); app.get(`${route}/programas_responsable`, verificaToken, (req, res) => { return programasResponsable(req.query) diff --git a/server/routes/Servicio.js b/server/routes/Servicio.js index a9aa3f4..b781dd5 100644 --- a/server/routes/Servicio.js +++ b/server/routes/Servicio.js @@ -5,24 +5,25 @@ const app = express(); const upload = multer({ dest: 'server/uploads' }); const { verificaToken } = require('../middleware/autentificacion'); const route = '/servicio'; -const nuevo = require('../controller/Servicio/nuevo'); -const serviciosAdmin = require('../controller/Servicio/serviciosAdmin'); -const serviciosResponsable = require('../controller/Servicio/serviciosResponsable'); -const admin = require('../controller/Servicio/admin'); -const alumno = require('../controller/Servicio/alumno'); -const cancelar = require('../controller/Servicio/cancelar'); -const registro = require('../controller/Servicio/registro'); -const registroValidado = require('../controller/Servicio/registroValidado'); -const cartaAceptacion = require('../controller/Servicio/cartaAceptacion'); -const cartaTermino = require('../controller/Servicio/cartaTermino'); -const informeGlobal = require('../controller/Servicio/informeGlobal'); -const liberacion = require('../controller/Servicio/liberacion'); -const rechazarAceptacion = require('../controller/Servicio/rechazarAceptacion'); -const rechazarTermino = require('../controller/Servicio/rechazarTermino'); -const rechazarInforme = require('../controller/Servicio/rechazarInforme'); -const update = require('../controller/Servicio/update'); -const reporte = require('../controller/Servicio/reporte'); -const gustavoBazPrada = require('../controller/Servicio/gustavoBazPrada'); +const controllerPath = '../controller/Servicio'; +const nuevo = require(`${controllerPath}/nuevo`); +const serviciosAdmin = require(`${controllerPath}/serviciosAdmin`); +const serviciosResponsable = require(`${controllerPath}/serviciosResponsable`); +const admin = require(`${controllerPath}/admin`); +const alumno = require(`${controllerPath}/alumno`); +const cancelar = require(`${controllerPath}/cancelar`); +const registro = require(`${controllerPath}/registro`); +const registroValidado = require(`${controllerPath}/registroValidado`); +const cartaAceptacion = require(`${controllerPath}/cartaAceptacion`); +const cartaTermino = require(`${controllerPath}/cartaTermino`); +const informeGlobal = require(`${controllerPath}/informeGlobal`); +const liberacion = require(`${controllerPath}/liberacion`); +const rechazarAceptacion = require(`${controllerPath}/rechazarAceptacion`); +const rechazarTermino = require(`${controllerPath}/rechazarTermino`); +const rechazarInforme = require(`${controllerPath}/rechazarInforme`); +const update = require(`${controllerPath}/update`); +const reporte = require(`${controllerPath}/reporte`); +const gustavoBazPrada = require(`${controllerPath}/gustavoBazPrada`); const eliminarArchivo = (filename) => { fs.unlinkSync(`./server/uploads/${filename}`); diff --git a/server/routes/Status.js b/server/routes/Status.js index e3f50b5..b09bd3b 100644 --- a/server/routes/Status.js +++ b/server/routes/Status.js @@ -10,7 +10,7 @@ app.get(`${route}`, verificaToken, (req, res) => { res.status(200).json(data); }) .catch((err) => { - res.status(400).json(err); + res.status(400).json({ message: err.message }); }); }); diff --git a/server/routes/Usuario.js b/server/routes/Usuario.js index 665a825..2270240 100644 --- a/server/routes/Usuario.js +++ b/server/routes/Usuario.js @@ -2,12 +2,13 @@ const express = require('express'); const app = express(); const { verificaToken } = require('../middleware/autentificacion'); const route = '/usuario'; -const escolares = require('../controller/Usuario/escolares'); -const login = require('../controller/Usuario/login'); -const responsable = require('../controller/Usuario/responsable'); -const responsableUpdate = require('../controller/Usuario/responsableUpdate'); -const newPasswordAlumno = require('../controller/Usuario/newPasswordAlumno'); -const newPasswordResponsable = require('../controller/Usuario/newPasswordResponsable'); +const controllerPath = '../controller/Usuario'; +const escolares = require(`${controllerPath}/escolares`); +const login = require(`${controllerPath}/login`); +const responsable = require(`${controllerPath}/responsable`); +const responsableUpdate = require(`${controllerPath}/responsableUpdate`); +const newPasswordAlumno = require(`${controllerPath}/newPasswordAlumno`); +const newPasswordResponsable = require(`${controllerPath}/newPasswordResponsable`); app.post(`${route}/login`, (req, res) => { return login(req.body)