Skip to content
Snippets Groups Projects
Commit e5708266 authored by Fernando Erd's avatar Fernando Erd :ok_hand:
Browse files

Fix var name

parent 14ae3764
No related branches found
No related tags found
1 merge request!133Release v1.4.0
Pipeline #16250 failed
...@@ -26,6 +26,7 @@ const fifthHouseholdIncome = require(`${libs}/convert/fifthHouseholdIncome`); ...@@ -26,6 +26,7 @@ const fifthHouseholdIncome = require(`${libs}/convert/fifthHouseholdIncome`);
const extremesHouseholdIncome = require(`${libs}/convert/extremesHouseholdIncome`); const extremesHouseholdIncome = require(`${libs}/convert/extremesHouseholdIncome`);
const educationLevelBasic = require(`${libs}/convert/educationLevelBasic`); const educationLevelBasic = require(`${libs}/convert/educationLevelBasic`);
const useTransport = require(`${libs}/convert/booleanVariable`); const useTransport = require(`${libs}/convert/booleanVariable`);
const useTransportPublic = require(`${libs}/convert/booleanVariable`);
const transportationManager = require(`${libs}/convert/transportationManager`); const transportationManager = require(`${libs}/convert/transportationManager`);
const ids = { const ids = {
...@@ -65,6 +66,7 @@ const ids = { ...@@ -65,6 +66,7 @@ const ids = {
fifth_household_income_id: fifthHouseholdIncome, fifth_household_income_id: fifthHouseholdIncome,
extremes_household_income_id: extremesHouseholdIncome, extremes_household_income_id: extremesHouseholdIncome,
use_transport_id: useTransport, use_transport_id: useTransport,
use_transport_public_id: useTransportPublic,
transportation_manager_id: transportationManager transportation_manager_id: transportationManager
}; };
......
...@@ -310,7 +310,7 @@ transportApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { ...@@ -310,7 +310,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_id') .field('matricula.transporte_escolar_publico', 'use_transport_public_id')
.from('matricula') .from('matricula')
.group('matricula.ano_censo') .group('matricula.ano_censo')
.group('matricula.transporte_escolar_publico') .group('matricula.transporte_escolar_publico')
...@@ -429,9 +429,9 @@ transportApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { ...@@ -429,9 +429,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_id = true; all_enrollment_match_0[i].use_transport_public_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_id = false; all_enrollment_match_1[i].use_transport_public_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