From 8b41a19f551b24aa785f85fa9742fed0ce0ab80a Mon Sep 17 00:00:00 2001 From: eithan Date: Sat, 2 Jan 2021 17:09:06 -0600 Subject: [PATCH] cambio de variables bool de la tabla cuestionario alumno, agregar data del cuestionario alumno --- package-lock.json | 24 ++-- server/controller/CuestionarioAlumno/nuevo.js | 108 +++++++++++++----- server/db/tablas/CuestionarioAlumno.js | 30 ++--- 3 files changed, 108 insertions(+), 54 deletions(-) diff --git a/package-lock.json b/package-lock.json index bdb648b..7491216 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1192,9 +1192,9 @@ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" }, "ini": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" }, "ipaddr.js": { "version": "1.9.1", @@ -1660,17 +1660,17 @@ }, "dependencies": { "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "requires": { "ms": "^2.1.1" } }, "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" } } }, @@ -1680,9 +1680,9 @@ "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==" }, "node-addon-api": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.0.2.tgz", - "integrity": "sha512-+D4s2HCnxPd5PjjI0STKwncjXTUKKqm74MDMz9OPXavjsGmjkvwgLtA5yoxJUdmpj52+2u+RrXgPipahKczMKg==" + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.1.0.tgz", + "integrity": "sha512-flmrDNB06LIl5lywUz7YlNGZH/5p0M7W28k8hzd9Lshtdh1wshD2Y+U4h9LD6KObOy1f+fEVdgprPrEymjM5uw==" }, "node-fetch": { "version": "2.6.1", diff --git a/server/controller/CuestionarioAlumno/nuevo.js b/server/controller/CuestionarioAlumno/nuevo.js index 510e6ad..691889f 100644 --- a/server/controller/CuestionarioAlumno/nuevo.js +++ b/server/controller/CuestionarioAlumno/nuevo.js @@ -4,42 +4,96 @@ const Servicio = require('../../db/tablas/Servicio'); const nuevo = async (body) => { let idServicio = validar.validarId(body.idServicio); - - let sexo = ''; - let edad = ''; - let servicioMedico = ''; - let pUno = ''; - let pDos = ''; + + let sexo = body.asnwers.sexo; + let edad = body.asnwers.edad; + let servicioMedico = body.asnwers.servicioMedico; + let pUno = body.asnwers.p1; + let pDos = body.asnwers.p2; + let pCuatro = body.asnwers.p4; + let pSeis = body.asnwers.p6; + let pSiete = body.asnwers.p7; + let pNueve = body.asnwers.p9; + let pDiez = body.asnwers.p10; + let pOnce = body.asnwers.p11; + let pDoce = body.asnwers.p12; + let pTrece = body.asnwers.p13; + let pDieciseis = body.asnwers.p16; + let pDieciocho = body.asnwers.p18; + let pDiecinueve = body.asnwers.p19; + let pVeinte = body.asnwers.p20; + let pVeinticinco = body.asnwers.p25; + let pVeintiseis = body.asnwers.p26; + let pVeintisiete = body.asnwers.p27; + let pVeintiocho = body.asnwers.p28; + let pVeintinueve = body.asnwers.p29; + let pTreinta = body.asnwers.p30; + //strings let pTres = ''; - let pCuatro = ''; - let pCinco = ''; - let pSeis = ''; - let pSiete = ''; - let pOcho = ''; - let pNueve = ''; - let pDiez = ''; - let pOnce = ''; - let pDoce = ''; - let pTrece = ''; + let pCinco =''; + let pOcho =''; let pCatorce = ''; let pQuince = ''; - let pDieciseis = ''; let pDiecisiete = ''; - let pDieciocho = ''; - let pDiecinueve = ''; - let pVeinte = ''; let pVeintiuno = ''; let pVeintidos = ''; let pVeintitres = ''; let pVeinticuatro = ''; - let pVeinticinco = ''; - let pVeintiseis = ''; - let pVeintisiete = ''; - let pVeintiocho = ''; - let pVeintinueve = ''; - let pTreinta = ''; + + for(let i= 0 ; i < body.asnwers.p3.length ; i++){ + pTres += body.asnwers.p3[i] + if(i < body.asnwers.p3.length -1) pTres += ',' + } + + for(let i= 0 ; i < body.asnwers.p5.length ; i++){ + pCinco += body.asnwers.p5[i] + if(i < body.asnwers.p5.length -1) pCinco += ',' + } + + for(let i= 0 ; i < body.asnwers.p8.length ; i++){ + pOcho += body.asnwers.p8[i] + if(i < body.asnwers.p8.length -1) pOcho += ',' + } + + for(let i= 0 ; i < body.asnwers.p14.length ; i++){ + pCatorce += body.asnwers.p14[i] + if(i < body.asnwers.p14.length -1) pCatorce += ',' + } + + for(let i= 0 ; i < body.asnwers.p15.length ; i++){ + pQuince += body.asnwers.p15[i] + if(i < body.asnwers.p15.length -1) pQuince += ',' + } + + for(let i= 0 ; i < body.asnwers.p17.length ; i++){ + pDiecisiete += body.asnwers.p17[i] + if(i < body.asnwers.p17.length -1) pDiecisiete += ',' + } + + for(let i= 0 ; i < body.asnwers.p21.length ; i++){ + pVeintiuno += body.asnwers.p21[i] + if(i < body.asnwers.p21.length -1) pVeintiuno += ',' + } + + for(let i= 0 ; i < body.asnwers.p22.length ; i++){ + pVeintidos += body.asnwers.p22[i] + if(i < body.asnwers.p22.length -1) pVeintidos += ',' + } + + for(let i= 0 ; i < body.asnwers.p23.length ; i++){ + pVeintitres += body.asnwers.p23[i] + if(i < body.asnwers.p23.length -1) pVeintitres += ',' + } + + for(let i= 0 ; i < body.asnwers.p24.length ; i++){ + pVeinticuatro += body.asnwers.p24[i] + if(i < body.asnwers.p24.length -1) pVeinticuatro += ',' + } +console.log(body.asnwers.p5) + console.log(pCinco) + - return Servicio.findOne({ where: { idServicio } }) +return Servicio.findOne({ where: { idServicio } }) .then((res) => { if (!res) throw new Error('No existe este Servicio Social.'); if (res.idCuestionarioAlumno) diff --git a/server/db/tablas/CuestionarioAlumno.js b/server/db/tablas/CuestionarioAlumno.js index ad72135..001cf67 100644 --- a/server/db/tablas/CuestionarioAlumno.js +++ b/server/db/tablas/CuestionarioAlumno.js @@ -24,11 +24,11 @@ CuestionarioAlumno.init( allowNull: false, }, pUno: { - type: DataTypes.STRING(1), + type: DataTypes.BOOLEAN, allowNull: false, }, pDos: { - type: DataTypes.STRING(1), + type: DataTypes.BOOLEAN, allowNull: false, }, pTres: { @@ -36,7 +36,7 @@ CuestionarioAlumno.init( allowNull: false, }, pCuatro: { - type: DataTypes.STRING(1), + type: DataTypes.BOOLEAN, allowNull: false, }, pCinco: { @@ -44,11 +44,11 @@ CuestionarioAlumno.init( allowNull: false, }, pSeis: { - type: DataTypes.STRING(1), + type: DataTypes.BOOLEAN, allowNull: false, }, pSiete: { - type: DataTypes.STRING(1), + type: DataTypes.BOOLEAN, allowNull: false, }, pOcho: { @@ -56,23 +56,23 @@ CuestionarioAlumno.init( allowNull: false, }, pNueve: { - type: DataTypes.STRING(1), + type: DataTypes.BOOLEAN, allowNull: false, }, pDiez: { - type: DataTypes.STRING(1), + type: DataTypes.BOOLEAN, allowNull: false, }, pOnce: { - type: DataTypes.STRING(1), + type: DataTypes.BOOLEAN, allowNull: false, }, pDoce: { - type: DataTypes.STRING(1), + type: DataTypes.BOOLEAN, allowNull: false, }, pTrece: { - type: DataTypes.STRING(1), + type: DataTypes.BOOLEAN, allowNull: false, }, pCatorce: { @@ -92,15 +92,15 @@ CuestionarioAlumno.init( allowNull: false, }, pDieciocho: { - type: DataTypes.STRING(1), + type: DataTypes.BOOLEAN, allowNull: false, }, pDiecinueve: { - type: DataTypes.STRING(1), + type: DataTypes.BOOLEAN, allowNull: false, }, pVeinte: { - type: DataTypes.STRING(1), + type: DataTypes.BOOLEAN, allowNull: false, }, pVeintiuno: { @@ -120,11 +120,11 @@ CuestionarioAlumno.init( allowNull: false, }, pVeinticinco: { - type: DataTypes.STRING(1), + type: DataTypes.BOOLEAN, allowNull: false, }, pVeintiseis: { - type: DataTypes.STRING(1), + type: DataTypes.BOOLEAN, allowNull: false, }, pVeintisiete: {