Commit 258a20ea authored by Vytor Calixto's avatar Vytor Calixto 👾

Merge branch 'release_v1.6.1'

parents 10ebae12 8c4aff29
Pipeline #17729 failed with stage
in 7 minutes and 38 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.6.1 - 2018-08-23
# Changed
- Fix return json name in transport route
## 1.6.0 - 2018-08-17
### Added
- Dimension state in route `enrollment` now returns state name and id
......
......@@ -352,7 +352,7 @@ transportApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
allEnrollmentTransport.field('COUNT(*)', 'total')
.field("'Brasil'", 'name')
.field('matricula.ano_censo', 'year')
.field('matricula.transporte_escolar_publico', 'use_transport_public_id')
.field('matricula.transporte_escolar_publico', 'use_transport_id')
.from('matricula')
.group('matricula.ano_censo')
.group('matricula.transporte_escolar_publico')
......@@ -470,9 +470,9 @@ transportApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
//modifica adicionando use_transport_id=false, com os mesmos valores
//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++) {
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_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])
}
......
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