Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • simcaq/simcaq-node
  • SMPPIR/SMPPIR-Node
2 results
Show changes
Commits on Source (5)
...@@ -21,14 +21,12 @@ along with simcaq-node. If not, see <https://www.gnu.org/licenses/>. ...@@ -21,14 +21,12 @@ along with simcaq-node. If not, see <https://www.gnu.org/licenses/>.
module.exports = function regionCode(id) { module.exports = function regionCode(id) {
switch (id) { switch (id) {
case 1: case 1:
return 'Receitas';
case 2:
return 'Rede pública (anual)' return 'Rede pública (anual)'
case 3: case 2:
return 'Rede pública (mensal)'; return 'Rede pública (mensal)';
case 4: case 3:
return 'Rede pública e conveniada (anual)'; return 'Rede pública e conveniada (anual)';
case 5: case 4:
return 'Rede pública e conveniada (mensal)'; return 'Rede pública e conveniada (mensal)';
} }
}; };
...@@ -512,8 +512,6 @@ rqf.addField({ ...@@ -512,8 +512,6 @@ rqf.addField({
// Return all cities // Return all cities
enrollmentAggregateApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { enrollmentAggregateApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
console.log(req.query);
if (req.query.dims && req.query.dims.includes('gender')) if (req.query.dims && req.query.dims.includes('gender'))
{ {
req.sql.from('escola') req.sql.from('escola')
......
...@@ -518,7 +518,6 @@ PnadNovoApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { ...@@ -518,7 +518,6 @@ PnadNovoApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
.field('pnad_novo.ano_ref', 'year') .field('pnad_novo.ano_ref', 'year')
.group('pnad_novo.ano_ref') .group('pnad_novo.ano_ref')
.order('pnad_novo.ano_ref') .order('pnad_novo.ano_ref')
console.log(req.sql.toString())
next(); next();
}, query, id2str.transform(false), response('pnad_novo')); }, query, id2str.transform(false), response('pnad_novo'));
......
...@@ -107,7 +107,6 @@ rqf.addField({ ...@@ -107,7 +107,6 @@ rqf.addField({
studentRevenueApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { studentRevenueApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
if (req.query.dims && req.query.dims.includes('receitas')) { if (req.query.dims && req.query.dims.includes('receitas')) {
let obj = {}; let obj = {};
console.log(req.query.filter)
let whereCondition = req.query.filter.includes("region") ? "" : "receitas.cod_ibge = 0"; let whereCondition = req.query.filter.includes("region") ? "" : "receitas.cod_ibge = 0";
let typeFilter = false; let typeFilter = false;
...@@ -135,7 +134,6 @@ studentRevenueApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { ...@@ -135,7 +134,6 @@ studentRevenueApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
if (!typeFilter || (typeFilter && (!obj.state && !obj.city && !obj.region))) { if (!typeFilter || (typeFilter && (!obj.state && !obj.city && !obj.region))) {
req.sql.from('receitas') req.sql.from('receitas')
.field('receitas.ano', 'year') .field('receitas.ano', 'year')
.field('SUM(receitas.receitas)', 'total_receitas')
.field('SUM(receuta_aluno_ano_publica)', '(total_receita_aluno_ano_publica)') .field('SUM(receuta_aluno_ano_publica)', '(total_receita_aluno_ano_publica)')
.field('SUM(receita_aluno_mes_publica)', 'total_receita_aluno_mes_publica') .field('SUM(receita_aluno_mes_publica)', 'total_receita_aluno_mes_publica')
.field('SUM(receita_aluno_ano_publica_mais_conveniada)', 'total_receita_aluno_ano_publica_mais_conveniada') .field('SUM(receita_aluno_ano_publica_mais_conveniada)', 'total_receita_aluno_ano_publica_mais_conveniada')
......