From e57082665eb0b84c6a986ae678de38d1ebe76fac Mon Sep 17 00:00:00 2001 From: Fernando Erd <fce15@inf.ufpr.br> Date: Thu, 28 Jun 2018 10:05:20 -0300 Subject: [PATCH] Fix var name --- src/libs/middlewares/id2str.js | 2 ++ src/libs/routes/transport.js | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/libs/middlewares/id2str.js b/src/libs/middlewares/id2str.js index d8c4ce70..c2fa1fab 100644 --- a/src/libs/middlewares/id2str.js +++ b/src/libs/middlewares/id2str.js @@ -26,6 +26,7 @@ const fifthHouseholdIncome = require(`${libs}/convert/fifthHouseholdIncome`); const extremesHouseholdIncome = require(`${libs}/convert/extremesHouseholdIncome`); const educationLevelBasic = require(`${libs}/convert/educationLevelBasic`); const useTransport = require(`${libs}/convert/booleanVariable`); +const useTransportPublic = require(`${libs}/convert/booleanVariable`); const transportationManager = require(`${libs}/convert/transportationManager`); const ids = { @@ -65,6 +66,7 @@ const ids = { fifth_household_income_id: fifthHouseholdIncome, extremes_household_income_id: extremesHouseholdIncome, use_transport_id: useTransport, + use_transport_public_id: useTransportPublic, transportation_manager_id: transportationManager }; diff --git a/src/libs/routes/transport.js b/src/libs/routes/transport.js index 7af1b990..7adfc80e 100644 --- a/src/libs/routes/transport.js +++ b/src/libs/routes/transport.js @@ -310,7 +310,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_id') + .field('matricula.transporte_escolar_publico', 'use_transport_public_id') .from('matricula') .group('matricula.ano_censo') .group('matricula.transporte_escolar_publico') @@ -429,9 +429,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_id = true; + all_enrollment_match_0[i].use_transport_public_id = true; all_enrollment_match.push(all_enrollment_match_0[i]) - all_enrollment_match_1[i].use_transport_id = false; + all_enrollment_match_1[i].use_transport_public_id = false; all_enrollment_match.push(all_enrollment_match_1[i]) } -- GitLab