From 6d816913e7a435fda9674ad32635d802905f0d17 Mon Sep 17 00:00:00 2001 From: Glenda <gpt16@inf.ufpr.br> Date: Wed, 20 Jun 2018 09:30:10 -0300 Subject: [PATCH] Fix age range --- src/libs/convert/fullAgeRange.js | 22 +++++++++++----------- src/libs/routes/outOfSchool.js | 24 ++++++++++++------------ src/libs/routes/rateSchool.js | 12 ++++++------ 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/libs/convert/fullAgeRange.js b/src/libs/convert/fullAgeRange.js index d7b36fdc..e18b9156 100644 --- a/src/libs/convert/fullAgeRange.js +++ b/src/libs/convert/fullAgeRange.js @@ -1,27 +1,27 @@ module.exports = function ageRange(id) { switch (id) { case 1: - return '0-3'; + return '0 a 3 anos'; case 2: - return '4-5'; + return '4 a 5 anos'; case 3: - return '6-10'; + return '6 a 10 anos'; case 4: - return '11-14'; + return '11 a 14 anos'; case 5: - return '15-17'; + return '15 a 17 anos'; case 6: - return '18-24'; + return '18 a 24 anos'; case 7: - return '25-29'; + return '25 a 29 anos'; case 8: - return '30-40'; + return '30 a 40 anos'; case 9: - return '41-50'; + return '41 a 50 anos'; case 10: - return '51-64'; + return '51 a 64 anos'; case 11: - return '64+'; + return 'Mais de 64 anos'; default: return 'Não declarada'; } diff --git a/src/libs/routes/outOfSchool.js b/src/libs/routes/outOfSchool.js index b3b6e930..822ef3a8 100644 --- a/src/libs/routes/outOfSchool.js +++ b/src/libs/routes/outOfSchool.js @@ -41,17 +41,17 @@ outOfSchoolApp.get('/years', (req, res, next) => { outOfSchoolApp.get('/full_age_range', (req, res, next) => { req.result = [ - {id: 1, name: '0-3'}, - {id: 2, name: '4-5'}, - {id: 3, name: '6-10'}, - {id: 4, name: '11-14'}, - {id: 5, name: '15-17'}, - {id: 6, name: '18-24'}, - {id: 7, name: '25-29'}, - {id: 8, name: '30-40'}, - {id: 9, name: '41-50'}, - {id: 10, name: '51-64'}, - {id: 11, name: '64+'} + {id: 1, name: '0 a 3 anos'}, + {id: 2, name: '4 a 5 anos'}, + {id: 3, name: '6 a 10 anos'}, + {id: 4, name: '11 a 14 anos'}, + {id: 5, name: '15 a 17 anos'}, + {id: 6, name: '18 a 24 anos'}, + {id: 7, name: '25 a 29 anos'}, + {id: 8, name: '30 a 40 anos'}, + {id: 9, name: '41 a 50 anos'}, + {id: 10, name: '51 a 64 anos'}, + {id: 11, name: 'Mais de 64 anos'} ]; next(); }, response('full_age_range')); @@ -238,4 +238,4 @@ outOfSchoolApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { next(); }, query, addMissing(rqf), id2str.transform(), response('out_of_school')); -module.exports = outOfSchoolApp; \ No newline at end of file +module.exports = outOfSchoolApp; diff --git a/src/libs/routes/rateSchool.js b/src/libs/routes/rateSchool.js index 85601322..a45865a9 100644 --- a/src/libs/routes/rateSchool.js +++ b/src/libs/routes/rateSchool.js @@ -64,12 +64,12 @@ rateSchoolApp.get('/ethnic_group_pnad', (req, res, next) => { rateSchoolApp.get('/age_range', (req, res, next) => { req.result = [ - {id: 1, name: '0-3'}, - {id: 2, name: '4-5'}, - {id: 3, name: '6-10'}, - {id: 4, name: '11-14'}, - {id: 5, name: '15-17'}, - {id: 6, name: '18-24'} + {id: 1, name: '0 a 3 anos'}, + {id: 2, name: '4 a 5 anos'}, + {id: 3, name: '6 a 10 anos'}, + {id: 4, name: '11 a 14 anos'}, + {id: 5, name: '15 a 17 anos'}, + {id: 6, name: '18 a 24 anos'} ]; next(); }, response('age_range')); -- GitLab