diff --git a/src/libs/convert/ageRange19to64.js b/src/libs/convert/ageRange19to64.js
new file mode 100644
index 0000000000000000000000000000000000000000..470208675967b09f129effcdfe114f7386a02219
--- /dev/null
+++ b/src/libs/convert/ageRange19to64.js
@@ -0,0 +1,38 @@
+/*
+Copyright (C) 2016 Centro de Computacao Cientifica e Software Livre
+Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+
+This file is part of simcaq-node.
+
+simcaq-node is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+simcaq-node is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with simcaq-node. If not, see <https://www.gnu.org/licenses/>.
+*/
+
+module.exports = function ageRange19to64(id) {
+ switch (id) {
+ case 6:
+ return '19 a 24 anos';
+ case 7:
+ return '25 a 29 anos';
+ case 8:
+ return '30 a 40 anos';
+ case 9:
+ return '41 a 50 anos';
+ case 10:
+ return '51 a 64 anos';
+ case 11:
+ return 'Mais que 64 anos';
+ default:
+ return 'Não declarada';
+ }
+};
diff --git a/src/libs/middlewares/id2str.js b/src/libs/middlewares/id2str.js
index 730d620e18c1bc1708af165eebd5de1b3a54c931..e144fb97466631e6f4c542d62d59e0eab215d80e 100644
--- a/src/libs/middlewares/id2str.js
+++ b/src/libs/middlewares/id2str.js
@@ -128,6 +128,7 @@ const totalDoc = require(`${libs}/convert/totalDoc`);
const educationDegreeEntity = require(`${libs}/convert/educationDegreeEntity`);
const revenue = require(`${libs}/convert/revenue`);
const studentCost = require(`${libs}/convert/studentCost`);
+const ageRange19to64 = require(`${libs}/convert/ageRange19to64`);
const ids = {
gender_id: gender,
@@ -248,7 +249,8 @@ const ids = {
total_doc: totalDoc,
education_degree_entity: educationDegreeEntity,
receitas_id: revenue,
- student_cost: studentCost
+ student_cost: studentCost,
+ age_range_19_to_64_id: ageRange19to64
};
function transform(removeId=false) {
@@ -258,7 +260,6 @@ function transform(removeId=false) {
}
// Para cada objeto do resultado
req.result.forEach((obj) => {
- console.log(obj),
Object.keys(obj).forEach((key) => {
// Se não há uma função especificada, retorna
if(typeof ids[key] === 'undefined') return;
@@ -392,5 +393,6 @@ module.exports = {
totalDoc,
educationDegreeEntity,
revenue,
- studentCost
+ studentCost,
+ ageRange19to64
};
diff --git a/src/libs/routes_v1/basicEducationConclusion.js b/src/libs/routes_v1/basicEducationConclusion.js
index fb7452990b4a1be888247802cea0e9e424af606c..3b22f4d3a96eabb0fcd2987a93be342e14854373 100644
--- a/src/libs/routes_v1/basicEducationConclusion.js
+++ b/src/libs/routes_v1/basicEducationConclusion.js
@@ -36,9 +36,9 @@ const ReqQueryFields = require(`${libs}/middlewares/reqQueryFields`);
const id2str = require(`${libs}/middlewares/id2str`);
-const config = require(`${libs}/config`);
+const config = require(`${libs}/config`);
-const cache = require('apicache').options({ debug: config.debug, statusCodes: {include: [200]} }).middleware;
+const cache = require('apicache').options({ debug: config.debug, statusCodes: { include: [200] } }).middleware;
let rqf = new ReqQueryFields();
@@ -46,8 +46,8 @@ basicEducationConclusion.use(cache('15 day'));
basicEducationConclusion.get('/years', (req, res, next) => {
req.sql.from('pnad_novo')
- .field('DISTINCT pnad_novo.ano_ref', 'year')
- .where('pnad_novo.ano_ref >= 2019')
+ .field('DISTINCT pnad_novo.ano_ref', 'year')
+ .where('pnad_novo.ano_ref >= 2019')
next();
}, query, response('years'));
@@ -60,7 +60,7 @@ basicEducationConclusion.get('/illiteracy', (req, res, next) => {
});
}
- req.result.push({id: 9, name: id2str.illiteracy(9)});
+ req.result.push({ id: 9, name: id2str.illiteracy(9) });
next();
}, response('illiteracy'));
@@ -73,7 +73,7 @@ basicEducationConclusion.get('/years_of_study', (req, res, next) => {
});
}
- req.result.push({id: 99, name: id2str.yearsOfStudy(99)});
+ req.result.push({ id: 99, name: id2str.yearsOfStudy(99) });
next();
}, response('years_of_study'));
@@ -85,7 +85,7 @@ basicEducationConclusion.get('/instruction_level', (req, res, next) => {
id: i, name: id2str.instructionLevel(i)
});
}
- req.result.push({id: 99, name: id2str.instructionLevel(99)});
+ req.result.push({ id: 99, name: id2str.instructionLevel(99) });
next();
}, response('instruction_level'));
@@ -96,7 +96,7 @@ basicEducationConclusion.get('/new_pnad_adm_dependency', (req, res, next) => {
id: i, name: id2str.newPnadAdmDependency(i)
});
}
- req.result.push({id: 99, name: id2str.newPnadAdmDependency(99)});
+ req.result.push({ id: 99, name: id2str.newPnadAdmDependency(99) });
next();
}, response('new_pnad_adm_dependency'));
@@ -115,12 +115,11 @@ basicEducationConclusion.get('/cap_code', (req, res, next) => {
req.result = []
for (let i = 11; i < 54; i++) {
if (id2str.capitalCode(i) !== 'Não informado') {
- req.result.push({
- id: i, name: id2str.capitalCode(i)
- });
+ req.result.push({
+ id: i, name: id2str.capitalCode(i)
+ });
}
}
- req.result.push({id: 99, name: id2str.capitalCode(99)});
next();
}, response('cap_code'));
@@ -129,12 +128,12 @@ basicEducationConclusion.get('/metro_code', (req, res, next) => {
req.result = []
for (let i = 13; i < 53; i++) {
if (id2str.metroCode(i) !== 'Não informado') {
- req.result.push({
- id: i, name: id2str.metroCode(i)
- });
+ req.result.push({
+ id: i, name: id2str.metroCode(i)
+ });
}
}
- req.result.push({id: 99, name: id2str.metroCode(99)});
+ req.result.push({ id: 99, name: id2str.metroCode(99) });
next();
}, response('metro_code'));
@@ -148,7 +147,7 @@ basicEducationConclusion.get('/attended_modality', (req, res, next) => {
}
// Remove the option with id equals 10 => This option exists in the database, a better solution to this would be remove the option from the database
req.result.splice(req.result.findIndex((item) => item.id === 10), 1);
- req.result.push({id: 99, name: id2str.attendedModality(99)});
+ req.result.push({ id: 99, name: id2str.attendedModality(99) });
next();
}, response('attended_modality'));
@@ -159,7 +158,7 @@ basicEducationConclusion.get('/income_range', (req, res, next) => {
id: i, name: id2str.incomeRange(i)
});
}
- req.result.push({id: 10, name: id2str.incomeRange(10)});
+ req.result.push({ id: 9, name: id2str.incomeRange(9) });
next();
}, response('income_range'));
@@ -190,7 +189,7 @@ basicEducationConclusion.get('/new_pnad_ethnic_group', (req, res, next) => {
id: i, name: id2str.ethnicGroupNewPnad(i)
});
}
- req.result.push({id: 9, name: id2str.ethnicGroupNewPnad(9)});
+ req.result.push({ id: 9, name: id2str.ethnicGroupNewPnad(9) });
next();
}, response('new_pnad_ethnic_group'));
@@ -201,7 +200,7 @@ basicEducationConclusion.get('/bolsa_familia', (req, res, next) => {
id: i, name: id2str.attendsSchool(i)
});
}
- req.result.push({id: 9, name: id2str.attendsSchool(9)});
+ req.result.push({ id: 9, name: id2str.attendsSchool(9) });
next();
}, response('bolsa_familia'));
@@ -212,7 +211,7 @@ basicEducationConclusion.get('/modality', (req, res, next) => {
id: i, name: id2str.modality(i)
});
}
- req.result.push({id: 99, name: id2str.modality(99)});
+ req.result.push({ id: 99, name: id2str.modality(99) });
next();
}, response('modality'));
@@ -223,8 +222,8 @@ basicEducationConclusion.get('/modality_shift', (req, res, next) => {
id: i, name: id2str.modalityShift(i)
});
}
- req.result.push({id: 9, name: id2str.modalityShift(9)});
- req.result.push({id: 99, name: id2str.modalityShift(99)});
+ req.result.push({ id: 9, name: id2str.modalityShift(9) });
+ req.result.push({ id: 99, name: id2str.modalityShift(99) });
next();
}, response('modality_shift'));
@@ -237,21 +236,21 @@ basicEducationConclusion.get('/state', (req, res, next) => {
});
}
}
- req.result.push({id: 99, name: id2str.stateName(99)});
+ req.result.push({ id: 99, name: id2str.stateName(99) });
next();
}, response('state'));
-basicEducationConclusion.get('/age_range_all', (req, res, next) => {
+basicEducationConclusion.get('/age_range_19_to_64', (req, res, next) => {
req.result = []
- for (let i = 1; i < 12; i++) {
+ for (let i = 6; i <= 11; i++) {
req.result.push({
- id: i, name: id2str.ageRangeAll(i)
+ id: i, name: id2str.ageRange19to64(i)
});
}
next();
-}, response('age_range_all'));
+}, response('age_range_19_to_64'));
basicEducationConclusion.get('/location', (req, res, next) => {
req.result = []
@@ -414,10 +413,10 @@ rqf.addField({
field: 'cor_raca'
}
}).addValue({
- name: 'age_range_all',
+ name: 'age_range_19_to_64',
table: 'pnad_novo',
tableField: 'faixa_etaria',
- resultField: 'age_range_all_id',
+ resultField: 'age_range_19_to_64_id',
where: {
relation: '=',
type: 'integer',
@@ -426,12 +425,12 @@ rqf.addField({
}).addValue({
name: 'income_range',
table: 'pnad_novo',
- tableField: 'faixa_rendimento_aux_tx',
+ tableField: 'faixa_rendimento_aux',
resultField: 'income_range_id',
where: {
relation: '=',
type: 'integer',
- field: 'faixa_rendimento_aux_tx'
+ field: 'faixa_rendimento_aux'
}
}).addValue({
name: 'gender',
@@ -545,26 +544,26 @@ function matchQueries(queryPartial, queryTotal) {
newObj[key] = result[key];
});
let index = keys.indexOf('total');
- if(index > -1) keys.splice(index, 1);
+ if (index > -1) keys.splice(index, 1);
let objMatch = null;
- for(let i = 0; i < queryPartial.length; ++i) {
+ for (let i = 0; i < queryPartial.length; ++i) {
let partial = queryPartial[i];
let foundMatch = true;
- for(let j = 0; j < keys.length; ++j) {
+ for (let j = 0; j < keys.length; ++j) {
let key = keys[j];
- if(partial[key] !== result[key]) {
+ if (partial[key] !== result[key]) {
foundMatch = false;
break;
}
}
- if(foundMatch) {
+ if (foundMatch) {
objMatch = partial;
break;
}
}
- if(objMatch) {
+ if (objMatch) {
newObj.denominator = result.total;
newObj.partial = objMatch.total;
newObj.total = (objMatch.total / result.total) * 100;
@@ -577,10 +576,10 @@ function matchQueries(queryPartial, queryTotal) {
basicEducationConclusion.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
req.querySet = [];
-
+
// Subquery para total_pop_maior_19 com filtros dinâmicos
let totalPopMaior19 = req.sql.clone();
- totalPopMaior19.from("pnad_novo")
+ totalPopMaior19.from("pnad_novo")
.field("ano_ref", "year")
.field("SUM(peso_domicilio_pessoas_com_cal)", "total")
.where("idade_morador_31_03 >= 19")
@@ -590,7 +589,7 @@ basicEducationConclusion.get('/', rqf.parse(), rqf.build(), (req, res, next) =>
// Subquery para total_pop_ed_bas_maior_19 com filtros dinâmicos
let totalPopEdBasMaior19 = req.sql.clone();
- totalPopEdBasMaior19.from("pnad_novo")
+ totalPopEdBasMaior19.from("pnad_novo")
.field("ano_ref", "year")
.field("SUM(peso_domicilio_pessoas_com_cal)", "total")
.where("idade_morador_31_03 >= 19")
@@ -599,9 +598,8 @@ basicEducationConclusion.get('/', rqf.parse(), rqf.build(), (req, res, next) =>
.group("ano_ref")
.order("ano_ref");
- if (req.query.dims && req.query.dims.includes("income_range")) {
- totalPopMaior19.where("faixa_rendimento_aux_tx is not null");
- totalPopEdBasMaior19.where("faixa_rendimento_aux_tx is not null");
+ if (req.query.dims && req.query.dims.includes("cap_code")) {
+ totalPopMaior19.where("cod_cap < 99");
}
req.querySet.push(totalPopEdBasMaior19);
@@ -609,10 +607,10 @@ basicEducationConclusion.get('/', rqf.parse(), rqf.build(), (req, res, next) =>
next();
}, multiQuery, (req, res, next) => {
- // The multiple requests are made. Then we need to calculate the percetange. So the function
- // below is used
- let newObj = matchQueries(req.result[0], req.result[1]);
- req.result = newObj;
+ // The multiple requests are made. Then we need to calculate the percetange. So the function
+ // below is used
+ let newObj = matchQueries(req.result[0], req.result[1]);
+ req.result = newObj;
next();
}, id2str.transform(false), response('basic_education_conclusion'));