diff --git a/src/libs/routes/class.js b/src/libs/routes/class.js index e526ae8d744aa0778743baa6817fa980261324cc..256f25db1d29d841a278f9f340a0ff0f63bbaabe 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 0747ef4f8273ba3f7ef8495a8a155ce037b0bc82..dfd100f2b55eadf6bb55503662c9b7434aa89d61 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 56ef40cc0362ae5ebff81b61c2b576132be420c1..292a9adb7763756661821ab68dbd2728dc5344d0 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 c757a0e7227a0acd1fef7336b14aedb41ec494da..838e20bde4697f74a23b55d0ee04958b2de4006e 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 431380b4a178e07d306af45d219b243a4b47ce2b..ec6c2df40a348b39bcf8c1b577de9bbffe7688db 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 2542fae5ab340c1d7dc6e0f4812046e2d502465d..093bb7505b6fc0800f22880d140d99e61bb512a1 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 1cf63b44879c9c55ad3707f4cce75a7046d318bb..e565b92c5a1632b8dc7992267a04d963ba666db5 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 b6752ac27d0ff8ba189292ba79b3ae87dbd2585b..a6078c3ae4f03dbcabf5a0ce275e7a01925fcbfb 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 c362941be6a1f07c129e64eaa60f104423a714d0..14b3ba0a39162be0c7b2ce473b3a34809ab1c0fc 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 030c09fbc100b0cbdeb3a72c1f4b4bb6faaa5aa7..4514e33ddd25bee23f6877b9bca26ea867c63461 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 be9842a44e7803f3e442075fb6d636bb7b8d2ae6..a652191ad828aa29b918de0d61e7d62d13bc2c26 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'));