From ed021b678512ca4430810d36d5e565d0e929c59d Mon Sep 17 00:00:00 2001
From: Vytor Calixto <vytorcalixto@gmail.com>
Date: Thu, 26 Oct 2017 12:00:01 -0200
Subject: [PATCH] Add years 2013 and 2014 to route idhmr
---
src/libs/routes/idhmr.js | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/libs/routes/idhmr.js b/src/libs/routes/idhmr.js
index 3909f55f..6a1d0207 100644
--- a/src/libs/routes/idhmr.js
+++ b/src/libs/routes/idhmr.js
@@ -27,14 +27,12 @@ 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')
- .where('adh_idh.ano_censo <> 2014 AND adh_idh.ano_censo <> 2013');
+ .field('MAX(adh_idh.ano_censo)', 'end_year');
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')
- .where('adh_idh_uf.ano_censo <> 2014 AND adh_idh_uf.ano_censo <> 2013');
+ .field('MAX(adh_idh_uf.ano_censo)', 'end_year');
req.old_result = req.result;
next();
}, query, (req, res, next) => {
@@ -49,8 +47,7 @@ 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')
- .where('adh_idh.ano_censo <> 2014 AND adh_idh.ano_censo <> 2013');
+ .field('DISTINCT adh_idh.ano_censo', 'year');
next();
}, query, (req, res, next) => {
req.oldResult = req.result;
@@ -58,8 +55,7 @@ idhmrApp.get('/years', (req, res, next) => {
req.sql = squel.select();
req.sql.from('adh_idh_uf')
- .field('DISTINCT adh_idh_uf.ano_censo', 'year')
- .where('adh_idh_uf.ano_censo <> 2014 AND adh_idh_uf.ano_censo <> 2013');
+ .field('DISTINCT adh_idh_uf.ano_censo', 'year');
next();
}, query, (req, res, next) => {
let result = Object.assign(req.oldResult, req.result);
--
GitLab