Skip to content
Snippets Groups Projects
Commit 537bdef2 authored by Joao Pedro's avatar Joao Pedro
Browse files

[fix] filtros por rede

parent c31b81cc
Branches
No related tags found
4 merge requests!501[hotfix] capital filter working for superior education conclusion tax...,!499[hotfix] capital filter working for superior education conclusion tax...,!489dev -> hom,!488[fix] correções apontadas pelo LDE para Despesas em educação básica
......@@ -51,6 +51,14 @@ ExpensesApp.get('/years', (req, res, next) => {
next();
}, query, response('years'))
ExpensesApp.get('/type', (req, res, next) => {
req.result = []
req.result.push({ id: 1, name: "Rede Estadual" });
req.result.push({ id: 2, name: "Rede Municipal" });
next();
}, response('type'));
// rqf.addValue({
// name: 'location',
// table: 'despesas',
......@@ -111,6 +119,8 @@ rqf.addField({
ExpensesApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
let obj = {}
let typeFilter = false;
let whereCondition = req.query.filter.includes("region") ? "" : "despesas.cod_ibge = 0";
let filterId;
const filters = req.query.filter.split(",");
......@@ -121,6 +131,22 @@ ExpensesApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
}
})
if (req.query.filter) {
const jsonString = `{${req.query.filter.replace(/(\w+):/g, '"$1":')}}`;
obj = JSON.parse(jsonString);
if (obj.type) {
if (obj.type.includes("1") && !obj.type.includes("2")) {
whereCondition = "despesas.cod_ibge >= 11 and despesas.cod_ibge <= 53"
}
else if (obj.type.includes("2") && !obj.type.includes("1")) {
whereCondition = "despesas.cod_ibge > 53"
}
typeFilter = true;
}
}
if (!typeFilter || (typeFilter && (!obj.state && !obj.city && !obj.region))) {
req.sql.from('despesas')
.field('despesas.ano_censo', 'year')
.field('despesas.ano_censo', 'total_ano')
......@@ -128,6 +154,7 @@ ExpensesApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
.field('round(despesas.despesas,2)', 'total')
.where(`${whereCondition}`)
.order('despesas.ano_censo')
}
next();
}, query, id2str.transform(false), response('expenses'));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment