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

Merge branch 'issue/440' into development

Closes simcaq/SCRUM#440
parents 8151d10b 4e27f333
No related branches found
No related tags found
1 merge request!155Release v1.7.0
Pipeline #17514 failed
......@@ -425,16 +425,16 @@ infrastructureApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
req.queryIndex.allCourtyard = req.queryIndex.allSchools;
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;
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;
// Cobertura do Pátio
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.haveCourtyardCoverage = req.queryIndex.allCourtyardCoverage;
......
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