diff --git a/server/controller/addEquip/get.js b/server/controller/addEquip/get.js index 99ee288..82fca5f 100644 --- a/server/controller/addEquip/get.js +++ b/server/controller/addEquip/get.js @@ -1,7 +1,6 @@ const ActivoFijo = require('../../models/tablas/ActivoFijo'); const Marca = require('../../models/tablas/Marca'); const OS = require('../../models/tablas/OS'); -const Tipo = require('../../models/tablas/Tipo'); const Ubicacion = require('../../models/tablas/Ubicacion') const UResponsable = require('../../models/tablas/UResponsable'); const Uso = require('../../models/tablas/Uso'); @@ -25,12 +24,6 @@ const get = async(req, res) => { }) .catch((e) => { throw new Error(e) }); - let tipos = await Tipo.findAll({ - attributes: ['idTipo', 'tipo'], - order: ['idTipo'] - }) - .catch((e) => { throw new Error(e) }); - let ubicaciones = await Ubicacion.findAll({ attributes: ['idUbicacion', 'ubicacion'], order: ['idUbicacion'] diff --git a/server/controller/addPrinter/addPrinter.js b/server/controller/addPrinter/addPrinter.js new file mode 100644 index 0000000..f5ac1ac --- /dev/null +++ b/server/controller/addPrinter/addPrinter.js @@ -0,0 +1,7 @@ +const get = require('./get'); +const post = require('./post'); + +module.exports = { + get, + post +}; \ No newline at end of file diff --git a/server/controller/addPrinter/get.js b/server/controller/addPrinter/get.js new file mode 100644 index 0000000..ee20b55 --- /dev/null +++ b/server/controller/addPrinter/get.js @@ -0,0 +1,47 @@ +const Tipo = require('../../models/tablas/Tipo'); +const Marca = require('../../models/tablas/Marca'); +const Ubicacion = require('../../models/tablas/Ubicacion'); +const Uso = require('../../models/tablas/Uso'); +const UResponsable = require('../../models/tablas/UResponsable'); + +const get = async(req, res) => { + const marcas = await Marca.findAll({ + attributes: ['idMarca', 'marca'], + order: ['idMarca'] + }) + .catch((e) => { throw new Error(e) }); + + const unidades = await UResponsable.findAll({ + attributes: ['idUnidadResponsable', 'uResponsable'], + order: ['idUnidadResponsable'] + }) + .catch((e) => { throw new Error(e) }); + + const ubicaciones = await Ubicacion.findAll({ + attributes: ['idUbicacion', 'ubicacion'], + order: ['idUbicacion'] + }) + .catch((e) => { throw new Error(e) }); + + const usos = await Uso.findAll({ + attributes: ['idUso', 'uso'], + order: ['idUso'] + }) + .catch((e) => { throw new Error(e) }); + + const tipos = await Tipo.findAll({ + attributes: ['idTipo', 'tipo'], + order: ['idTipo'] + }) + .catch((e) => { throw new Error(e) }); + + return res.json({ + unidades, + ubicaciones, + marcas, + usos, + tipos + }); +}; + +module.exports = get; \ No newline at end of file diff --git a/server/routes/addPrinter.js b/server/routes/addPrinter.js new file mode 100644 index 0000000..d7c95bc --- /dev/null +++ b/server/routes/addPrinter.js @@ -0,0 +1,17 @@ +const express = require('express'); +const app = express(); + +const addPrinter = require('../controller/addPrinter/addPrinter'); +const { verifyToken, verifyAdmin } = require('../middlewares/authentication'); + +const route = '/api/addPrinter'; + +app.get(route, [verifyToken, verifyAdmin], (req, res) => { + return addPrinter.get(req, res); +}); + +app.post(route, [verifyToken, verifyAdmin], (req, res) => { + return addPrinter.post(req, res); +}); + +module.exports = app; \ No newline at end of file diff --git a/server/routes/index.js b/server/routes/index.js index 19475b2..427a8b9 100644 --- a/server/routes/index.js +++ b/server/routes/index.js @@ -4,5 +4,6 @@ let app = express(); app.use(require('./login')); app.use(require('./user')); app.use(require('./addEquip')); +app.use(require('./addPrinter')); module.exports = app; \ No newline at end of file