From 61110fe1464fbcd0c10701c5ca7176e95e0580e5 Mon Sep 17 00:00:00 2001
From: hi15 <hi15@inf.ufpr.br>
Date: Wed, 19 Apr 2017 10:04:13 -0300
Subject: [PATCH] Added filters of informatics_lab,
science_lab,special_attendence_room and indor_sports_court
---
src/libs/routes/school.js | 44 +++++++++++++++++++++++++++++++++++++--
1 file changed, 42 insertions(+), 2 deletions(-)
diff --git a/src/libs/routes/school.js b/src/libs/routes/school.js
index 01b4a9fe..c0610bcf 100644
--- a/src/libs/routes/school.js
+++ b/src/libs/routes/school.js
@@ -188,18 +188,58 @@ rqfCount.addField({
type: 'boolean',
field: 'cozinha'
}
-// tem problemas
}).addValue({
name: 'government_agreement',
table: 'escola',
tableField: 'conveniada_pp',
- resultField: 'conveniada_poder_publico',
+ resultField: 'government_agreement_name',
where: {
relation: '=',
type: 'boolean',
field: 'conveniada_pp'
}
+}).addValue({
+ name: 'informatics_lab',
+ table: 'escola',
+ tableField: 'lab_informatica',
+ resultField: 'informatics_lab_name',
+ where: {
+ relation: '=',
+ type: 'boolean',
+ field: 'lab_informatica'
+ }
+}).addValue({
+ name: 'science_lab',
+ table: 'escola',
+ tableField: 'lab_ciencias',
+ resultField: 'informatics_lab_name',
+ where: {
+ relation: '=',
+ type: 'boolean',
+ field: 'lab_ciencias'
+ }
+}).addValue({
+ name: 'special_attendence_room',
+ table: 'escola',
+ tableField: 'sala_atendimento_especial',
+ resultField: 'special_attendence_room_name',
+ where: {
+ relation: '=',
+ type: 'boolean',
+ field: 'sala_atendimento_especial'
+ }
+}).addValue({
+ name: 'indor_sports_court',
+ table: 'escola',
+ tableField: 'quadra_esportes_coberta',
+ resultField: 'indor_sports_court_name',
+ where: {
+ relation: '=',
+ type: 'boolean',
+ field: 'quadra_esportes_coberta'
+ }
});
+
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