From 658289283b6502abe6eab6318d883f07fcb78885 Mon Sep 17 00:00:00 2001 From: fgs21 <fgs21@inf.ufpr.br> Date: Fri, 23 Feb 2024 10:41:01 -0300 Subject: [PATCH] [ADD] Adding '/state', '/modality_shift' and '/age_range' subroutes to newPnad --- src/libs/routes_v1/newPnad.js | 40 +++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/src/libs/routes_v1/newPnad.js b/src/libs/routes_v1/newPnad.js index a2b13aa0..eeeea886 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', -- GitLab