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

Merge branch 'issue/430' into development

parents 9a7b4757 fcad4439
No related branches found
No related tags found
No related merge requests found
Pipeline #
...@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. ...@@ -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/) The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/). and this project adheres to [Semantic Versioning](http://semver.org/).
## Unreleased
## Added
- Add school building filter/dimension to school count route
## 1.3.2 - 2018-06-20 ## 1.3.2 - 2018-06-20
### Changed ### Changed
- Fixed math error in classroom count at total classroom needed expression - Fixed math error in classroom count at total classroom needed expression
......
...@@ -452,6 +452,16 @@ rqfCount.addField({ ...@@ -452,6 +452,16 @@ rqfCount.addField({
type: 'integer', type: 'integer',
field: 'ano_censo' field: 'ano_censo'
} }
}).addValue({
name: 'school_building',
table: 'escola',
tableField: 'local_func_predio_escolar',
resultField: 'school_building',
where: {
relation: '=',
type: 'boolean',
field: 'local_func_predio_escolar'
}
}); });
schoolApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { schoolApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
if(typeof req.filter === 'undefined' || Object.keys(req.filter).length === 0) { if(typeof req.filter === 'undefined' || Object.keys(req.filter).length === 0) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment