diff --git a/src/libs/routes/enrollment.js b/src/libs/routes/enrollment.js index 437c58d39199b030b132f86310fb5528535e03b5..6f5a623c199bab2fbc9da36eaf0e07556337f67c 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',