diff --git a/src/libs/routes/transport.js b/src/libs/routes/transport.js index 266b1400abedce27f9529903cee9c7611e98fd89..449895d0c5ea618daf6114f7cf105de67ee3456e 100644 --- a/src/libs/routes/transport.js +++ b/src/libs/routes/transport.js @@ -373,14 +373,14 @@ transportApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { // Vans e Kombi let goVansAndKombi = allTransports.clone(); goVansAndKombi.field('matricula.transporte_vans_kombi','use_transport_id') - goVansAndKombi.where('matricula.transporte_vans_kombi = 1 OR matricula.transporte_vans_kombi = 0'); + goVansAndKombi.where('matricula.transporte_vans_kombi = 1'); goVansAndKombi.group('matricula.transporte_vans_kombi'); req.queryIndex.goVansAndKombi = req.querySet.push(goVansAndKombi) - 1; // Micro let goMicroBus = allTransports.clone(); goMicroBus.field('matricula.transporte_micro_onibus', 'use_transport_id') - goMicroBus.where('matricula.transporte_micro_onibus = 1 OR matricula.transporte_micro_onibus = 0'); + goMicroBus.where('matricula.transporte_micro_onibus = 1'); goMicroBus.group('matricula.transporte_micro_onibus'); req.queryIndex.goMicroBus = req.querySet.push(goMicroBus) - 1; @@ -388,63 +388,63 @@ transportApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { // Ônibus let goBus = allTransports.clone(); goBus.field("matricula.transporte_onibus", 'use_transport_id') - goBus.where('matricula.transporte_onibus = 1 OR matricula.transporte_onibus = 0'); + goBus.where('matricula.transporte_onibus = 1'); goBus.group('matricula.transporte_onibus') req.queryIndex.goBus = req.querySet.push(goBus) - 1; // Bicicleta let goBikes = allTransports.clone(); goBikes.field('matricula.transporte_bicicleta', 'use_transport_id') - goBikes.where('matricula.transporte_bicicleta = 1 OR matricula.transporte_bicicleta = 0'); + goBikes.where('matricula.transporte_bicicleta = 1'); goBikes.group('matricula.transporte_bicicleta') req.queryIndex.goBikes = req.querySet.push(goBikes) - 1; // Tração Animal let goAnimalTraction = allTransports.clone(); goAnimalTraction.field('matricula.transporte_animal', 'use_transport_id') - goAnimalTraction.where('matricula.transporte_animal = 1 OR matricula.transporte_animal = 0'); + goAnimalTraction.where('matricula.transporte_animal = 1'); goAnimalTraction.group('matricula.transporte_animal') req.queryIndex.goAnimalTraction = req.querySet.push(goAnimalTraction) - 1; // Outro VeÃculo let goOtherVehicle = allTransports.clone(); goOtherVehicle.field('matricula.transporte_outro', 'use_transport_id') - goOtherVehicle.where('matricula.transporte_outro = 1 OR matricula.transporte_outro = 0'); + goOtherVehicle.where('matricula.transporte_outro = 1'); goOtherVehicle.group('matricula.transporte_outro') req.queryIndex.goOtherVehicle = req.querySet.push(goOtherVehicle) - 1; // Aquaviário/ Embarcação (capacidade até 5 alunos) let goWaterway_5_Students = allTransports.clone(); goWaterway_5_Students.field('matricula.transporte_embar_0_5','use_transport_id') - goWaterway_5_Students.where('matricula.transporte_embar_0_5 = 1 OR matricula.transporte_embar_0_5 = 0'); + goWaterway_5_Students.where('matricula.transporte_embar_0_5 = 1'); goWaterway_5_Students.group('matricula.transporte_embar_0_5') req.queryIndex.goWaterway_5_Students = req.querySet.push(goWaterway_5_Students) - 1; // Aquaviário/ Embarcação (capacidade de 5 até 15 alunos) let goWaterway_15_Students = allTransports.clone(); goWaterway_15_Students.field('matricula.transporte_embar_5_15', 'use_transport_id') - goWaterway_15_Students.where('matricula.transporte_embar_5_15 = 1 OR matricula.transporte_embar_5_15 = 0'); + goWaterway_15_Students.where('matricula.transporte_embar_5_15 = 1'); goWaterway_15_Students.group('matricula.transporte_embar_5_15') req.queryIndex.goWaterway_15_Students = req.querySet.push(goWaterway_15_Students) - 1; // Aquaviário/ Embarcação (capacidade de 15 até 35 alunos)r let goWaterway_35_Students = allTransports.clone(); goWaterway_35_Students.field('matricula.transporte_embar_15_35', 'use_transport_id') - goWaterway_35_Students.where('matricula.transporte_embar_15_35 = 1 OR matricula.transporte_embar_15_35 = 0'); + goWaterway_35_Students.where('matricula.transporte_embar_15_35 = 1'); goWaterway_35_Students.group('matricula.transporte_embar_15_35') req.queryIndex.goWaterway_35_Students = req.querySet.push(goWaterway_35_Students) - 1; // Aquaviário/ Embarcação (capacidade mais 35 alunos) let goWaterwayMoreThan_35 = allTransports.clone(); goWaterwayMoreThan_35.field('matricula.transporte_embar_35', 'use_transport_id') - goWaterwayMoreThan_35.where('matricula.transporte_embar_35 = 1 OR matricula.transporte_embar_35 = 0'); + goWaterwayMoreThan_35.where('matricula.transporte_embar_35 = 1'); goWaterwayMoreThan_35.group('matricula.transporte_embar_35') req.queryIndex.goWaterwayMoreThan_35 = req.querySet.push(goWaterwayMoreThan_35) - 1; // Trêm / Metrô let goSubwayAndTrain = allTransports.clone(); goSubwayAndTrain.field('matricula.transporte_trem_metro', 'use_transport_id') - goSubwayAndTrain.where('matricula.transporte_trem_metro = 1 OR matricula.transporte_trem_metro = 0'); + goSubwayAndTrain.where('matricula.transporte_trem_metro = 1'); goSubwayAndTrain.group('matricula.transporte_trem_metro') req.queryIndex.goSubwayAndTrain = req.querySet.push(goSubwayAndTrain) - 1; @@ -463,8 +463,8 @@ transportApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { for (let i = 0; i < transport_match_0.length; i++) { transport_match_0[i].use_transport_id = true; transport_match.push(transport_match_0[i]) - transport_match_1[i].use_transport_id = false; - transport_match.push(transport_match_1[i]) + // transport_match_1[i].use_transport_id = false; + // transport_match.push(transport_match_1[i]) } //modifica adicionando use_transport_id=false, com os mesmos valores @@ -472,8 +472,8 @@ transportApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { for (let i = 0; i < all_enrollment_match_0.length; i++) { 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_id = false; - all_enrollment_match.push(all_enrollment_match_1[i]) + // all_enrollment_match_1[i].use_transport_id = false; + // all_enrollment_match.push(all_enrollment_match_1[i]) } let public_transport = matchQueries(all_enrollment_match, req.result[req.queryIndex.allEnrollmentTransport]);