Skip to content
Snippets Groups Projects
Commit 17ea666b authored by Vytor Calixto's avatar Vytor Calixto :space_invader:
Browse files

Add period to enrollment

parent 1a4af79b
No related branches found
No related tags found
2 merge requests!116Release v1.0.0,!34Db simcaq dev2
Pipeline #
...@@ -68,16 +68,18 @@ enrollmentApp.get('/gender', (req, res, next) => { ...@@ -68,16 +68,18 @@ enrollmentApp.get('/gender', (req, res, next) => {
// Return ethnic group // Return ethnic group
enrollmentApp.get('/ethnic_group', (req, res, next) => { enrollmentApp.get('/ethnic_group', (req, res, next) => {
req.result = [ req.sql.from('cor_raca')
{id: 0, name: 'Não declarada'}, .field('id')
{id: 1, name: 'Branca'}, .field('nome', 'name');
{id: 2, name: 'Preta'},
{id: 3, name: 'Parda'},
{id: 4, name: 'Amarela'},
{id: 5, name: 'Indígena'}
];
next(); 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({ rqf.addField({
name: 'filter', name: 'filter',
...@@ -247,6 +249,21 @@ rqf.addField({ ...@@ -247,6 +249,21 @@ rqf.addField({
type: 'integer', type: 'integer',
field: 'ethnic_group_id' 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) => { enrollmentApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment