From 522e92ece0bc9a47a6d6df8916063a8f3647623c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leon=20A=2E=20Okida=20Gon=C3=A7alves?= <laog19@inf.ufpr.br>
Date: Mon, 5 Jun 2023 10:20:18 -0300
Subject: [PATCH] classroom count v2 working but does not return data
---
src/libs/routes_v2/classroomCount.js | 41 +++++-----------------------
1 file changed, 7 insertions(+), 34 deletions(-)
diff --git a/src/libs/routes_v2/classroomCount.js b/src/libs/routes_v2/classroomCount.js
index 4e5c0dbd..be2c8645 100644
--- a/src/libs/routes_v2/classroomCount.js
+++ b/src/libs/routes_v2/classroomCount.js
@@ -231,28 +231,7 @@ classroomCountApp.post('/', rqf.parse(), (req, res, next) => {
//req.dims.school_year = true;
req.dims.location = true;
- /*
- select
- sum(dia_total),
- sum(noite_total),
- 'Brasil' as name,
- ano_censo,
- serie_ano_id,
- estado_id,
- municipio_id,
- localizacao_id
- from
- simcaq_matricula_por_localizacao
- where
- serie_ano_id < 15
- group by
- name,
- ano_censo,
- serie_ano_id,
- estado_id,
- municipio_id,
- localizacao_id
- */
+
req.sql.field('sum(dia_total)', 'total_day')
.field('sum(noite_total)', 'total_night')
@@ -386,21 +365,19 @@ classroomCountApp.post('/', rqf.parse(), (req, res, next) => {
}
/*
- select num_docentes,
+ select sum(num_docentes),
'Brasil' as name,
ano_censo,
- escola_estado_id,
+ estado_id,
municipio_id
from simcaq_docente_agregada
*/
- //req.dims.city = true;
- //req.dims.state = true;
- req.sql.field('simcaq_docente_agregada.num_docentes', 'total')
+ req.dims.city = true;
+ req.dims.state = true;
+ req.sql.field('SUM(simcaq_docente_agregada.num_docentes)', 'total')
.field("'Brasil'", 'name')
.field('simcaq_docente_agregada.ano_censo', 'year')
- .field('escola_estado_id', 'state_id')
- .field('municipio_id', 'city_id')
.from('simcaq_docente_agregada')
.group('simcaq_docente_agregada.ano_censo')
.order('simcaq_docente_agregada.ano_censo');
@@ -433,13 +410,11 @@ classroomCountApp.post('/', rqf.parse(), (req, res, next) => {
req.dims.state = true;
req.dims.city = true;
req.dims.education_level_short = true;
- //req.dims.integral_time = true;
+ req.dims.integral_time = true;
req.sql.field('SUM(num_matriculas)', 'total')
.field('simcaq_matricula_agregada.ano_censo', 'year')
- .field('simcaq_matricula_agregada.tempo_integral', 'integral_time')
.from('simcaq_matricula_agregada')
.group('simcaq_matricula_agregada.ano_censo')
- .group('simcaq_matricula_agregada.tempo_integral')
.order('simcaq_matricula_agregada.ano_censo');
next();
}, rqf.build() ,query, id2str.transform(), (req, res, next) => {
@@ -1196,8 +1171,6 @@ classroomCountApp.post('/', rqf.parse(), (req, res, next) => {
})
}
- console.log('fim')
-
next();
}, response('classroom_count'));
--
GitLab