Skip to content
Snippets Groups Projects
Commit 5f8ac571 authored by lgtg20's avatar lgtg20
Browse files

Bug fix region for federative entity

parent f1615444
No related branches found
No related tags found
3 merge requests!434Homologa,!422Development,!420Ente federativo
......@@ -312,8 +312,8 @@ rqf.addField({
},
join: {
primary: 'id',
foreign: 'estado_id',
foreignTable: 'escola'
foreign: 'cod_uf',
foreignTable: 'docentes_sinopse'
}
}, 'dims').addValueToField({
name: 'state',
......@@ -327,8 +327,8 @@ rqf.addField({
},
join: {
primary: 'id',
foreign: 'estado_id',
foreignTable: 'escola'
foreign: 'cod_uf',
foreignTable: 'docentes_sinopse'
}
}, 'filter').addValueToField({
name: 'city',
......@@ -559,7 +559,15 @@ federativeEntityApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
.order('docentes_sinopse.ano_censo')
.where('docentes_sinopse.cod_reg = 0');
}
else {
else if (req.query.dims && req.query.dims.includes('state')) {
req.sql.from('docentes_sinopse')
.field('SUM(docentes_sinopse.num_doc_ed_bas_total)', 'total')
.field('docentes_sinopse.ano_censo', 'year')
.group('docentes_sinopse.ano_censo')
.order('docentes_sinopse.ano_censo')
.where('docentes_sinopse.cod_mun = 0');
}
else if (req.query.dims && req.query.dims.includes('region')) {
req.sql.from('docentes_sinopse')
.field('SUM(docentes_sinopse.num_doc_ed_bas_total)', 'total')
.field('docentes_sinopse.ano_censo', 'year')
......@@ -567,6 +575,14 @@ federativeEntityApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
.order('docentes_sinopse.ano_censo')
.where('docentes_sinopse.cod_uf = 0');
}
else {
req.sql.from('docentes_sinopse')
.field('SUM(docentes_sinopse.num_doc_ed_bas_total)', 'total')
.field('docentes_sinopse.ano_censo', 'year')
.group('docentes_sinopse.ano_censo')
.order('docentes_sinopse.ano_censo')
.where('docentes_sinopse.cod_reg = 0');
}
next();
}, query, aggregateData, id2str.transform(false), response('federative_entity'));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment