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

Merge branch 'fix_school_join' into development

parents 0044fd60 68b2c645
No related branches found
No related tags found
1 merge request!116Release v1.0.0
Pipeline #
...@@ -84,11 +84,6 @@ rqf.addField({ ...@@ -84,11 +84,6 @@ rqf.addField({
relation: '=', relation: '=',
type: 'integer', type: 'integer',
field: 'id' field: 'id'
},
join: {
primary: ['id', 'ano_censo'],
foreign: ['escola_id', 'ano_censo'],
foreignTable: 'matricula'
} }
}, 'dims').addValueToField({ }, 'dims').addValueToField({
name: 'school', name: 'school',
...@@ -99,11 +94,6 @@ rqf.addField({ ...@@ -99,11 +94,6 @@ rqf.addField({
relation: '=', relation: '=',
type: 'integer', type: 'integer',
field: 'id' field: 'id'
},
join: {
primary: ['id', 'ano_censo'],
foreign: ['escola_id', 'ano_censo'],
foreignTable: 'matricula'
} }
}, 'filter').addValueToField({ }, 'filter').addValueToField({
name: 'city', name: 'city',
......
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