diff --git a/src/libs/routes/dailyChargeAmount.js b/src/libs/routes/dailyChargeAmount.js index 1514b4413d3d7aa96e77d96f7b347ec73f138c56..2bf1f513ab9b006eb14a2c76bdc9c7a53cc3fa43 100644 --- a/src/libs/routes/dailyChargeAmount.js +++ b/src/libs/routes/dailyChargeAmount.js @@ -124,6 +124,30 @@ dailyChargeAmountApp.get('/average/education_level_mod', (req, res, next) => { next(); }, response('education_level_mod')); +dailyChargeAmountApp.get('/period', (req, res, next) => { + req.result = []; + for(let i = 1; i <= 3; ++i) { + req.result.push({ + id: i, + name: id2str.period(i) + }); + }; + req.result.push({ + id: 99, + name: id2str.period(99) + }); + next(); +}, response('period')); + +dailyChargeAmountApp.get('/integral_time', (req, res, next) => { + req.result = [ + {id: null, name: 'Não DisponÃvel'}, + {id: 0, name: 'Não'}, + {id: 1, name: 'Sim'} + ]; + next(); +}, response('integral_time')); + rqf.addField({ name: 'filter', field: false, @@ -380,7 +404,7 @@ dailyChargeAmountApp.get('/average', rqf.parse(), rqf.build(), (req, res, next) req.sql.from('turma') .field('turma.ano_censo', 'year') .field('turma.etapas_mod_ensino_segmento_id', 'education_level_mod_id') - .field('AVG(turma.duracao_turma)/60.0', 'average_class_duration') + .field('AVG(turma.duracao_turma)/60.0', 'total') .group('turma.ano_censo') .group('turma.etapas_mod_ensino_segmento_id') .order('turma.ano_censo')