From 41cdbe07e5256f94786cecca940ddc3b2b302f7a Mon Sep 17 00:00:00 2001 From: marcorv6 Date: Mon, 16 May 2022 23:09:46 -0500 Subject: [PATCH] casi terminada --- .gitignore | 2 ++ server/controller/Premiacion/premiaciones.js | 2 +- server/controller/Premiacion/premiacionesPaginacion.js | 0 server/controller/Profesor/cargarDatos.js | 1 + server/routes/Premiacion.js | 2 +- server/routes/Profesor.js | 2 +- server/uploads/04b2aa1f156b677db4bbc8d110abf6e1 | 5 ----- server/uploads/05c795fe43d4dd9605898abe70aaf1f7 | 3 --- server/uploads/0d30acf9dbd42afe5fcd639ab214c033 | 5 ----- server/uploads/1549e70024b5180e24f940e44343305e | 5 ----- server/uploads/16ef73dc198d5607a3454f9e3238fc56 | 3 --- server/uploads/1bf93440819d517aa40c05c80b3ed41d | 5 ----- server/uploads/1ef9a891ed31075c10a1ead43ece6888 | 3 --- server/uploads/2443b1e90c38c1eaf0c2d0f35f8ce801 | 5 ----- server/uploads/36b4e21d2a3de28a644bd3247e485a53 | 5 ----- server/uploads/3749bb54c01f199cfb4b98690671a8e7 | 3 --- server/uploads/3a8c885e14b8f74635715748990e7776 | 5 ----- server/uploads/3cbbc323998557ed5f72c0044031aa41 | 5 ----- server/uploads/46825c3d810fae52bc6e98cc71efa3c3 | 5 ----- server/uploads/4d75adea95e46549b99133dfbdd93c68 | 5 ----- server/uploads/51a3ee0b08bfb45e8ab3544e2329ed53 | 3 --- server/uploads/61fa1500e918ac7efe36a52c0a3671bf | 3 --- server/uploads/7529e9a543d7a0661d3f7a1cfe74dacd | 5 ----- server/uploads/7fa976b8bd7aef558f1130a9e82999d5 | 5 ----- server/uploads/b038040255e8d238d9496687229b004f | 5 ----- server/uploads/c4c1871b470236081367af5abbab3e4a | 5 ----- server/uploads/da363856e94cb587b3d0e09e79af1fb3 | 5 ----- server/uploads/fc4460e6aeb74da51c45f04a395f451f | 3 --- 28 files changed, 6 insertions(+), 99 deletions(-) create mode 100644 server/controller/Premiacion/premiacionesPaginacion.js delete mode 100644 server/uploads/04b2aa1f156b677db4bbc8d110abf6e1 delete mode 100644 server/uploads/05c795fe43d4dd9605898abe70aaf1f7 delete mode 100644 server/uploads/0d30acf9dbd42afe5fcd639ab214c033 delete mode 100644 server/uploads/1549e70024b5180e24f940e44343305e delete mode 100644 server/uploads/16ef73dc198d5607a3454f9e3238fc56 delete mode 100644 server/uploads/1bf93440819d517aa40c05c80b3ed41d delete mode 100644 server/uploads/1ef9a891ed31075c10a1ead43ece6888 delete mode 100644 server/uploads/2443b1e90c38c1eaf0c2d0f35f8ce801 delete mode 100644 server/uploads/36b4e21d2a3de28a644bd3247e485a53 delete mode 100644 server/uploads/3749bb54c01f199cfb4b98690671a8e7 delete mode 100644 server/uploads/3a8c885e14b8f74635715748990e7776 delete mode 100644 server/uploads/3cbbc323998557ed5f72c0044031aa41 delete mode 100644 server/uploads/46825c3d810fae52bc6e98cc71efa3c3 delete mode 100644 server/uploads/4d75adea95e46549b99133dfbdd93c68 delete mode 100644 server/uploads/51a3ee0b08bfb45e8ab3544e2329ed53 delete mode 100644 server/uploads/61fa1500e918ac7efe36a52c0a3671bf delete mode 100644 server/uploads/7529e9a543d7a0661d3f7a1cfe74dacd delete mode 100644 server/uploads/7fa976b8bd7aef558f1130a9e82999d5 delete mode 100644 server/uploads/b038040255e8d238d9496687229b004f delete mode 100644 server/uploads/c4c1871b470236081367af5abbab3e4a delete mode 100644 server/uploads/da363856e94cb587b3d0e09e79af1fb3 delete mode 100644 server/uploads/fc4460e6aeb74da51c45f04a395f451f diff --git a/.gitignore b/.gitignore index d333b23..18dff33 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,8 @@ yarn-debug.log* yarn-error.log* lerna-debug.log* + + # Diagnostic reports (https://nodejs.org/api/report.html) report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json diff --git a/server/controller/Premiacion/premiaciones.js b/server/controller/Premiacion/premiaciones.js index 3455d28..18bd73a 100644 --- a/server/controller/Premiacion/premiaciones.js +++ b/server/controller/Premiacion/premiaciones.js @@ -1,5 +1,5 @@ const Premiacion = require('../../db/tablas/Premiacion'); -const get = () => Premiacion.findAll({where: {activa: true}}); +const get = () => Premiacion.findAll(); module.exports = get; diff --git a/server/controller/Premiacion/premiacionesPaginacion.js b/server/controller/Premiacion/premiacionesPaginacion.js new file mode 100644 index 0000000..e69de29 diff --git a/server/controller/Profesor/cargarDatos.js b/server/controller/Profesor/cargarDatos.js index fe7cf87..6ddb419 100644 --- a/server/controller/Profesor/cargarDatos.js +++ b/server/controller/Profesor/cargarDatos.js @@ -5,6 +5,7 @@ const { validarNumeroEntero } = require('../../helper/validar'); const ProfesorPremiacion = require('../../db/tablas/profesorPremiacion'); const cargaMasiva = async (file, body) => { + console.log(body) const idPremiacion = validarNumeroEntero(body.idPremiacion); const path = `server/uploads/${file}`; let res = []; diff --git a/server/routes/Premiacion.js b/server/routes/Premiacion.js index 0d33db9..8e900e8 100644 --- a/server/routes/Premiacion.js +++ b/server/routes/Premiacion.js @@ -9,7 +9,7 @@ const nueva = require(`${controllerPath}/nueva`); const activarDesactivar = require(`${controllerPath}/activarDesactivar`); app.get(`${route}/get`, (req, res) => { - return get() + return get(req.query) .then((data) => { res.status(200).json(data); }) diff --git a/server/routes/Profesor.js b/server/routes/Profesor.js index 1bec51e..23b0ef3 100644 --- a/server/routes/Profesor.js +++ b/server/routes/Profesor.js @@ -57,7 +57,7 @@ app.post( upload.single('file'), (req, res) => { if (req.file) { - return cargarDatos(req.file.filename, req.body) + return cargarDatos(req.file.filename, req.query) .then((data) => { res.status(201).json(data); }) diff --git a/server/uploads/04b2aa1f156b677db4bbc8d110abf6e1 b/server/uploads/04b2aa1f156b677db4bbc8d110abf6e1 deleted file mode 100644 index a8a6698..0000000 --- a/server/uploads/04b2aa1f156b677db4bbc8d110abf6e1 +++ /dev/null @@ -1,5 +0,0 @@ -numeroTrabajador,nombre,adscripcion -3910347492,Marco Antonio Romero,Adscripcion 1 -8414319744,Jeremy Carreras,Adscripcion 2 -3916067492,Marco Antonio Romero,Adscripcion 1 -8414519004,Jeremy Carreras,Adscripcion 2 diff --git a/server/uploads/05c795fe43d4dd9605898abe70aaf1f7 b/server/uploads/05c795fe43d4dd9605898abe70aaf1f7 deleted file mode 100644 index 8ab641f..0000000 --- a/server/uploads/05c795fe43d4dd9605898abe70aaf1f7 +++ /dev/null @@ -1,3 +0,0 @@ -numeroTrabajador,nombre,adscripcion -316019251,Marco Antonio Romero,Adscripcion 1 -316019244,Jeremy Carreras,Adscripcion 2 diff --git a/server/uploads/0d30acf9dbd42afe5fcd639ab214c033 b/server/uploads/0d30acf9dbd42afe5fcd639ab214c033 deleted file mode 100644 index a8a6698..0000000 --- a/server/uploads/0d30acf9dbd42afe5fcd639ab214c033 +++ /dev/null @@ -1,5 +0,0 @@ -numeroTrabajador,nombre,adscripcion -3910347492,Marco Antonio Romero,Adscripcion 1 -8414319744,Jeremy Carreras,Adscripcion 2 -3916067492,Marco Antonio Romero,Adscripcion 1 -8414519004,Jeremy Carreras,Adscripcion 2 diff --git a/server/uploads/1549e70024b5180e24f940e44343305e b/server/uploads/1549e70024b5180e24f940e44343305e deleted file mode 100644 index a8a6698..0000000 --- a/server/uploads/1549e70024b5180e24f940e44343305e +++ /dev/null @@ -1,5 +0,0 @@ -numeroTrabajador,nombre,adscripcion -3910347492,Marco Antonio Romero,Adscripcion 1 -8414319744,Jeremy Carreras,Adscripcion 2 -3916067492,Marco Antonio Romero,Adscripcion 1 -8414519004,Jeremy Carreras,Adscripcion 2 diff --git a/server/uploads/16ef73dc198d5607a3454f9e3238fc56 b/server/uploads/16ef73dc198d5607a3454f9e3238fc56 deleted file mode 100644 index 8ab641f..0000000 --- a/server/uploads/16ef73dc198d5607a3454f9e3238fc56 +++ /dev/null @@ -1,3 +0,0 @@ -numeroTrabajador,nombre,adscripcion -316019251,Marco Antonio Romero,Adscripcion 1 -316019244,Jeremy Carreras,Adscripcion 2 diff --git a/server/uploads/1bf93440819d517aa40c05c80b3ed41d b/server/uploads/1bf93440819d517aa40c05c80b3ed41d deleted file mode 100644 index a8a6698..0000000 --- a/server/uploads/1bf93440819d517aa40c05c80b3ed41d +++ /dev/null @@ -1,5 +0,0 @@ -numeroTrabajador,nombre,adscripcion -3910347492,Marco Antonio Romero,Adscripcion 1 -8414319744,Jeremy Carreras,Adscripcion 2 -3916067492,Marco Antonio Romero,Adscripcion 1 -8414519004,Jeremy Carreras,Adscripcion 2 diff --git a/server/uploads/1ef9a891ed31075c10a1ead43ece6888 b/server/uploads/1ef9a891ed31075c10a1ead43ece6888 deleted file mode 100644 index 2a2a92b..0000000 --- a/server/uploads/1ef9a891ed31075c10a1ead43ece6888 +++ /dev/null @@ -1,3 +0,0 @@ -numeroTrabajador,nombre,adscripcion -316019251,Marco Antonio Romero,Adscripción 1 -316019244,Jeremy Carreras,Adscripción 2 diff --git a/server/uploads/2443b1e90c38c1eaf0c2d0f35f8ce801 b/server/uploads/2443b1e90c38c1eaf0c2d0f35f8ce801 deleted file mode 100644 index 1fa7289..0000000 --- a/server/uploads/2443b1e90c38c1eaf0c2d0f35f8ce801 +++ /dev/null @@ -1,5 +0,0 @@ -numeroTrabajador,nombre,adscripcion -3910347092,Marco Antonio Romero,Adscripcion 1 -8414310744,Jeremy Carreras,Adscripcion 2 -3906067492,Marco Antonio Romero,Adscripcion 1 -8014519004,Jeremy Carreras,Adscripcion 2 diff --git a/server/uploads/36b4e21d2a3de28a644bd3247e485a53 b/server/uploads/36b4e21d2a3de28a644bd3247e485a53 deleted file mode 100644 index a8a6698..0000000 --- a/server/uploads/36b4e21d2a3de28a644bd3247e485a53 +++ /dev/null @@ -1,5 +0,0 @@ -numeroTrabajador,nombre,adscripcion -3910347492,Marco Antonio Romero,Adscripcion 1 -8414319744,Jeremy Carreras,Adscripcion 2 -3916067492,Marco Antonio Romero,Adscripcion 1 -8414519004,Jeremy Carreras,Adscripcion 2 diff --git a/server/uploads/3749bb54c01f199cfb4b98690671a8e7 b/server/uploads/3749bb54c01f199cfb4b98690671a8e7 deleted file mode 100644 index ea8651c..0000000 --- a/server/uploads/3749bb54c01f199cfb4b98690671a8e7 +++ /dev/null @@ -1,3 +0,0 @@ -numeroTrabajador,nombre,adscripcion -3162019251,Marco Antonio Romero,Adscripcion 1 -3162019244,Jeremy Carreras,Adscripcion 2 diff --git a/server/uploads/3a8c885e14b8f74635715748990e7776 b/server/uploads/3a8c885e14b8f74635715748990e7776 deleted file mode 100644 index a8a6698..0000000 --- a/server/uploads/3a8c885e14b8f74635715748990e7776 +++ /dev/null @@ -1,5 +0,0 @@ -numeroTrabajador,nombre,adscripcion -3910347492,Marco Antonio Romero,Adscripcion 1 -8414319744,Jeremy Carreras,Adscripcion 2 -3916067492,Marco Antonio Romero,Adscripcion 1 -8414519004,Jeremy Carreras,Adscripcion 2 diff --git a/server/uploads/3cbbc323998557ed5f72c0044031aa41 b/server/uploads/3cbbc323998557ed5f72c0044031aa41 deleted file mode 100644 index 5f60b01..0000000 --- a/server/uploads/3cbbc323998557ed5f72c0044031aa41 +++ /dev/null @@ -1,5 +0,0 @@ -numeroTrabajador,nombre,adscripcion -3910347092,Marco Antonio Romero,Adscripcion 1 -8410310744,Jeremy Carreras,Adscripcion 2 -3906067492,Marco Antonio Romero,Adscripcion 1 -8014519004,Jeremy Carreras,Adscripcion 2 diff --git a/server/uploads/46825c3d810fae52bc6e98cc71efa3c3 b/server/uploads/46825c3d810fae52bc6e98cc71efa3c3 deleted file mode 100644 index a8a6698..0000000 --- a/server/uploads/46825c3d810fae52bc6e98cc71efa3c3 +++ /dev/null @@ -1,5 +0,0 @@ -numeroTrabajador,nombre,adscripcion -3910347492,Marco Antonio Romero,Adscripcion 1 -8414319744,Jeremy Carreras,Adscripcion 2 -3916067492,Marco Antonio Romero,Adscripcion 1 -8414519004,Jeremy Carreras,Adscripcion 2 diff --git a/server/uploads/4d75adea95e46549b99133dfbdd93c68 b/server/uploads/4d75adea95e46549b99133dfbdd93c68 deleted file mode 100644 index a8a6698..0000000 --- a/server/uploads/4d75adea95e46549b99133dfbdd93c68 +++ /dev/null @@ -1,5 +0,0 @@ -numeroTrabajador,nombre,adscripcion -3910347492,Marco Antonio Romero,Adscripcion 1 -8414319744,Jeremy Carreras,Adscripcion 2 -3916067492,Marco Antonio Romero,Adscripcion 1 -8414519004,Jeremy Carreras,Adscripcion 2 diff --git a/server/uploads/51a3ee0b08bfb45e8ab3544e2329ed53 b/server/uploads/51a3ee0b08bfb45e8ab3544e2329ed53 deleted file mode 100644 index 39da645..0000000 --- a/server/uploads/51a3ee0b08bfb45e8ab3544e2329ed53 +++ /dev/null @@ -1,3 +0,0 @@ -numeroTrabajador,nombre,adscripcion -33160149251,Marco Antonio Romero,Adscripcion 1 -3416219244,Jeremy Carreras,Adscripcion 2 diff --git a/server/uploads/61fa1500e918ac7efe36a52c0a3671bf b/server/uploads/61fa1500e918ac7efe36a52c0a3671bf deleted file mode 100644 index eef2ce1..0000000 --- a/server/uploads/61fa1500e918ac7efe36a52c0a3671bf +++ /dev/null @@ -1,3 +0,0 @@ -numeroTrabajador,nombre,adscripcion -331601492,Marco Antonio Romero,Adscripcion 1 -3416219244,Jeremy Carreras,Adscripcion 2 diff --git a/server/uploads/7529e9a543d7a0661d3f7a1cfe74dacd b/server/uploads/7529e9a543d7a0661d3f7a1cfe74dacd deleted file mode 100644 index a8a6698..0000000 --- a/server/uploads/7529e9a543d7a0661d3f7a1cfe74dacd +++ /dev/null @@ -1,5 +0,0 @@ -numeroTrabajador,nombre,adscripcion -3910347492,Marco Antonio Romero,Adscripcion 1 -8414319744,Jeremy Carreras,Adscripcion 2 -3916067492,Marco Antonio Romero,Adscripcion 1 -8414519004,Jeremy Carreras,Adscripcion 2 diff --git a/server/uploads/7fa976b8bd7aef558f1130a9e82999d5 b/server/uploads/7fa976b8bd7aef558f1130a9e82999d5 deleted file mode 100644 index a8a6698..0000000 --- a/server/uploads/7fa976b8bd7aef558f1130a9e82999d5 +++ /dev/null @@ -1,5 +0,0 @@ -numeroTrabajador,nombre,adscripcion -3910347492,Marco Antonio Romero,Adscripcion 1 -8414319744,Jeremy Carreras,Adscripcion 2 -3916067492,Marco Antonio Romero,Adscripcion 1 -8414519004,Jeremy Carreras,Adscripcion 2 diff --git a/server/uploads/b038040255e8d238d9496687229b004f b/server/uploads/b038040255e8d238d9496687229b004f deleted file mode 100644 index 1fa7289..0000000 --- a/server/uploads/b038040255e8d238d9496687229b004f +++ /dev/null @@ -1,5 +0,0 @@ -numeroTrabajador,nombre,adscripcion -3910347092,Marco Antonio Romero,Adscripcion 1 -8414310744,Jeremy Carreras,Adscripcion 2 -3906067492,Marco Antonio Romero,Adscripcion 1 -8014519004,Jeremy Carreras,Adscripcion 2 diff --git a/server/uploads/c4c1871b470236081367af5abbab3e4a b/server/uploads/c4c1871b470236081367af5abbab3e4a deleted file mode 100644 index a8a6698..0000000 --- a/server/uploads/c4c1871b470236081367af5abbab3e4a +++ /dev/null @@ -1,5 +0,0 @@ -numeroTrabajador,nombre,adscripcion -3910347492,Marco Antonio Romero,Adscripcion 1 -8414319744,Jeremy Carreras,Adscripcion 2 -3916067492,Marco Antonio Romero,Adscripcion 1 -8414519004,Jeremy Carreras,Adscripcion 2 diff --git a/server/uploads/da363856e94cb587b3d0e09e79af1fb3 b/server/uploads/da363856e94cb587b3d0e09e79af1fb3 deleted file mode 100644 index a8a6698..0000000 --- a/server/uploads/da363856e94cb587b3d0e09e79af1fb3 +++ /dev/null @@ -1,5 +0,0 @@ -numeroTrabajador,nombre,adscripcion -3910347492,Marco Antonio Romero,Adscripcion 1 -8414319744,Jeremy Carreras,Adscripcion 2 -3916067492,Marco Antonio Romero,Adscripcion 1 -8414519004,Jeremy Carreras,Adscripcion 2 diff --git a/server/uploads/fc4460e6aeb74da51c45f04a395f451f b/server/uploads/fc4460e6aeb74da51c45f04a395f451f deleted file mode 100644 index 1f7f5c5..0000000 --- a/server/uploads/fc4460e6aeb74da51c45f04a395f451f +++ /dev/null @@ -1,3 +0,0 @@ -numeroTrabajador,nombre,adscripcion -3316347492,Marco Antonio Romero,Adscripcion 1 -3414519744,Jeremy Carreras,Adscripcion 2