From 7e2b5dcdbf54ce9a185d217e3d6c98a7a2d47a58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Victor=20Risso?= <joaovictor.risso@gmail.com>
Date: Fri, 28 Oct 2016 11:43:36 -0200
Subject: [PATCH] Add enrollment queries for the country in location module
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: João Victor Risso <joaovictor.risso@gmail.com>
---
src/libs/routes/location.js | 49 ++++++++++++++++++++++++++++++++++++-
1 file changed, 48 insertions(+), 1 deletion(-)
diff --git a/src/libs/routes/location.js b/src/libs/routes/location.js
index 241fdcac..84d1ee9e 100644
--- a/src/libs/routes/location.js
+++ b/src/libs/routes/location.js
@@ -488,7 +488,54 @@ locationApp.get('/educational', (req, res, next) => {
.group('escola.tipo_localizacao')
.group('escola.ano_censo');
- const queries = [totalSchoolsQry, schoolsPerLocationQry].map((qry) => {
+ const schoolClassYearQry = squel.select()
+ .field('MAX(turma.ano_censo)')
+ .from('turma')
+ .toString();
+
+ const enrollmentsQry = squel.select()
+ .field('\'Brasil\'', 'name')
+ .field('COALESCE(SUM(turma.num_matriculas), 0)', 'total')
+ .field('turma.ano_censo', 'census_year')
+ .field('\'Total\'', 'adm_dependency')
+ .from('turma')
+ .where(`turma.ano_censo IN (${schoolClassYearQry})`)
+ .where('turma.fk_tipo_turma_id <= 3')
+ .group('turma.ano_censo');
+
+ const enrollmentsPerAdmDepQry = squel.select()
+ .field('\'Brasil\'', 'name')
+ .field('COALESCE(SUM(turma.num_matriculas), 0)', 'total')
+ .field('turma.ano_censo', 'census_year')
+ .field('dependencia_adm.nome', 'adm_dependency')
+ .from('turma')
+ .from('dependencia_adm')
+ .where('turma.fk_dependencia_adm_id = dependencia_adm.pk_dependencia_adm_id')
+ .where('turma.fk_tipo_turma_id <= 3')
+ .where(`turma.ano_censo IN (${schoolClassYearQry})`)
+ .group('turma.ano_censo')
+ .group('dependencia_adm.nome');
+
+ const enrollmentsPerSchoolLevelQry = squel.select()
+ .field('\'Brasil\'', 'name')
+ .field('COALESCE(SUM(turma.num_matriculas), 0)', 'total')
+ .field('turma.ano_censo', 'census_year')
+ .field('dependencia_adm.nome', 'adm_dependency')
+ .field('etapa_ensino.desc_etapa', 'school_level')
+ .from('turma')
+ .from('dependencia_adm')
+ .from('etapa_ensino')
+ .where('turma.fk_dependencia_adm_id = dependencia_adm.pk_dependencia_adm_id')
+ .where('turma.fk_etapa_ensino_id = etapa_ensino.pk_etapa_ensino_id')
+ .where('turma.fk_tipo_turma_id <= 3')
+ .where(`turma.ano_censo IN (${schoolClassYearQry})`)
+ .group('turma.ano_censo')
+ .group('dependencia_adm.nome')
+ .group('etapa_ensino.desc_etapa')
+ .order('dependencia_adm.nome')
+ .order('etapa_ensino.desc_etapa');
+
+ const queries = [totalSchoolsQry, schoolsPerLocationQry, enrollmentsQry, enrollmentsPerAdmDepQry, enrollmentsPerSchoolLevelQry].map((qry) => {
return sqlQuery(qry.toString());
});
--
GitLab