From 53c76d68dbb1966c2c5af3181e42dc493bc682bc Mon Sep 17 00:00:00 2001
From: hi15 <hi15@inf.ufpr.br>
Date: Wed, 3 May 2017 11:45:44 -0300
Subject: [PATCH] Added last filter of
biblioteca/sala_leitura/biblioteca_sala_leitura
---
src/libs/routes/school.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/libs/routes/school.js b/src/libs/routes/school.js
index 05288f19..3401b1d1 100644
--- a/src/libs/routes/school.js
+++ b/src/libs/routes/school.js
@@ -488,18 +488,18 @@ rqfCount.addField({
field: 'local_func_predio_escolar'
}
}).addValue({
- name: 'library_and_reading_room',
+ name: 'library_or_reading_room',
table: 'escola',
tableField: ['biblioteca', 'sala_leitura', 'biblioteca_sala_leitura'],
- resultField: 'library_and_reading_room',
+ resultField: 'library_or_reading_room',
where: {
relation: '=',
type: 'boolean',
condition: 'or',
- field: 'local_func_predio_escolar'
+ field: ['biblioteca', 'sala_leitura', 'biblioteca_sala_leitura']
}
});
-
+// SELECT COUNT(escola.id) AS "total", 'Brasil' AS "name", escola.ano_censo AS "year" FROM escola WHERE (escola.biblioteca = ? OR escola.sala_leitura = ? OR escola.biblioteca_sala_leitura) AND (escola.situacao_de_funcionamento = 1 AND escola.ensino_regular = 1) GROUP BY escola.ano_censo ORDER BY escola.ano_censo ASC
schoolApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
console.log(req.filter);
if(typeof req.filter === 'undefined' || Object.keys(req.filter).length === 0) {
--
GitLab