From 3ac25bfd1a3c41f8fd4d95f020e4a6512a248d7f Mon Sep 17 00:00:00 2001
From: Rafael S Castliho <rsc15@inf.ufpr.br>
Date: Thu, 4 Jul 2019 11:38:17 -0300
Subject: [PATCH] Added pnad continua
---
src/libs/routes/SMPPIR/pnad.js | 34 +++++++++++++++++-----------------
src/libs/routes/api.js | 1 +
2 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/src/libs/routes/SMPPIR/pnad.js b/src/libs/routes/SMPPIR/pnad.js
index 153792b2..1b7b0a27 100644
--- a/src/libs/routes/SMPPIR/pnad.js
+++ b/src/libs/routes/SMPPIR/pnad.js
@@ -48,45 +48,45 @@ rqf.addField({
.addValue({
name: 'ethnic',
table: 'pnad_ag',
- tableField: 'cor_raca_original',
+ tableField: 'cor_raca',
resultField: 'co_cor_raca',
where: {
relation: '=',
type: 'string',
- field: 'cor_raca_original',
+ field: 'cor_raca',
},
})
.addValue({
name: 'type_of_school',
table: 'pnad_ag',
- tableField: 'rede_ensino',
+ tableField: 'in_escola_rede',
resultField: 'cod_rede_ensino',
where: {
relation: '=',
type: 'string',
- field: 'rede_ensino',
- },
-})
-.addValue({
- name: 'type_of_public_school',
- table: 'pnad_ag',
- tableField: 'area_rede_publica_ensino',
- resultField: 'co_area_rede_publica_ensino',
- where: {
- relation: '=',
- type: 'string',
- field: 'area_rede_publica_ensino',
+ field: 'in_escola_rede',
},
})
+// .addValue({
+// name: 'type_of_public_school',
+// table: 'pnad_ag',
+// tableField: 'area_rede_publica_ensino',
+// resultField: 'co_area_rede_publica_ensino',
+// where: {
+// relation: '=',
+// type: 'string',
+// field: 'area_rede_publica_ensino',
+// },
+// })
.addValue({
name: 'level_of_education',
table: 'pnad_ag',
- tableField: 'curso_que_frequenta',
+ tableField: 'nivel_escola',
resultField: 'co_curso',
where: {
relation: '=',
type: 'string',
- field: 'curso_que_frequenta',
+ field: 'nivel_escola',
},
})
.addValue({
diff --git a/src/libs/routes/api.js b/src/libs/routes/api.js
index fd1bae83..630928f3 100644
--- a/src/libs/routes/api.js
+++ b/src/libs/routes/api.js
@@ -39,6 +39,7 @@ const fies = require(`${libs}/routes/SMPPIR/fies`);
const pnad = require(`${libs}/routes/SMPPIR/pnad`);
+
const social_support = require(`${libs}/routes/SMPPIR/social_support`);
const admission = require(`${libs}/routes/SMPPIR/admission`);
--
GitLab