From 3662081d0c48f214576f72111098a82f3265cbef Mon Sep 17 00:00:00 2001
From: fgs21 <fgs21@inf.ufpr.br>
Date: Wed, 21 Feb 2024 09:45:03 -0300
Subject: [PATCH] [FIX] Fixing instruction level convert and region filter
---
src/libs/convert/instructionLevel.js | 2 +-
src/libs/routes_v1/newPnad.js | 18 ++++++------------
2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/src/libs/convert/instructionLevel.js b/src/libs/convert/instructionLevel.js
index 7750a704..78bbf88a 100644
--- a/src/libs/convert/instructionLevel.js
+++ b/src/libs/convert/instructionLevel.js
@@ -34,7 +34,7 @@ module.exports = function instructionLevel(id) {
return 'Superior incompleto ou equivalente';
case 7:
return 'Superior completo ou equivalente';
- case 8:
+ case 99:
return 'Não se aplica - 17 anos ou menos';
}
};
diff --git a/src/libs/routes_v1/newPnad.js b/src/libs/routes_v1/newPnad.js
index e222b37d..05ab151a 100644
--- a/src/libs/routes_v1/newPnad.js
+++ b/src/libs/routes_v1/newPnad.js
@@ -465,23 +465,17 @@ rqf.addField({
type: 'integer',
field: 'microrregiao_id'
}
-}).addValueToField({
+}).addValue({
name: 'region',
- table: 'estado',
- tableField: 'regiao_id',
- resultField: 'region_id',
+ table: 'pnad_novo',
+ tableField: 'cod_regiao',
+ resultField: 'reg_code_id',
where: {
relation: '=',
type: 'integer',
- field: 'regiao_id',
- table: 'estado'
- },
- join: {
- primary: 'id',
- foreign: 'estado_id',
- foreignTable: 'municipio'
+ field: 'cod_regiao',
}
-}, 'filter');
+});
PnadNovoApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
req.sql.from('pnad_novo')
--
GitLab