From 8aa5528f2df2b81afba004e1d73fbeaf7babc737 Mon Sep 17 00:00:00 2001
From: Vytor Calixto <vytorcalixto@gmail.com>
Date: Fri, 17 Mar 2017 10:12:03 -0300
Subject: [PATCH] Add adm_dependency_detailed to enrollment route
---
src/libs/routes/enrollment.js | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/src/libs/routes/enrollment.js b/src/libs/routes/enrollment.js
index 437c58d3..6f5a623c 100644
--- a/src/libs/routes/enrollment.js
+++ b/src/libs/routes/enrollment.js
@@ -43,11 +43,19 @@ enrollmentApp.get('/education_level', (req, res, next) => {
// Returns all adm dependencies
enrollmentApp.get('/adm_dependency', (req, res, next) => {
+ req.sql.from('dependencia_adm')
+ .field('id')
+ .field('nome', 'name')
+ .where('id <= 4');
+ next();
+}, query, response('adm_dependency'));
+
+enrollmentApp.get('/adm_dependency_detailed', (req, res, next) => {
req.sql.from('dependencia_adm')
.field('id', 'id')
.field('nome', 'name');
next();
-}, query, response('adm_dependency'));
+}, query, response('adm_dependency_detailed'));
// Return genders
enrollmentApp.get('/gender', (req, res, next) => {
@@ -94,6 +102,21 @@ rqf.addField({
foreign: 'dependencia_adm_id',
foreignTable: 'matricula'
}
+}).addValue({
+ name: 'adm_dependency_detailed',
+ table: 'dependencia_adm',
+ tableField: 'nome',
+ resultField: 'adm_dependency_detailed_name',
+ where: {
+ relation: '=',
+ type: 'integer',
+ field: 'id'
+ },
+ join: {
+ primary: 'id',
+ foreign: 'dependencia_adm_priv',
+ foreignTable: 'matricula'
+ }
}).addValue({
name: 'education_level',
table: 'serie_ano',
--
GitLab