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

Change courtyard variable in school infrastructure

Related: simcaq/SCRUM#440
parent 2f120874
No related branches found
No related tags found
1 merge request!155Release v1.7.0
...@@ -425,16 +425,16 @@ infrastructureApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { ...@@ -425,16 +425,16 @@ infrastructureApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
req.queryIndex.allCourtyard = req.queryIndex.allSchools; req.queryIndex.allCourtyard = req.queryIndex.allSchools;
let haveCourtyard = allSchools.clone(); let haveCourtyard = allSchools.clone();
haveCourtyard.where('escola.patio_coberto = 1 OR escola.patio_descoberto = 1'); haveCourtyard.where('escola.patio = 2 OR escola.patio = 1');
req.queryIndex.haveCourtyard = req.querySet.push(haveCourtyard) - 1; req.queryIndex.haveCourtyard = req.querySet.push(haveCourtyard) - 1;
let needCourtyard = allSchools.clone(); let needCourtyard = allSchools.clone();
needCourtyard.where('escola.patio_descoberto = 0 AND escola.patio_descoberto = 0'); needCourtyard.where('escola.patio = 1');
req.queryIndex.needCourtyard = req.querySet.push(needCourtyard) - 1; req.queryIndex.needCourtyard = req.querySet.push(needCourtyard) - 1;
// Cobertura do Pátio // Cobertura do Pátio
let allCourtyardCoverage = allSchools.clone(); let allCourtyardCoverage = allSchools.clone();
allCourtyardCoverage.where('escola.patio_coberto=0 AND escola.patio_descoberto = 1'); allCourtyardCoverage.where('escola.patio = 1');
req.queryIndex.allCourtyardCoverage = req.querySet.push(allCourtyardCoverage) - 1; req.queryIndex.allCourtyardCoverage = req.querySet.push(allCourtyardCoverage) - 1;
req.queryIndex.haveCourtyardCoverage = req.queryIndex.allCourtyardCoverage; req.queryIndex.haveCourtyardCoverage = req.queryIndex.allCourtyardCoverage;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment