diff --git a/src/libs/convert/capitalCode.js b/src/libs/convert/capitalCode.js index 2e4774f53cd92e9b6f69360b8664b538b2fe6b63..09727c63a58ffea1f1d18019a9bf3fbb2b91d48c 100644 --- a/src/libs/convert/capitalCode.js +++ b/src/libs/convert/capitalCode.js @@ -20,6 +20,8 @@ along with simcaq-node. If not, see <https://www.gnu.org/licenses/>. module.exports = function capitalCode(id) { switch (id) { + case null: + return 'Não é capital'; case 11: return 'Porto Velho'; case 12: @@ -75,7 +77,7 @@ module.exports = function capitalCode(id) { case 53: return 'BrasÃlia'; default: - return 'Não é capital'; + return 'Não informado'; } }; diff --git a/src/libs/convert/ethnicGroupNewPnad.js b/src/libs/convert/ethnicGroupNewPnad.js index cfbd60e176b014a66fc2ba2dd681cb5203320e38..702a90fffd64cca924c4e5d186d25fdd6092a9b8 100644 --- a/src/libs/convert/ethnicGroupNewPnad.js +++ b/src/libs/convert/ethnicGroupNewPnad.js @@ -31,6 +31,6 @@ module.exports = function ethnicGroupNewPnad(id) { case 5: return 'IndÃgena'; case 9: - return 'Sem declaração'; + return 'Não declarado'; } }; diff --git a/src/libs/convert/metroCode.js b/src/libs/convert/metroCode.js index e7729bb454e0c6b5a8785a84c22d1cb9c59b0d3a..95425f33c1ad052a888b976057ce7244dda44bc6 100644 --- a/src/libs/convert/metroCode.js +++ b/src/libs/convert/metroCode.js @@ -20,6 +20,8 @@ along with simcaq-node. If not, see <https://www.gnu.org/licenses/>. module.exports = function metroCode(id) { switch (id) { + case null: + return 'Não é região metropolitana ou região administrativa integrada'; case 13: return 'Região Metropolitana de Manaus'; case 15: @@ -63,6 +65,6 @@ module.exports = function metroCode(id) { case 52: return 'Região Metropolitana de Goiânia'; default: - return 'Não é região metropolitana ou região administrativa integrada'; + return 'Não informado'; } }; diff --git a/src/libs/routes_v1/newPnad.js b/src/libs/routes_v1/newPnad.js index d2ad0de7f82ec316a3de3e2a5d1b79913ee39d90..63fcc78de564dd748ba917ecb57c9253cd9e0cb6 100644 --- a/src/libs/routes_v1/newPnad.js +++ b/src/libs/routes_v1/newPnad.js @@ -77,12 +77,12 @@ PnadNovoApp.get('/years_of_study', (req, res, next) => { PnadNovoApp.get('/instruction_level', (req, res, next) => { req.result = [] - for (let i = 1; i < 9; i++) { + for (let i = 1; i < 8; i++) { req.result.push({ id: i, name: id2str.instructionLevel(i) }); } - + req.result.push({id: 99, name: id2str.instructionLevel(99)}); next(); }, response('instruction_level')); @@ -111,10 +111,13 @@ PnadNovoApp.get('/region', (req, res, next) => { PnadNovoApp.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: null, name: id2str.capitalCode(null)}); next(); }, response('cap_code')); @@ -122,17 +125,20 @@ PnadNovoApp.get('/cap_code', (req, res, next) => { PnadNovoApp.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: null, name: id2str.metroCode(null)}); next(); }, response('metro_code')); PnadNovoApp.get('/attended_modality', (req, res, next) => { req.result = [] - for (let i = 1; i < 15; i++) { + for (let i = 1; i < 16; i++) { req.result.push({ id: i, name: id2str.attendedModality(i) }); @@ -143,12 +149,12 @@ PnadNovoApp.get('/attended_modality', (req, res, next) => { PnadNovoApp.get('/income_range', (req, res, next) => { req.result = [] - for (let i = 1; i < 15; i++) { + for (let i = 1; i < 8; i++) { req.result.push({ - id: i, name: id2str.attendedModality(i) + id: i, name: id2str.incomeRange(i) }); } - req.result.push({id: 99, name: id2str.attendedModality(99)}); + req.result.push({id: 9, name: id2str.incomeRange(9)}); next(); }, response('income_range')); @@ -159,7 +165,6 @@ PnadNovoApp.get('/attends_school', (req, res, next) => { id: i, name: id2str.attendsSchool(i) }); } - req.result.push({id: 9, name: id2str.attendsSchool(9)}); next(); }, response('attends_school'));