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

[fix] retirou as colunas desnecessarias da tabela

parent 3d16b4be
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
...@@ -78,6 +78,7 @@ function aggregateData(req, res, next) { ...@@ -78,6 +78,7 @@ function aggregateData(req, res, next) {
let currentAggregateField; let currentAggregateField;
let currentNonAggregateField; let currentNonAggregateField;
console.log("data pre aggregate" ,req.result)
// Verifica se o filtro passado está presente nos filtros agregados // Verifica se o filtro passado está presente nos filtros agregados
fields.forEach(field => {if (aggregateFields.includes(field)) currentAggregateField = field; else currentNonAggregateField = field}); fields.forEach(field => {if (aggregateFields.includes(field)) currentAggregateField = field; else currentNonAggregateField = field});
if (currentAggregateField) { if (currentAggregateField) {
...@@ -109,6 +110,7 @@ function aggregateData(req, res, next) { ...@@ -109,6 +110,7 @@ function aggregateData(req, res, next) {
req.result = newResult; req.result = newResult;
} }
} }
console.log("data pos aggregate" ,req.result)
next(); next();
} }
......
...@@ -111,7 +111,6 @@ rqf.addField({ ...@@ -111,7 +111,6 @@ rqf.addField({
ExpensesApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { ExpensesApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
if (req.query.dims && req.query.dims.includes('despesas')) {
let whereCondition = req.query.filter.includes("region") ? "" : "despesas.cod_ibge = 0"; let whereCondition = req.query.filter.includes("region") ? "" : "despesas.cod_ibge = 0";
let filterId; let filterId;
const filters = req.query.filter.split(","); const filters = req.query.filter.split(",");
...@@ -126,18 +125,11 @@ ExpensesApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { ...@@ -126,18 +125,11 @@ ExpensesApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
.field('despesas.ano_censo', 'year') .field('despesas.ano_censo', 'year')
.field('despesas.ano_censo', 'total_ano') .field('despesas.ano_censo', 'total_ano')
.field('despesas.nome_ente', 'total_nome_ente') .field('despesas.nome_ente', 'total_nome_ente')
.field('round(despesas.despesas,2)', 'total_despesas') .field('round(despesas.despesas,2)', 'total')
.field('matriculas_publica', 'total_matriculas_publica')
.field('matriculas_publicas_mais_conveniada', 'total_matriculas_publicas_mais_conveniada')
.field('round(gasto_aluno_ano_publica,2)', 'total_gasto_aluno_ano_publica')
.field('round(gasto_aluno_mes_publica,2)', 'total_gasto_aluno_mes_publica')
.field('round(gasto_aluno_ano_publica_mais_conveniada,2)', 'total_gasto_aluno_ano_publica_mais_conveniada')
.field('round(gasto_aluno_mes_publica_mais_conveniada,2)', 'total_gasto_aluno_mes_publica_mais_conveniada')
.where(`${whereCondition}`) .where(`${whereCondition}`)
.order('despesas.ano_censo') .order('despesas.ano_censo')
}
next(); next();
}, query, aggregateData, id2str.transform(false), response('expenses')); }, query, id2str.transform(false), response('expenses'));
module.exports = ExpensesApp; module.exports = ExpensesApp;
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment