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

Merge branch 'hotfix_v1.4.1'

parents 568d4c3f 02184889
No related branches found
No related tags found
No related merge requests found
Pipeline #16763 canceled
...@@ -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/).
## 1.4.1 - 2018-07-03
### Changed
- Fix duplicate in transport indicator
## 1.4.0 - 2018-06-27 ## 1.4.0 - 2018-06-27
### Added ### Added
- Add school building filter/dimension to school count route - Add school building filter/dimension to school count route
......
...@@ -348,17 +348,6 @@ transportApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { ...@@ -348,17 +348,6 @@ transportApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
.where('matricula.tipo <= 3'); .where('matricula.tipo <= 3');
req.queryIndex.allEnrollment = req.querySet.push(allEnrollment) - 1; req.queryIndex.allEnrollment = req.querySet.push(allEnrollment) - 1;
let allEnrollmentTransport = req.sql.clone()
allEnrollmentTransport.field('COUNT(*)', 'total')
.field("'Brasil'", 'name')
.field('matricula.ano_censo', 'year')
.field('matricula.transporte_escolar_publico', 'use_transport_id')
.from('matricula')
.group('matricula.ano_censo')
.order('matricula.ano_censo')
.where('matricula.tipo <= 3');
req.queryIndex.allEnrollmentTransport = req.querySet.push(allEnrollmentTransport) - 1;
let allEnrollmentTransport = req.sql.clone() let allEnrollmentTransport = req.sql.clone()
allEnrollmentTransport.field('COUNT(*)', 'total') allEnrollmentTransport.field('COUNT(*)', 'total')
.field("'Brasil'", 'name') .field("'Brasil'", 'name')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment