From d1b4be16e0c5e7c8bb4f525b4fe45679ae1cf850 Mon Sep 17 00:00:00 2001 From: Lemuel Marquez Date: Tue, 5 Jan 2021 15:34:00 -0600 Subject: [PATCH] tokens listos para ser pedidos --- .../controller/CuestionarioPrograma/nuevo.js | 32 +++++++++---------- server/db/data-fake.js | 1 + server/routes/CuestionarioAlumno.js | 1 + server/routes/CuestionarioPrograma.js | 1 + server/routes/Programa.js | 1 + server/routes/Servicio.js | 1 + server/routes/Status.js | 1 + server/routes/Usuario.js | 1 + 8 files changed, 23 insertions(+), 16 deletions(-) diff --git a/server/controller/CuestionarioPrograma/nuevo.js b/server/controller/CuestionarioPrograma/nuevo.js index bd9ee59..f686d6f 100644 --- a/server/controller/CuestionarioPrograma/nuevo.js +++ b/server/controller/CuestionarioPrograma/nuevo.js @@ -4,14 +4,14 @@ const Servicio = require('../../db/tablas/Servicio'); const nuevo = async (body) => { let idServicio = validar.validarId(body.idServicio); - // let actividad1 = body.asnwers.actividad1; - // let actividad2 = body.asnwers.actividad2; - // let actividad3 = body.asnwers.actividad3; - // let actividad4 = body.asnwers.actividad4; - // let actividad5 = body.asnwers.actividad5; - // let retroalimentacion = body.asnwers.retroalimentacion; - // let p6 = body.asnwers.p6; - // let p7 = body.asnwers.p7; + let actividad1 = body.actividad1; + let actividad2 = body.actividad2; + let actividad3 = body.actividad3; + let actividad4 = body.actividad4; + let actividad5 = body.actividad5; + let retroalimentacion = body.retroalimentacion; + let p6 = body.p6; + let p7 = body.p7; return Servicio.findOne({ where: { idServicio } }) .then((res) => { @@ -23,14 +23,14 @@ const nuevo = async (body) => { switch (res.idStatus) { case 4: return CuestionarioPrograma.create({ - actividad1: '', - actividad2: '', - actividad3: '', - actividad4: '', - actividad5: '', - retroalimentacion: '', - p6: '', - p7: '', + actividad1, + actividad2, + actividad3, + actividad4, + actividad5, + retroalimentacion, + p6, + p7, }); case 1: case 2: diff --git a/server/db/data-fake.js b/server/db/data-fake.js index 2bf3a91..68abf4f 100644 --- a/server/db/data-fake.js +++ b/server/db/data-fake.js @@ -58,6 +58,7 @@ const dataResponsable = async () => { dependencia: `FES Acatlán`, programa: `Acatlán Contigo`, clavePrograma: `2020-12/20-91`, + acatlan: true, idUsuario: res.dataValues.idUsuario, }); console.log( diff --git a/server/routes/CuestionarioAlumno.js b/server/routes/CuestionarioAlumno.js index 44f7bf3..86c3907 100644 --- a/server/routes/CuestionarioAlumno.js +++ b/server/routes/CuestionarioAlumno.js @@ -1,5 +1,6 @@ const express = require('express'); const app = express(); +const { verificaToken } = require('../middleware/autentificacion'); const route = '/cuestionario_alumno'; const nuevo = require('../controller/CuestionarioAlumno/nuevo'); diff --git a/server/routes/CuestionarioPrograma.js b/server/routes/CuestionarioPrograma.js index d105589..10459b1 100644 --- a/server/routes/CuestionarioPrograma.js +++ b/server/routes/CuestionarioPrograma.js @@ -1,5 +1,6 @@ const express = require('express'); const app = express(); +const { verificaToken } = require('../middleware/autentificacion'); const route = '/cuestionario_programa'; const nuevo = require('../controller/CuestionarioPrograma/nuevo'); diff --git a/server/routes/Programa.js b/server/routes/Programa.js index b9cd748..62ebbf1 100644 --- a/server/routes/Programa.js +++ b/server/routes/Programa.js @@ -2,6 +2,7 @@ const express = require('express'); const multer = require('multer'); const app = express(); const upload = multer({ dest: 'server/uploads' }); +const { verificaToken } = require('../middleware/autentificacion'); const route = '/programa'; const get = require('../controller/Programa/get'); const cargaMasiva = require('../controller/Programa/cargaMasiva'); diff --git a/server/routes/Servicio.js b/server/routes/Servicio.js index 34b2be1..460e45e 100644 --- a/server/routes/Servicio.js +++ b/server/routes/Servicio.js @@ -3,6 +3,7 @@ const express = require('express'); const multer = require('multer'); 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'); diff --git a/server/routes/Status.js b/server/routes/Status.js index 23c7a38..58531a0 100644 --- a/server/routes/Status.js +++ b/server/routes/Status.js @@ -1,5 +1,6 @@ const express = require('express'); const app = express(); +const { verificaToken } = require('../middleware/autentificacion'); const route = '/status'; const get = require('../controller/Status/get'); diff --git a/server/routes/Usuario.js b/server/routes/Usuario.js index 2dff849..9b8efaf 100644 --- a/server/routes/Usuario.js +++ b/server/routes/Usuario.js @@ -1,5 +1,6 @@ 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');