From 6193ff71591408d650551d1db1680a52969829c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leon=20A=2E=20Okida=20Gon=C3=A7alves?= <laog19@inf.ufpr.br>
Date: Mon, 27 Mar 2023 11:10:07 -0300
Subject: [PATCH] Fix issue with private_adm_dependency
---
src/libs/routes_v2/simcaqFirstReport.js | 1 -
src/libs/routes_v2/simcaqSecondReport.js | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/libs/routes_v2/simcaqFirstReport.js b/src/libs/routes_v2/simcaqFirstReport.js
index c4c4b978..db300da5 100644
--- a/src/libs/routes_v2/simcaqFirstReport.js
+++ b/src/libs/routes_v2/simcaqFirstReport.js
@@ -127,7 +127,6 @@ simcaqFirstReportApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
.field('simcaq_relatorio_1.localizacao_id', 'location')
.field('SUM(simcaq_relatorio_1.num_matriculas)', 'num_enrollments')
.field('SUM(simcaq_relatorio_1.num_escolas)', 'num_schools')
- .where('situacao_funcionamento_pareada = 1 AND (ensino_regular = 1 OR ensino_eja = 1 OR educacao_profissional = 1)')
.group('simcaq_relatorio_1.etapa')
.group('simcaq_relatorio_1.turno')
.group('simcaq_relatorio_1.localizacao_id');
diff --git a/src/libs/routes_v2/simcaqSecondReport.js b/src/libs/routes_v2/simcaqSecondReport.js
index 51907e33..6babe383 100644
--- a/src/libs/routes_v2/simcaqSecondReport.js
+++ b/src/libs/routes_v2/simcaqSecondReport.js
@@ -102,8 +102,7 @@ simcaqSecondReportApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
.field('sum(num_escolas_rural)' ,'num_schools_rural')
.field('sum(num_escolas_urbana)' ,'num_schools_urban')
.field('dependencia_adm_priv', 'private_adm_dependency')
- .where('situacao_funcionamento_pareada = 1 AND (ensino_regular = 1 OR ensino_eja = 1 OR educacao_profissional = 1)')
- .group('dependencia_adm_priv')
+ .group('dependencia_adm_priv');
next();
}, query, response('simcaqSecondReport'));
--
GitLab