Skip to content
Snippets Groups Projects
Commit e7cf68d4 authored by Fernando Erd's avatar Fernando Erd :ok_hand:
Browse files

Merge branch 'Fix_Class' into 'development'

Add filter integral time in class.js

See merge request !41
parents 6eb9b4bd 8ad7013f
No related branches found
No related tags found
2 merge requests!116Release v1.0.0,!41Add filter integral time in class.js
Pipeline #
...@@ -58,6 +58,15 @@ classApp.get('/period', (req, res, next) => { ...@@ -58,6 +58,15 @@ classApp.get('/period', (req, res, next) => {
next(); next();
}, query, response('period')); }, query, response('period'));
// Returns integral-time avaible
classApp.get('/integral_time', (req, res, next) => {
req.result = [
{id: 0, name: 'Não'},
{id: 1, name: 'Sim'}
];
next();
}, response('integral_time'));
// Returns all educational levels avaible // Returns all educational levels avaible
classApp.get('/education_level', (req, res, next) => { classApp.get('/education_level', (req, res, next) => {
req.sql.from('etapas_mod_ensino_segmento') req.sql.from('etapas_mod_ensino_segmento')
...@@ -191,6 +200,16 @@ rqfCount.addField({ ...@@ -191,6 +200,16 @@ rqfCount.addField({
type: 'integer', type: 'integer',
field: 'turma_turno_id' field: 'turma_turno_id'
} }
}).addValue({
name:'integral_time',
table: 'turma',
tableField: 'tempo_integral',
resultField: 'integral_time_name',
where: {
relation: '=',
type: 'boolean',
field: 'tempo_integral'
}
}).addValue({ }).addValue({
name: 'school', name: 'school',
table: 'escola', table: 'escola',
......
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