From f5ab0f174be5794d3e5af417de9a6f1adbd4c192 Mon Sep 17 00:00:00 2001
From: Fernando Erd <fce15@inf.ufpr.br>
Date: Thu, 23 Aug 2018 11:23:59 -0300
Subject: [PATCH 1/2] Update Changelog
---
CHANGELOG.md | 4 ++++
src/libs/routes/transport.js | 6 +++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 794e49b1..04330ff6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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
diff --git a/src/libs/routes/transport.js b/src/libs/routes/transport.js
index 04062b1a..266b1400 100644
--- a/src/libs/routes/transport.js
+++ b/src/libs/routes/transport.js
@@ -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])
}
--
GitLab
From 8c4aff298e06dbbd7ba0b4873298eaecabc57740 Mon Sep 17 00:00:00 2001
From: Fernando Erd <fce15@inf.ufpr.br>
Date: Fri, 24 Aug 2018 09:58:50 -0300
Subject: [PATCH 2/2] Update Changelog
---
CHANGELOG.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04330ff6..4a5ddfd5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
## 1.6.1 - 2018-08-23
# Changed
- - Fix return json name in transport route
+- Fix return json name in transport route
## 1.6.0 - 2018-08-17
### Added
--
GitLab