Skip to content
Snippets Groups Projects
Commit e7888fb6 authored by Vytor Calixto's avatar Vytor Calixto :space_invader:
Browse files

Merge branch 'development' of gitlab.c3sl.ufpr.br:simcaq/simcaq-node into development

parents bf51c054 a9e6352a
No related branches found
No related tags found
1 merge request!116Release v1.0.0
...@@ -52,7 +52,7 @@ rateSchoolApp.get('/source', (req, res, next) => { ...@@ -52,7 +52,7 @@ rateSchoolApp.get('/source', (req, res, next) => {
next(); next();
}, query, response('source')); }, query, response('source'));
rateSchoolApp.get('/ethnic_group', (req, res, next) => { rateSchoolApp.get('/ethnic_group_pnad', (req, res, next) => {
req.result = [ req.result = [
{id: 2, name: 'Branca'}, {id: 2, name: 'Branca'},
{id: 4, name: 'Preta'}, {id: 4, name: 'Preta'},
...@@ -62,7 +62,7 @@ rateSchoolApp.get('/ethnic_group', (req, res, next) => { ...@@ -62,7 +62,7 @@ rateSchoolApp.get('/ethnic_group', (req, res, next) => {
{id: 9, name: 'Sem declaração'} {id: 9, name: 'Sem declaração'}
]; ];
next(); next();
}, response('ethnic_group')); }, response('ethnic_group_pnad'));
rateSchoolApp.get('/age_range', (req, res, next) => { rateSchoolApp.get('/age_range', (req, res, next) => {
req.result = [ req.result = [
...@@ -152,7 +152,7 @@ rqf.addField({ ...@@ -152,7 +152,7 @@ rqf.addField({
foreignTable: 'pnad' foreignTable: 'pnad'
} }
}).addValue({ }).addValue({
name: 'ethnic_group', name: 'ethnic_group_pnad',
table: 'pnad', table: 'pnad',
tableField: 'cor_raca_id', tableField: 'cor_raca_id',
resultField: 'ethnic_group_pnad_id', resultField: 'ethnic_group_pnad_id',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment