Skip to content
Snippets Groups Projects
Commit 6204ea07 authored by Pietro Cavassin's avatar Pietro Cavassin
Browse files

Merge branch 'v2-aggregated-routes' into 'development'

Fix fields in city/state filters, add year filter to division of responsibility route

See merge request !359
parents 7595cbfc 87ec6ac0
Branches
Tags
4 merge requests!377prd_version of simcaq,!368update filter in v2 school,!360Development,!359Fix fields in city/state filters, add year filter to division of responsibility route
...@@ -52,10 +52,20 @@ rqf.addField({ ...@@ -52,10 +52,20 @@ rqf.addField({
name: 'dims', name: 'dims',
field: true, field: true,
where: false where: false
}).addValue({
name: 'year',
table: 'simcaq_divisao_de_responsabilidade',
tableField: 'ano_censo',
where: {
relation: '=',
type: 'integer',
field: 'ano_censo'
}
}).addValue({ }).addValue({
name: 'city', name: 'city',
table: 'municipio', table: 'municipio',
tableField: 'id', tableField: ['nome', 'id'],
resultField: ['city_name', 'city_id'],
where: { where: {
relation: '=', relation: '=',
type: 'integer', type: 'integer',
...@@ -69,7 +79,8 @@ rqf.addField({ ...@@ -69,7 +79,8 @@ rqf.addField({
}, 'dims').addValue({ }, 'dims').addValue({
name: 'state', name: 'state',
table: 'estado', table: 'estado',
tableField: 'id', tableField: ['nome', 'id'],
resultField: ['state_name', 'state_id'],
where: { where: {
relation: '=', relation: '=',
type: 'integer', type: 'integer',
......
...@@ -64,7 +64,8 @@ rqf.addField({ ...@@ -64,7 +64,8 @@ rqf.addField({
}).addValue({ }).addValue({
name: 'city', name: 'city',
table: 'municipio', table: 'municipio',
tableField: 'id', tableField: ['nome', 'id'],
resultField: ['city_name', 'city_id'],
where: { where: {
relation: '=', relation: '=',
type: 'integer', type: 'integer',
...@@ -78,7 +79,8 @@ rqf.addField({ ...@@ -78,7 +79,8 @@ rqf.addField({
}, 'dims').addValue({ }, 'dims').addValue({
name: 'state', name: 'state',
table: 'estado', table: 'estado',
tableField: 'id', tableField: ['nome', 'id'],
resultField: ['state_name', 'state_id'],
where: { where: {
relation: '=', relation: '=',
type: 'integer', type: 'integer',
......
...@@ -73,7 +73,8 @@ rqf.addField({ ...@@ -73,7 +73,8 @@ rqf.addField({
}).addValue({ }).addValue({
name: 'city', name: 'city',
table: 'municipio', table: 'municipio',
tableField: 'id', tableField: ['nome', 'id'],
resultField: ['city_name', 'city_id'],
where: { where: {
relation: '=', relation: '=',
type: 'integer', type: 'integer',
...@@ -87,7 +88,8 @@ rqf.addField({ ...@@ -87,7 +88,8 @@ rqf.addField({
}, 'dims').addValue({ }, 'dims').addValue({
name: 'state', name: 'state',
table: 'estado', table: 'estado',
tableField: 'id', tableField: ['nome', 'id'],
resultField: ['state_name', 'state_id'],
where: { where: {
relation: '=', relation: '=',
type: 'integer', type: 'integer',
......
...@@ -64,7 +64,8 @@ rqf.addField({ ...@@ -64,7 +64,8 @@ rqf.addField({
}).addValue({ }).addValue({
name: 'city', name: 'city',
table: 'municipio', table: 'municipio',
tableField: 'id', tableField: ['nome', 'id'],
resultField: ['city_name', 'city_id'],
where: { where: {
relation: '=', relation: '=',
type: 'integer', type: 'integer',
...@@ -78,7 +79,8 @@ rqf.addField({ ...@@ -78,7 +79,8 @@ rqf.addField({
}, 'dims').addValue({ }, 'dims').addValue({
name: 'state', name: 'state',
table: 'estado', table: 'estado',
tableField: 'id', tableField: ['nome', 'id'],
resultField: ['state_name', 'state_id'],
where: { where: {
relation: '=', relation: '=',
type: 'integer', type: 'integer',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment