From c67d29010b653e48c2b9737008e3c7cc162513d7 Mon Sep 17 00:00:00 2001 From: Vytor Calixto <vytorcalixto@gmail.com> Date: Wed, 5 Apr 2017 10:38:53 -0300 Subject: [PATCH] Update enrollment.js --- src/libs/routes/enrollment.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libs/routes/enrollment.js b/src/libs/routes/enrollment.js index ce04d96c..66639f89 100644 --- a/src/libs/routes/enrollment.js +++ b/src/libs/routes/enrollment.js @@ -319,17 +319,17 @@ enrollmentApp.get('/offer_projection', simRqf.parse(), simRqf.build(), (req, res req.sql.field('uc408.ano_censo', 'offerYear') .field('uc408.turma_turno_id', 'period_id') - .field('etapa_ensino.desc_etapa', 'education_level_name') - .field('etapa_ensino.id', 'education_level_id') + .field('etapa_mod_ensino_segmento.nome', 'education_level_name') + .field('etapa_mod_ensino_segmento.id', 'education_level_id') .field('uc408.serie_ano_id', 'school_year_id') .field('SUM(uc408.matriculas)', 'currentOffer') .from('uc408') - .join('etapa_ensino', null, 'uc408.etapas_mod_ensino_segmento_id=etapa_ensino.id') + .join('etapa_mod_ensino_segmento', null, 'uc408.etapas_mod_ensino_segmento_id=etapa_mod_ensino_segmento.id') .where('uc408.turma_turno_id <= 2') .group('uc408.ano_censo') .group('uc408.turma_turno_id') - .group('etapa_ensino.desc_etapa') - .group('etapa_ensino.id') + .group('etapa_mod_ensino_segmento.nome') + .group('etapa_mod_ensino_segmento.id') .group('uc408.serie_ano_id'); next(); -- GitLab