Commit 6b42beb0 authored by Vytor Calixto's avatar Vytor Calixto 👾

Merge branch 'hotfix_v1.2.1'

parents bd3e3a42 8ddda71c
Pipeline #15784 canceled with stage
in 5 seconds
......@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).
## 1.2.1 - 2018-05-22
### Changed
- Add state id in infrastructure
## 1.2.0 - 2018-05-21
### Added
- Classroom count route
......
......@@ -108,8 +108,8 @@ rqf.addField({
}, 'dims').addValueToField({
name: 'city',
table: 'municipio',
tableField: 'nome',
resultField: 'city_name',
tableField: 'id',
resultField: 'city_id',
where: {
relation: '=',
type: 'integer',
......@@ -121,11 +121,11 @@ rqf.addField({
foreign: 'municipio_id',
foreignTable: 'escola'
}
}, 'filter').addValue({
}, 'filter').addValueToField({
name: 'state',
table: 'estado',
tableField: 'nome',
resultField: 'state_name',
tableField: ['nome', 'id'],
resultField: ['state_name', 'state_id'],
where: {
relation: '=',
type: 'integer',
......@@ -137,7 +137,23 @@ rqf.addField({
foreign: 'estado_id',
foreignTable: 'escola'
}
}).addValue({
}, 'dims').addValueToField({
name: 'state',
table: 'estado',
tableField: 'id',
resultField: 'state_id',
where: {
relation: '=',
type: 'integer',
field: 'estado_id',
table: 'escola'
},
join: {
primary: 'id',
foreign: 'estado_id',
foreignTable: 'escola'
}
}, 'filter').addValue({
name: 'region',
table: 'regiao',
tableField: 'nome',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment