diff --git a/src/libs/routes/outOfSchool.js b/src/libs/routes/outOfSchool.js index 7f2533112ced51bf0decc4a83940a6ca4b94c2b9..b3b6e930dc265ecd198ba95a1862679448627a6b 100644 --- a/src/libs/routes/outOfSchool.js +++ b/src/libs/routes/outOfSchool.js @@ -56,15 +56,17 @@ outOfSchoolApp.get('/full_age_range', (req, res, next) => { next(); }, response('full_age_range')); -outOfSchoolApp.get('/ethnic_group_pnad', (req, res, next) => { +outOfSchoolApp.get('/ethnic_group', (req, res, next) => { req.result = [ - {id: 0, name: 'IndÃgena'}, - {id: 1, name: 'Branca e amarela'}, - {id: 2, name: 'Preta e parda'}, - {id: 9, name: 'Sem declaração'} + {id: 0, name: 'Sem declaração'}, + {id: 1, name: 'Branca'}, + {id: 2, name: 'Preta'}, + {id: 3, name: 'Parda'}, + {id: 4, name: 'Amarela'}, + {id: 5, name: 'IndÃgena'} ]; next(); -}, response('ethnic_group_pnad')); +}, response('ethnic_group')); outOfSchoolApp.get('/location', (req, res, next) => { req.result = [ @@ -142,14 +144,14 @@ rqf.addField({ foreignTable: 'pnad' } }).addValue({ - name: 'ethnic_group_pnad', + name: 'ethnic_group', table: 'pnad', - tableField: 'cor_raca', - resultField: 'ethnic_group_pnad_id', + tableField: 'cor_raca_id', + resultField: 'ethnic_group_id', where: { relation: '=', type: 'integer', - field: 'cor_raca' + field: 'cor_raca_id' } }).addValue({ name: 'min_year',