From 41f051e2b76ec94e72e8c25b64e07608e0f21e2f Mon Sep 17 00:00:00 2001
From: Vytor Calixto <vytorcalixto@gmail.com>
Date: Thu, 28 Sep 2017 16:53:40 -0300
Subject: [PATCH] Add block for years 2013 and 2014
---
src/libs/routes/class.js | 4 +++-
src/libs/routes/classroom.js | 9 +++++----
src/libs/routes/enrollment.js | 6 ++++--
src/libs/routes/idhm.js | 12 ++++++++----
src/libs/routes/idhme.js | 12 ++++++++----
src/libs/routes/idhml.js | 12 ++++++++----
src/libs/routes/idhmr.js | 12 ++++++++----
src/libs/routes/pibpercapita.js | 6 ++++--
src/libs/routes/population.js | 6 ++++--
src/libs/routes/school.js | 7 ++++---
src/libs/routes/teacher.js | 6 ++++--
11 files changed, 60 insertions(+), 32 deletions(-)
diff --git a/src/libs/routes/class.js b/src/libs/routes/class.js
index e526ae8d..256f25db 100644
--- a/src/libs/routes/class.js
+++ b/src/libs/routes/class.js
@@ -32,12 +32,14 @@ classApp.get('/year_range', (req, res, next) => {
req.sql.from('turma')
.field('MIN(turma.ano_censo)', 'start_year')
.field('MAX(turma.ano_censo)', 'end_year');
+ .where('turma.ano_censo > 2014');
next();
}, query, response('range'));
classApp.get('/years', (req, res, next) => {
req.sql.from('turma')
- .field('DISTINCT turma.ano_censo', 'year');
+ .field('DISTINCT turma.ano_censo', 'year')
+ .where('turma.ano_censo > 2014');
next();
}, query, response('years'));
diff --git a/src/libs/routes/classroom.js b/src/libs/routes/classroom.js
index 0747ef4f..dfd100f2 100644
--- a/src/libs/routes/classroom.js
+++ b/src/libs/routes/classroom.js
@@ -1,4 +1,4 @@
-const express = require('express');
+ const express = require('express');
const classroomApp = express.Router();
@@ -26,15 +26,16 @@ let rqfCount = new ReqQueryFields();
// Returns a tuple of start and ending years of the complete enrollments dataset.
classroomApp.get('/year_range', (req, res, next) => {
req.sql.from('escola')
- .field('2015', 'start_year')
- .field('2016', 'end_year');
+ .field('MIN(escola.ano_censo)', 'start_year')
+ .field('MAX(escola.ano_censo)', 'end_year')
+ .where('escola.ano_censo > 2014');
next();
}, query, response('range'));
classroomApp.get('/years', (req, res, next) => {
req.sql.from('escola')
.field('DISTINCT escola.ano_censo', 'year')
- .where('escola.ano_censo <> 2013 AND escola.ano_censo <> 2014');
+ .where('escola.ano_censo > 2014');
next();
}, query, response('years'));
diff --git a/src/libs/routes/enrollment.js b/src/libs/routes/enrollment.js
index 56ef40cc..292a9adb 100644
--- a/src/libs/routes/enrollment.js
+++ b/src/libs/routes/enrollment.js
@@ -31,13 +31,15 @@ let rqf = new ReqQueryFields();
enrollmentApp.get('/year_range', (req, res, next) => {
req.sql.from('matricula')
.field('MIN(matricula.ano_censo)', 'start_year')
- .field('MAX(matricula.ano_censo)', 'end_year');
+ .field('MAX(matricula.ano_censo)', 'end_year')
+ .where('matricula.ano_censo > 2014');
next();
}, query, response('range'));
enrollmentApp.get('/years', (req, res, next) => {
req.sql.from('matricula')
- .field('DISTINCT matricula.ano_censo', 'year');
+ .field('DISTINCT matricula.ano_censo', 'year')
+ .where('matricula.ano_censo > 2014');
next();
}, query, response('years'));
diff --git a/src/libs/routes/idhm.js b/src/libs/routes/idhm.js
index c757a0e7..838e20bd 100644
--- a/src/libs/routes/idhm.js
+++ b/src/libs/routes/idhm.js
@@ -27,12 +27,14 @@ idhmApp.use(cache('15 day'));
idhmApp.get('/year_range', (req, res, next) => {
req.sql.from('adh_idh')
.field('MIN(adh_idh.ano_censo)', 'start_year')
- .field('MAX(adh_idh.ano_censo)', 'end_year');
+ .field('MAX(adh_idh.ano_censo)', 'end_year')
+ .where('adh_idh.ano_censo > 2014');
next();
}, query, (req, res, next) => {
req.sql.from('adh_idh_uf')
.field('MIN(adh_idh_uf.ano_censo)', 'start_year')
- .field('MAX(adh_idh_uf.ano_censo)', 'end_year');
+ .field('MAX(adh_idh_uf.ano_censo)', 'end_year')
+ .where('adh_idh_uf.ano_censo > 2014');
req.old_result = req.result;
next();
}, query, (req, res, next) => {
@@ -49,7 +51,8 @@ idhmApp.get('/year_range', (req, res, next) => {
idhmApp.get('/years', (req, res, next) => {
req.sql.from('adh_idh')
- .field('DISTINCT adh_idh.ano_censo', 'year');
+ .field('DISTINCT adh_idh.ano_censo', 'year')
+ .where('adh_idh.ano_censo > 2014');
next();
}, query, (req, res, next) => {
req.oldResult = req.result;
@@ -57,7 +60,8 @@ idhmApp.get('/years', (req, res, next) => {
req.sql = squel.select();
req.sql.from('adh_idh_uf')
- .field('DISTINCT adh_idh_uf.ano_censo', 'year');
+ .field('DISTINCT adh_idh_uf.ano_censo', 'year')
+ .where('adh_idh_uf.ano_censo > 2014');
next();
}, query, (req, res, next) => {
let result = Object.assign(req.oldResult, req.result);
diff --git a/src/libs/routes/idhme.js b/src/libs/routes/idhme.js
index 431380b4..ec6c2df4 100644
--- a/src/libs/routes/idhme.js
+++ b/src/libs/routes/idhme.js
@@ -25,12 +25,14 @@ idhmeApp.use(cache('15 day'));
idhmeApp.get('/year_range', (req, res, next) => {
req.sql.from('adh_idh')
.field('MIN(adh_idh.ano_censo)', 'start_year')
- .field('MAX(adh_idh.ano_censo)', 'end_year');
+ .field('MAX(adh_idh.ano_censo)', 'end_year')
+ .where('adh_idh.ano_censo > 2014');
next();
}, query, (req, res, next) => {
req.sql.from('adh_idh_uf')
.field('MIN(adh_idh_uf.ano_censo)', 'start_year')
- .field('MAX(adh_idh_uf.ano_censo)', 'end_year');
+ .field('MAX(adh_idh_uf.ano_censo)', 'end_year')
+ .where('adh_idh_uf.ano_censo > 2014');
req.old_result = req.result;
next();
}, query, (req, res, next) => {
@@ -47,7 +49,8 @@ idhmeApp.get('/year_range', (req, res, next) => {
idhmeApp.get('/years', (req, res, next) => {
req.sql.from('adh_idh')
- .field('DISTINCT adh_idh.ano_censo', 'year');
+ .field('DISTINCT adh_idh.ano_censo', 'year')
+ .where('adh_idh.ano_censo > 2014');
next();
}, query, (req, res, next) => {
req.oldResult = req.result;
@@ -55,7 +58,8 @@ idhmeApp.get('/years', (req, res, next) => {
req.sql = squel.select();
req.sql.from('adh_idh_uf')
- .field('DISTINCT adh_idh_uf.ano_censo', 'year');
+ .field('DISTINCT adh_idh_uf.ano_censo', 'year')
+ .where('adh_idh_uf.ano_censo > 2014');;
next();
}, query, (req, res, next) => {
let result = Object.assign(req.oldResult, req.result);
diff --git a/src/libs/routes/idhml.js b/src/libs/routes/idhml.js
index 2542fae5..093bb750 100644
--- a/src/libs/routes/idhml.js
+++ b/src/libs/routes/idhml.js
@@ -25,12 +25,14 @@ idhmlApp.use(cache('15 day'));
idhmlApp.get('/year_range', (req, res, next) => {
req.sql.from('adh_idh')
.field('MIN(adh_idh.ano_censo)', 'start_year')
- .field('MAX(adh_idh.ano_censo)', 'end_year');
+ .field('MAX(adh_idh.ano_censo)', 'end_year')
+ .where('adh_idh.ano_censo > 2014');
next();
}, query, (req, res, next) => {
req.sql.from('adh_idh_uf')
.field('MIN(adh_idh_uf.ano_censo)', 'start_year')
- .field('MAX(adh_idh_uf.ano_censo)', 'end_year');
+ .field('MAX(adh_idh_uf.ano_censo)', 'end_year')
+ .where('adh_idh_uf.ano_censo > 2014');
req.old_result = req.result;
next();
}, query, (req, res, next) => {
@@ -47,7 +49,8 @@ idhmlApp.get('/year_range', (req, res, next) => {
idhmlApp.get('/years', (req, res, next) => {
req.sql.from('adh_idh')
- .field('DISTINCT adh_idh.ano_censo', 'year');
+ .field('DISTINCT adh_idh.ano_censo', 'year')
+ .where('adh_idh.ano_censo > 2014');
next();
}, query, (req, res, next) => {
req.oldResult = req.result;
@@ -55,7 +58,8 @@ idhmlApp.get('/years', (req, res, next) => {
req.sql = squel.select();
req.sql.from('adh_idh_uf')
- .field('DISTINCT adh_idh_uf.ano_censo', 'year');
+ .field('DISTINCT adh_idh_uf.ano_censo', 'year')
+ .where('adh_idh_uf.ano_censo > 2014');
next();
}, query, (req, res, next) => {
let result = Object.assign(req.oldResult, req.result);
diff --git a/src/libs/routes/idhmr.js b/src/libs/routes/idhmr.js
index 1cf63b44..e565b92c 100644
--- a/src/libs/routes/idhmr.js
+++ b/src/libs/routes/idhmr.js
@@ -27,12 +27,14 @@ idhmrApp.use(cache('15 day'));
idhmrApp.get('/year_range', (req, res, next) => {
req.sql.from('adh_idh')
.field('MIN(adh_idh.ano_censo)', 'start_year')
- .field('MAX(adh_idh.ano_censo)', 'end_year');
+ .field('MAX(adh_idh.ano_censo)', 'end_year')
+ .where('adh_idh.ano_censo > 2014');
next();
}, query, (req, res, next) => {
req.sql.from('adh_idh_uf')
.field('MIN(adh_idh_uf.ano_censo)', 'start_year')
- .field('MAX(adh_idh_uf.ano_censo)', 'end_year');
+ .field('MAX(adh_idh_uf.ano_censo)', 'end_year')
+ .where('adh_idh_uf.ano_censo > 2014');
req.old_result = req.result;
next();
}, query, (req, res, next) => {
@@ -49,7 +51,8 @@ idhmrApp.get('/year_range', (req, res, next) => {
idhmrApp.get('/years', (req, res, next) => {
req.sql.from('adh_idh')
- .field('DISTINCT adh_idh.ano_censo', 'year');
+ .field('DISTINCT adh_idh.ano_censo', 'year')
+ .where('adh_idh.ano_censo > 2014');
next();
}, query, (req, res, next) => {
req.oldResult = req.result;
@@ -57,7 +60,8 @@ idhmrApp.get('/years', (req, res, next) => {
req.sql = squel.select();
req.sql.from('adh_idh_uf')
- .field('DISTINCT adh_idh_uf.ano_censo', 'year');
+ .field('DISTINCT adh_idh_uf.ano_censo', 'year')
+ .where('adh_idh_uf.ano_censo > 2014');
next();
}, query, (req, res, next) => {
let result = Object.assign(req.oldResult, req.result);
diff --git a/src/libs/routes/pibpercapita.js b/src/libs/routes/pibpercapita.js
index b6752ac2..a6078c3a 100644
--- a/src/libs/routes/pibpercapita.js
+++ b/src/libs/routes/pibpercapita.js
@@ -27,13 +27,15 @@ pibpercapitaApp.use(cache('15 day'));
pibpercapitaApp.get('/year_range', (req, res, next) => {
req.sql.from('ibge_pib')
.field('MIN(ibge_pib.ano_censo)', 'start_year')
- .field('MAX(ibge_pib.ano_censo)', 'end_year');
+ .field('MAX(ibge_pib.ano_censo)', 'end_year')
+ .where('ibge_pib.ano_censo > 2014');
next();
}, query, response('range'));
pibpercapitaApp.get('/years', (req, res, next) => {
req.sql.from('ibge_pib').
- field('DISTINCT ibge_pib.ano_censo', 'year');
+ field('DISTINCT ibge_pib.ano_censo', 'year')
+ .where('ibge_pib.ano_censo > 2014');
next();
}, query, response('years'));
diff --git a/src/libs/routes/population.js b/src/libs/routes/population.js
index c362941b..14b3ba0a 100644
--- a/src/libs/routes/population.js
+++ b/src/libs/routes/population.js
@@ -27,13 +27,15 @@ populationApp.use(cache('15 day'));
populationApp.get('/year_range', (req, res, next) => {
req.sql.from('ibge_populacao')
.field('MIN(ibge_populacao.ano_censo)', 'start_year')
- .field('MAX(ibge_populacao.ano_censo)', 'end_year');
+ .field('MAX(ibge_populacao.ano_censo)', 'end_year')
+ .where('ibge_populacao.ano_censo > 2014');
next();
}, query, response('range'));
populationApp.get('/years', (req, res, next) => {
req.sql.from('ibge_populacao').
- field('DISTINCT ibge_populacao.ano_censo', 'year');
+ field('DISTINCT ibge_populacao.ano_censo', 'year')
+ .where('ibge_populacao.ano_censo > 2014');
next();
}, query, response('years'));
diff --git a/src/libs/routes/school.js b/src/libs/routes/school.js
index 030c09fb..4514e33d 100644
--- a/src/libs/routes/school.js
+++ b/src/libs/routes/school.js
@@ -28,15 +28,16 @@ let rqfCount = new ReqQueryFields();
// Return location
schoolApp.get('/year_range', cache('15 day'), (req, res, next) => {
req.sql.from('escola')
- .field('2015', 'start_year')
- .field('2016', 'end_year');
+ .field('MIN(escola.ano_censo)', 'start_year')
+ .field('MAX(escola.ano_censo)', 'end_year')
+ .where('escola.ano_censo > 2014');
next();
}, query, response('range'));
schoolApp.get('/years', cache('15 day'), (req, res, next) => {
req.sql.from('escola').
field('DISTINCT escola.ano_censo', 'year')
- .where('escola.ano_censo <> 2013 AND escola.ano_censo <> 2014');
+ .where('escola.ano_censo > 2014');
next();
}, query, response('years'));
diff --git a/src/libs/routes/teacher.js b/src/libs/routes/teacher.js
index be9842a4..a652191a 100644
--- a/src/libs/routes/teacher.js
+++ b/src/libs/routes/teacher.js
@@ -30,13 +30,15 @@ teacherApp.use(cache('15 day'));
teacherApp.get('/year_range', (req, res, next) => {
req.sql.from('docente')
.field('MIN(docente.ano_censo)', 'start_year')
- .field('MAX(docente.ano_censo)', 'end_year');
+ .field('MAX(docente.ano_censo)', 'end_year')
+ .where('docente.ano_censo > 2014');;
next();
}, query, response('range'));
teacherApp.get('/years', (req, res, next) => {
req.sql.from('docente').
- field('DISTINCT docente.ano_censo', 'year');
+ field('DISTINCT docente.ano_censo', 'year')
+ .where('docente.ano_censo > 2014');
next();
}, query, response('years'));
--
GitLab