From 141f6ea31c12cce256a5052bc961ed3118ab0281 Mon Sep 17 00:00:00 2001
From: Vytor Calixto <vytorcalixto@gmail.com>
Date: Mon, 25 Sep 2017 11:56:20 -0300
Subject: [PATCH] Change school dim and filter in classroom route
---
src/libs/routes/classroom.js | 27 ++++++++++++++++++++++++---
1 file changed, 24 insertions(+), 3 deletions(-)
diff --git a/src/libs/routes/classroom.js b/src/libs/routes/classroom.js
index b751ddd7..1d1ad4ad 100644
--- a/src/libs/routes/classroom.js
+++ b/src/libs/routes/classroom.js
@@ -75,16 +75,37 @@ rqf.addField({
name: 'dims',
field: true,
where: false
-}).addValue({
+}).addValueToField({
name: 'school',
table: 'escola',
- tableField: 'id',
+ tableField: ['nome_escola', 'id'],
+ resultField: ['school_name', 'school_id'],
where: {
relation: '=',
type: 'integer',
field: 'id'
+ },
+ join: {
+ primary: ['id', 'ano_censo'],
+ foreign: ['escola_id', 'ano_censo'],
+ foreignTable: 'matricula'
}
-}).addValueToField({
+}, 'dims').addValueToField({
+ name: 'school',
+ table: 'escola',
+ tableField: 'nome_escola',
+ resultField: 'school_name',
+ where: {
+ relation: '=',
+ type: 'integer',
+ field: 'id'
+ },
+ join: {
+ primary: ['id', 'ano_censo'],
+ foreign: ['escola_id', 'ano_censo'],
+ foreignTable: 'matricula'
+ }
+}, 'filter').addValueToField({
name: 'city',
table: 'municipio',
tableField: ['nome', 'id'],
--
GitLab