diff --git a/src/libs/routes_v1/newPnad.js b/src/libs/routes_v1/newPnad.js index a2b13aa0bfa834c1d7f284356842a57dbe190096..eeeea886dd2b7a30ee7e26616419ed1d32b12c82 100644 --- a/src/libs/routes_v1/newPnad.js +++ b/src/libs/routes_v1/newPnad.js @@ -217,6 +217,42 @@ PnadNovoApp.get('/modality', (req, res, next) => { next(); }, response('modality')); +PnadNovoApp.get('/modality_shift', (req, res, next) => { + req.result = [] + for (let i = 1; i < 8; i++) { + req.result.push({ + id: i, name: id2str.modalityShift(i) + }); + } + req.result.push({id: 99, name: id2str.modality(99)}); + req.result.push({id: null, name: id2str.modality(null)}); + next(); +}, response('modality_shift')); + +PnadNovoApp.get('/state', (req, res, next) => { + req.result = [] + for (let i = 11; i < 54; i++) { + req.result.push({ + id: i, name: id2str.stateName(i) + }); + } + req.result.push({id: 99, name: id2str.stateName(99)}); + + next(); +}, response('state')); + +PnadNovoApp.get('/age_range', (req, res, next) => { + req.result = [] + for (let i = 1; i < 12; i++) { + req.result.push({ + id: i, name: id2str.ageRangeAll(i) + }); + } + + next(); +}, response('state')); + + rqf.addField({ name: 'filter', field: false, @@ -378,12 +414,12 @@ rqf.addField({ }).addValue({ name: 'income_range', table: 'pnad_novo', - tableField: 'faixa_rendimento', + tableField: 'faixa_rendimento_aux', resultField: 'income_range_id', where: { relation: '=', type: 'integer', - field: 'faixa_rendimento' + field: 'faixa_rendimento_aux' } }).addValue({ name: 'gender',