Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
simcaq-node
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
simcaq
simcaq-node
Commits
3662081d
Commit
3662081d
authored
1 year ago
by
Fernando Gbur dos Santos
Browse files
Options
Downloads
Patches
Plain Diff
[FIX] Fixing instruction level convert and region filter
parent
554b3e4c
No related branches found
No related tags found
3 merge requests
!391
Hom -> Prod
,
!388
development -> homologa
,
!387
new_pnad -> development
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/libs/convert/instructionLevel.js
+1
-1
1 addition, 1 deletion
src/libs/convert/instructionLevel.js
src/libs/routes_v1/newPnad.js
+6
-12
6 additions, 12 deletions
src/libs/routes_v1/newPnad.js
with
7 additions
and
13 deletions
src/libs/convert/instructionLevel.js
+
1
−
1
View file @
3662081d
...
...
@@ -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
'
;
}
};
This diff is collapsed.
Click to expand it.
src/libs/routes_v1/newPnad.js
+
6
−
12
View file @
3662081d
...
...
@@ -465,23 +465,17 @@ rqf.addField({
type
:
'
integer
'
,
field
:
'
microrregiao_id
'
}
}).
addValue
ToField
({
}).
addValue
({
name
:
'
region
'
,
table
:
'
estad
o
'
,
tableField
:
'
regiao
_id
'
,
resultField
:
'
reg
ion
_id
'
,
table
:
'
pnad_nov
o
'
,
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
'
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment