From 3d075b1501bf7d445a11f95f5ef542e190ffb1ee Mon Sep 17 00:00:00 2001 From: Lemuel Marquez Date: Mon, 16 Nov 2020 18:36:55 -0600 Subject: [PATCH] traer servicios sociales de back para el admin --- server/controller/Servicio/admin.js | 7 ------ server/controller/Servicio/serviciosAdmin.js | 24 ++++++++++++++++++++ server/db/data-fake.js | 1 + server/routes/Servicio.js | 21 +++++++++-------- 4 files changed, 36 insertions(+), 17 deletions(-) delete mode 100644 server/controller/Servicio/admin.js create mode 100644 server/controller/Servicio/serviciosAdmin.js diff --git a/server/controller/Servicio/admin.js b/server/controller/Servicio/admin.js deleted file mode 100644 index d026aa0..0000000 --- a/server/controller/Servicio/admin.js +++ /dev/null @@ -1,7 +0,0 @@ -const Servicio = require('../../db/tablas/Servicio'); - -const serviciosAdmin = (body) => { - Servicio.findAll().then((res) => { - return res; - }); -}; diff --git a/server/controller/Servicio/serviciosAdmin.js b/server/controller/Servicio/serviciosAdmin.js new file mode 100644 index 0000000..49d4c1c --- /dev/null +++ b/server/controller/Servicio/serviciosAdmin.js @@ -0,0 +1,24 @@ +const validar = require('../../helper/validar'); +const Servicio = require('../../db/tablas/Servicio'); +const Usuario = require('../../db/tablas/Usuario'); + +const serviciosAdmin = async (body) => { + let pagina = body.pagina; + let nombre = body.nombre; + let numeroCuenta = body.numeroCuenta; + let idStatus = body.idStatus; + + return Servicio.findAll({ include: { model: Usuario } }).then((res) => { + let data = []; + + for (let i = pagina * 25 - 25; i < res.length && i < pagina * 25; i++) + data.push(res[i]); + return { + registros: res.length, + faltantes: res.length - data.length - (pagina - 1) * 25, + servicios: data, + }; + }); +}; + +module.exports = serviciosAdmin; diff --git a/server/db/data-fake.js b/server/db/data-fake.js index 895f72b..a669aed 100644 --- a/server/db/data-fake.js +++ b/server/db/data-fake.js @@ -11,6 +11,7 @@ const dataResponsable = async () => { await Usuario.create({ usuario: correos[i], idTipoUsuario: 2, + nombre: nombres[i], activo: true, }); console.log(`Se inserto el responsable ${nombres[i]}`.magenta); diff --git a/server/routes/Servicio.js b/server/routes/Servicio.js index dd851eb..3a0b50a 100644 --- a/server/routes/Servicio.js +++ b/server/routes/Servicio.js @@ -2,7 +2,7 @@ const express = require('express'); const app = express(); const route = '/servicio'; const nuevo = require('../controller/Servicio/nuevo'); -// const login = require('../controller/Usuario/login'); +const serviciosAdmin = require('../controller/Servicio/serviciosAdmin'); app.post(`${route}/nuevo`, (req, res) => { return nuevo(req.body) @@ -14,14 +14,15 @@ app.post(`${route}/nuevo`, (req, res) => { }); }); -// app.post(`${route}/login`, (req, res) => { -// return login(req.body) -// .then((data) => { -// res.status(201).json(data); -// }) -// .catch((err) => { -// res.status(400).json({ message: err.message }); -// }); -// }); +app.get(`${route}/serviciosAdmin`, (req, res) => { + return serviciosAdmin(req.query) + .then((data) => { + console.log(data) + res.status(200).json(data); + }) + .catch((err) => { + res.status(400).json({ message: err.message }); + }); +}); module.exports = app;