From 17ea666b4516c3215fc472499985094004807d18 Mon Sep 17 00:00:00 2001
From: Vytor Calixto <vytorcalixto@gmail.com>
Date: Tue, 21 Mar 2017 09:41:35 -0300
Subject: [PATCH] Add period to enrollment
---
src/libs/routes/enrollment.js | 35 ++++++++++++++++++++++++++---------
1 file changed, 26 insertions(+), 9 deletions(-)
diff --git a/src/libs/routes/enrollment.js b/src/libs/routes/enrollment.js
index af0904ab..0782b8bb 100644
--- a/src/libs/routes/enrollment.js
+++ b/src/libs/routes/enrollment.js
@@ -68,16 +68,18 @@ enrollmentApp.get('/gender', (req, res, next) => {
// Return ethnic group
enrollmentApp.get('/ethnic_group', (req, res, next) => {
- req.result = [
- {id: 0, name: 'Não declarada'},
- {id: 1, name: 'Branca'},
- {id: 2, name: 'Preta'},
- {id: 3, name: 'Parda'},
- {id: 4, name: 'Amarela'},
- {id: 5, name: 'IndÃgena'}
- ];
+ req.sql.from('cor_raca')
+ .field('id')
+ .field('nome', 'name');
next();
-}, response('ethnic_group'));
+}, query, response('ethnic_group'));
+
+enrollmentApp.get('/period', (req, res, next) => {
+ req.sql.from('turma_turno')
+ .field('id')
+ .field('nome', 'name');
+ next();
+}, query, response('period'));
rqf.addField({
name: 'filter',
@@ -247,6 +249,21 @@ rqf.addField({
type: 'integer',
field: 'ethnic_group_id'
}
+}).addValue({
+ name: 'period',
+ table: 'turma',
+ tableField: 'turno',
+ resultField: 'period_id',
+ where: {
+ relation: '=',
+ type: 'integer',
+ field: 'turno'
+ },
+ join: {
+ primary: 'id',
+ foreign: 'turma_id',
+ foreignTable: 'matricula'
+ }
});
enrollmentApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
--
GitLab