From a6ccf741befefe1ea95c611eed35f9ded264b036 Mon Sep 17 00:00:00 2001 From: Vytor Calixto <vytorcalixto@gmail.com> Date: Mon, 9 Jul 2018 10:33:34 -0300 Subject: [PATCH] Add inside bathroom resulto to school infrastructure --- src/libs/routes/schoolInfrastructure.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/libs/routes/schoolInfrastructure.js b/src/libs/routes/schoolInfrastructure.js index 969fa987..532dba73 100644 --- a/src/libs/routes/schoolInfrastructure.js +++ b/src/libs/routes/schoolInfrastructure.js @@ -513,6 +513,17 @@ infrastructureApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { needBroadbandInternet.where('escola.internet_banda_larga = 0'); req.queryIndex.needBroadbandInternet = req.querySet.push(needBroadbandInternet) - 1; + // Sanitário dentro do prédio + req.queryIndex.allInsideBathroom = req.queryIndex.allSchools; + + let haveInsideBathroom = allSchools.clone(); + haveInsideBathroom.where('escola.sanitario_dentro_predio = 1'); + req.queryIndex.haveInsideBathroom = req.querySet.push(haveInsideBathroom) - 1; + + let needInsideBathroom = allSchools.clone(); + needInsideBathroom.where('escola.sanitario_dentro_predio = 0'); + req.queryIndex.needInsideBathroom = req.querySet.push(needInsideBathroom) - 1; + // Banheiro adequado para educação infantil dentro do prédio req.queryIndex.allInsideKidsBathroom = req.queryIndex.allKidsPark; @@ -601,6 +612,7 @@ infrastructureApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { let warehouse = matchQueries(req.result[req.queryIndex.allWarehouse], req.result[req.queryIndex.haveWarehouse], req.result[req.queryIndex.needWarehouse]); let internet = matchQueries(req.result[req.queryIndex.allInternet], req.result[req.queryIndex.haveInternet], req.result[req.queryIndex.needInternet]); let broadband_internet = matchQueries(req.result[req.queryIndex.allBroadbandInternet], req.result[req.queryIndex.haveBroadbandInternet], req.result[req.queryIndex.needBroadbandInternet]); + let inside_bathroom = matchQueries(req.result[req.queryIndex.allInsideBathroom], req.result[req.queryIndex.haveInsideBathroom], req.result[req.queryIndex.needInsideBathroom]); let inside_kids_bathroom = matchQueries(req.result[req.queryIndex.allInsideKidsBathroom], req.result[req.queryIndex.haveInsideKidsBathroom], req.result[req.queryIndex.needInsideKidsBathroom]); let water_supply = matchQueries(req.result[req.queryIndex.allWaterSupply], req.result[req.queryIndex.haveWaterSupply], req.result[req.queryIndex.needWaterSupply]); let filtered_water = matchQueries(req.result[req.queryIndex.allFilteredWater], req.result[req.queryIndex.haveFilteredWater], req.result[req.queryIndex.needFilteredWater]); @@ -627,6 +639,7 @@ infrastructureApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { warehouse, internet, broadband_internet, + inside_bathroom, inside_kids_bathroom, water_supply, filtered_water, -- GitLab