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

Merge branch 'release_v1.6.1'

Merges !151
parents 10ebae12 8c4aff29
No related branches found
No related tags found
No related merge requests found
Pipeline #17720 failed
...@@ -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.6.1 - 2018-08-23
# Changed
- Fix return json name in transport route
## 1.6.0 - 2018-08-17 ## 1.6.0 - 2018-08-17
### Added ### Added
- Dimension state in route `enrollment` now returns state name and id - Dimension state in route `enrollment` now returns state name and id
......
...@@ -352,7 +352,7 @@ transportApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { ...@@ -352,7 +352,7 @@ transportApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
allEnrollmentTransport.field('COUNT(*)', 'total') allEnrollmentTransport.field('COUNT(*)', 'total')
.field("'Brasil'", 'name') .field("'Brasil'", 'name')
.field('matricula.ano_censo', 'year') .field('matricula.ano_censo', 'year')
.field('matricula.transporte_escolar_publico', 'use_transport_public_id') .field('matricula.transporte_escolar_publico', 'use_transport_id')
.from('matricula') .from('matricula')
.group('matricula.ano_censo') .group('matricula.ano_censo')
.group('matricula.transporte_escolar_publico') .group('matricula.transporte_escolar_publico')
...@@ -470,9 +470,9 @@ transportApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { ...@@ -470,9 +470,9 @@ transportApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
//modifica adicionando use_transport_id=false, com os mesmos valores //modifica adicionando use_transport_id=false, com os mesmos valores
//do transport_id=true, usado para dar o match e fazer a divisão. //do transport_id=true, usado para dar o match e fazer a divisão.
for (let i = 0; i < all_enrollment_match_0.length; i++) { for (let i = 0; i < all_enrollment_match_0.length; i++) {
all_enrollment_match_0[i].use_transport_public_id = true; all_enrollment_match_0[i].use_transport_id = true;
all_enrollment_match.push(all_enrollment_match_0[i]) all_enrollment_match.push(all_enrollment_match_0[i])
all_enrollment_match_1[i].use_transport_public_id = false; all_enrollment_match_1[i].use_transport_id = false;
all_enrollment_match.push(all_enrollment_match_1[i]) all_enrollment_match.push(all_enrollment_match_1[i])
} }
......
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