diff --git a/src/libs/convert/Illiteracy.js b/src/libs/convert/illiteracy.js similarity index 94% rename from src/libs/convert/Illiteracy.js rename to src/libs/convert/illiteracy.js index 4f4a8bb215b723f5943f3f6cf8e6929dff7ebfd1..069273977485f6680a83e6b269878653d82bc314 100644 --- a/src/libs/convert/Illiteracy.js +++ b/src/libs/convert/illiteracy.js @@ -18,7 +18,7 @@ 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 newPnadAdmDependency(id) { +module.exports = function illiteracy(id) { switch (id) { case 0: return 'Não'; diff --git a/src/libs/convert/yearsOfStudy.js b/src/libs/convert/yearsOfStudy.js new file mode 100644 index 0000000000000000000000000000000000000000..db474559b39841cbaf7d83af65122349a5ac42db --- /dev/null +++ b/src/libs/convert/yearsOfStudy.js @@ -0,0 +1,60 @@ +/* +Copyright (C) 2024 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 yearsOfStudy(id) { + switch (id) { + case 0: + return 'Sem instrução e menos de 1 ano de estudo'; + case 1: + return '1 ano de estudo'; + case 2: + return '2 anos de estudo'; + case 3: + return '3 anos de estudo'; + case 4: + return '4 anos de estudo'; + case 5: + return '5 anos de estudo'; + case 6: + return '6 anos de estudo'; + case 7: + return '7 anos de estudo'; + case 8: + return '8 anos de estudo'; + case 9: + return '9 anos de estudo'; + case 10: + return '10 anos de estudo'; + case 11: + return '11 anos de estudo'; + case 12: + return '12 anos de estudo'; + case 13: + return '13 anos de estudo'; + case 14: + return '14 anos de estudo'; + case 15: + return '15 anos de estudo'; + case 16: + return '16 anos ou mais de estudo'; + case 99: + return 'Não se aplica - 17 anos ou menos'; + } +}; diff --git a/src/libs/middlewares/id2str.js b/src/libs/middlewares/id2str.js index b5fe0974bb9df107b2d1879ac6a144c132c475a7..8f45de99d125ac2b368c247c81b022186568c081 100644 --- a/src/libs/middlewares/id2str.js +++ b/src/libs/middlewares/id2str.js @@ -102,7 +102,8 @@ const type = require(`${libs}/convert/type`); const level = require(`${libs}/convert/level`); const scholarDependency = require(`${libs}/convert/scholarDependency`); const newPnadAdmDependency = require(`${libs}/convert/newPnadAdmDependency`); -const Illiteracy = require(`${libs}/convert/Illiteracy`); +const illiteracy = require(`${libs}/convert/Illiteracy`); +const yearsOfStudy = require(`${libs}/convert/yearsOfStudy`); const ids = { gender_id: gender, @@ -197,7 +198,8 @@ const ids = { level_id: level, scholar_dependency_id: scholarDependency, new_pnad_adm_dependency_id: newPnadAdmDependency, - illiteracy_id: Illiteracy + illiteracy_id: illiteracy, + years_of_study_id: yearsOfStudy }; function transform(removeId=false) { @@ -315,5 +317,6 @@ module.exports = { shift, admDependencyPub, newPnadAdmDependency, - Illiteracy + illiteracy, + yearsOfStudy }; diff --git a/src/libs/routes_v1/newPnad.js b/src/libs/routes_v1/newPnad.js index 049b461ac993685603bdefa20463442e3cc07a62..360a16aee501669d64388067d164e14ee7a3acc9 100644 --- a/src/libs/routes_v1/newPnad.js +++ b/src/libs/routes_v1/newPnad.js @@ -62,16 +62,15 @@ PnadNovoApp.get('/illiteracy', (req, res, next) => { }, response('illiteracy')); PnadNovoApp.get('/years_of_study', (req, res, next) => { - req.result = [ - {id: 0, name: 'Sem instrução e menos de 1 ano de idade'}, - {id: 1, name: '1 ano de estudo'}, - ]; + req.result = [] - for (let i = 2; i < 17; i++) { - req.result.push({id: i, name: i + ' anos de estudo'}); + for (let i = 0; i < 17; i++) { + req.result.push({ + id: i, name: id2str.yearsOfStudy(i) + }); } - req.result.push({id: 99, name: 'Não se aplica 17 anos ou menos'}); + req.result.push({id: 99, name: id2str.yearsOfStudy(99)}); next(); }, response('years_of_study'));