Skip to content
Snippets Groups Projects
Commit a6ccf741 authored by Vytor Calixto's avatar Vytor Calixto :space_invader:
Browse files

Add inside bathroom resulto to school infrastructure

parent b7011cd9
No related branches found
No related tags found
2 merge requests!145v1.6.0,!138Alteração do indicador de infraestrutura (issue simcaq/SCRUM#421)
Pipeline #16567 canceled
...@@ -513,6 +513,17 @@ infrastructureApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { ...@@ -513,6 +513,17 @@ infrastructureApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
needBroadbandInternet.where('escola.internet_banda_larga = 0'); needBroadbandInternet.where('escola.internet_banda_larga = 0');
req.queryIndex.needBroadbandInternet = req.querySet.push(needBroadbandInternet) - 1; 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 // Banheiro adequado para educação infantil dentro do prédio
req.queryIndex.allInsideKidsBathroom = req.queryIndex.allKidsPark; req.queryIndex.allInsideKidsBathroom = req.queryIndex.allKidsPark;
...@@ -601,6 +612,7 @@ infrastructureApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { ...@@ -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 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 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 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 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 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]); 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) => { ...@@ -627,6 +639,7 @@ infrastructureApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
warehouse, warehouse,
internet, internet,
broadband_internet, broadband_internet,
inside_bathroom,
inside_kids_bathroom, inside_kids_bathroom,
water_supply, water_supply,
filtered_water, filtered_water,
......
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