diff --git a/src/libs/convert/revenue.js b/src/libs/convert/revenue.js index 006e26629f15b302f57dd8df7855205d4cfb6a42..fb3c819ac639bf49ec12abcd4c0af2049e705e21 100644 --- a/src/libs/convert/revenue.js +++ b/src/libs/convert/revenue.js @@ -21,14 +21,12 @@ along with simcaq-node. If not, see <https://www.gnu.org/licenses/>. module.exports = function regionCode(id) { switch (id) { case 1: - return 'Receitas'; - case 2: return 'Rede pública (anual)' - case 3: + case 2: return 'Rede pública (mensal)'; - case 4: + case 3: return 'Rede pública e conveniada (anual)'; - case 5: + case 4: return 'Rede pública e conveniada (mensal)'; } }; diff --git a/src/libs/routes_v1/enrollmentAggregate.js b/src/libs/routes_v1/enrollmentAggregate.js index 7e8cd3faece61c7999d16db913c50938de4e51fb..a561f1376599a397d14f1c0687814670c9bb4d39 100644 --- a/src/libs/routes_v1/enrollmentAggregate.js +++ b/src/libs/routes_v1/enrollmentAggregate.js @@ -512,8 +512,6 @@ rqf.addField({ // Return all cities enrollmentAggregateApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { - console.log(req.query); - if (req.query.dims && req.query.dims.includes('gender')) { req.sql.from('escola') diff --git a/src/libs/routes_v1/newPnad.js b/src/libs/routes_v1/newPnad.js index 5bfb7b8a23e5badace6614815f84ba4ae40515b3..e9549404d6f369410b8e9d3c7558bcaa91a8e798 100644 --- a/src/libs/routes_v1/newPnad.js +++ b/src/libs/routes_v1/newPnad.js @@ -518,7 +518,6 @@ PnadNovoApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { .field('pnad_novo.ano_ref', 'year') .group('pnad_novo.ano_ref') .order('pnad_novo.ano_ref') - console.log(req.sql.toString()) next(); }, query, id2str.transform(false), response('pnad_novo')); diff --git a/src/libs/routes_v1/studentRevenue.js b/src/libs/routes_v1/studentRevenue.js index 2b62671def3d111972c395e464bdb4c5b3389dfc..271566af3a7fc1ebe53641a7889161c03d601d0c 100644 --- a/src/libs/routes_v1/studentRevenue.js +++ b/src/libs/routes_v1/studentRevenue.js @@ -107,7 +107,6 @@ rqf.addField({ studentRevenueApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { if (req.query.dims && req.query.dims.includes('receitas')) { let obj = {}; - console.log(req.query.filter) let whereCondition = req.query.filter.includes("region") ? "" : "receitas.cod_ibge = 0"; let typeFilter = false; @@ -135,7 +134,6 @@ studentRevenueApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { if (!typeFilter || (typeFilter && (!obj.state && !obj.city && !obj.region))) { req.sql.from('receitas') .field('receitas.ano', 'year') - .field('SUM(receitas.receitas)', 'total_receitas') .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_ano_publica_mais_conveniada)', 'total_receita_aluno_ano_publica_mais_conveniada')