From beb4d51e0c546f9db663d48491f8c891490c81ad Mon Sep 17 00:00:00 2001 From: Lewis <lgtg20@inf.ufpr.br> Date: Mon, 18 Nov 2024 12:03:02 -0300 Subject: [PATCH] fix: age range all options --- src/libs/routes_v1/iliteracyRate.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libs/routes_v1/iliteracyRate.js b/src/libs/routes_v1/iliteracyRate.js index 468e18e2..25b97d5d 100644 --- a/src/libs/routes_v1/iliteracyRate.js +++ b/src/libs/routes_v1/iliteracyRate.js @@ -154,12 +154,11 @@ iliteracyRate.get('/attended_modality', (req, res, next) => { iliteracyRate.get('/income_range', (req, res, next) => { req.result = [] - for (let i = 1; i < 8; i++) { + for (let i = 1; i < 10; i++) { req.result.push({ id: i, name: id2str.incomeRange(i) }); } - req.result.push({id: 10, name: id2str.incomeRange(10)}); next(); }, response('income_range')); @@ -244,7 +243,7 @@ iliteracyRate.get('/state', (req, res, next) => { iliteracyRate.get('/age_range_all', (req, res, next) => { req.result = [] - for (let i = 1; i < 12; i++) { + for (let i = 5; i < 12; i++) { req.result.push({ id: i, name: id2str.ageRangeAll(i) }); @@ -426,12 +425,12 @@ rqf.addField({ }).addValue({ name: 'income_range', table: 'pnad_novo', - tableField: 'faixa_rendimento_aux_tx', + tableField: 'faixa_rendimento_aux', resultField: 'income_range_id', where: { relation: '=', type: 'integer', - field: 'faixa_rendimento_aux_tx' + field: 'faixa_rendimento_aux' } }).addValue({ name: 'gender', @@ -568,6 +567,7 @@ function matchQueries(queryPartial, queryTotal) { newObj.denominator = result.total; newObj.partial = objMatch.total; newObj.total = (objMatch.total / result.total) * 100; + newObj.total = newObj.total.toFixed(1); match.push(newObj); } }); -- GitLab