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
385740b0
There was a problem fetching the pipeline summary.
Commit
385740b0
authored
6 years ago
by
Vytor Calixto
Browse files
Options
Downloads
Patches
Plain Diff
Fix ethnic group in out of school route
parent
919b5778
No related branches found
No related tags found
1 merge request
!124
Release v1.1.0
Pipeline
#
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/libs/routes/outOfSchool.js
+13
-11
13 additions, 11 deletions
src/libs/routes/outOfSchool.js
with
13 additions
and
11 deletions
src/libs/routes/outOfSchool.js
+
13
−
11
View file @
385740b0
...
...
@@ -56,15 +56,17 @@ outOfSchoolApp.get('/full_age_range', (req, res, next) => {
next
();
},
response
(
'
full_age_range
'
));
outOfSchoolApp
.
get
(
'
/ethnic_group
_pnad
'
,
(
req
,
res
,
next
)
=>
{
outOfSchoolApp
.
get
(
'
/ethnic_group
'
,
(
req
,
res
,
next
)
=>
{
req
.
result
=
[
{
id
:
0
,
name
:
'
Indígena
'
},
{
id
:
1
,
name
:
'
Branca e amarela
'
},
{
id
:
2
,
name
:
'
Preta e parda
'
},
{
id
:
9
,
name
:
'
Sem declaração
'
}
{
id
:
0
,
name
:
'
Sem declaração
'
},
{
id
:
1
,
name
:
'
Branca
'
},
{
id
:
2
,
name
:
'
Preta
'
},
{
id
:
3
,
name
:
'
Parda
'
},
{
id
:
4
,
name
:
'
Amarela
'
},
{
id
:
5
,
name
:
'
Indígena
'
}
];
next
();
},
response
(
'
ethnic_group
_pnad
'
));
},
response
(
'
ethnic_group
'
));
outOfSchoolApp
.
get
(
'
/location
'
,
(
req
,
res
,
next
)
=>
{
req
.
result
=
[
...
...
@@ -142,14 +144,14 @@ rqf.addField({
foreignTable
:
'
pnad
'
}
}).
addValue
({
name
:
'
ethnic_group
_pnad
'
,
name
:
'
ethnic_group
'
,
table
:
'
pnad
'
,
tableField
:
'
cor_raca
'
,
resultField
:
'
ethnic_group_
pnad_
id
'
,
tableField
:
'
cor_raca
_id
'
,
resultField
:
'
ethnic_group_id
'
,
where
:
{
relation
:
'
=
'
,
type
:
'
integer
'
,
field
:
'
cor_raca
'
field
:
'
cor_raca
_id
'
}
}).
addValue
({
name
:
'
min_year
'
,
...
...
@@ -176,7 +178,7 @@ rqf.addField({
}).
addValue
({
name
:
'
full_age_range
'
,
table
:
'
pnad
'
,
tableField
:
'
idade
_31_03
'
,
tableField
:
'
faixa_etaria
_31_03
'
,
resultField
:
'
full_age_range_id
'
,
where
:
{
relation
:
'
=
'
,
...
...
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