diff --git a/src/libs/routes/universityEnrollment.js b/src/libs/routes/universityEnrollment.js index c9c045af39b357dc5786b40330d9b38b3fcd9705..69509042b9a5f9554da4acec3eea0eccbbf3ac8e 100644 --- a/src/libs/routes/universityEnrollment.js +++ b/src/libs/routes/universityEnrollment.js @@ -739,15 +739,23 @@ universityEnrollmentApp.get('/', rqf.parse(), (req, res, next) => { universityEnrollmentApp.get('/enter_situation ', rqf.parse(), (req, res, next) => { req.sql.from('localoferta_ens_superior_matricula2') - .field('SUM(CASE WHEN cod_aluno_situacao=2 THEN 1 ELSE 0 END)', 'cursando') - .field('SUM(CASE WHEN cod_aluno_situacao=6 THEN 1 ELSE 0 END)', 'concluinte') - .field('SUM(CASE WHEN cod_aluno_situacao=4 OR cod_aluno_situacao=5 OR cod_aluno_situacao=7 THEN 1 ELSE 0 END)', 'evadido') - .field('SUM(CASE WHEN cod_aluno_situacao=3 THEN 1 ELSE 0 END)', 'trancado') + .field('SUM(CASE WHEN cod_aluno_situacao=2 AND ingressante=1 THEN 1 ELSE 0 END)', 'cursando') + .field('SUM(CASE WHEN cod_aluno_situacao=6 AND ingressante=1THEN 1 ELSE 0 END)', 'concluinte') + .field('SUM(CASE WHEN (cod_aluno_situacao=4 OR cod_aluno_situacao=5 OR cod_aluno_situacao=7) AND ingressante=1 THEN 1 ELSE 0 END)', 'evadido') + .field('SUM(CASE WHEN cod_aluno_situacao=3 AND ingressante=1 THEN 1 ELSE 0 END)', 'trancado') .field('COUNT(*)', 'total') .where('ano_censo=2018') .where('cod_nivel_academico=1') .where('cod_grau_academico=2 OR cod_grau_academico=4') .where('localoferta_cod_uf=41') next() -}, rqf.build(), query, id2str.transform(), response('universityEnrollment')); +}, rqf.build(), query, (req, res, next) => { + for (var res of req.result){ + res.cursando = Number(res.cursando); + res.concluinte = Number(res.concluinte); + res.evadido = Number(res.evadido); + } + + next(); +}, id2str.transform(), response('enterSituation')); module.exports = universityEnrollmentApp;