diff --git a/src/libs/routes_v1/enrollmentAggregate.js b/src/libs/routes_v1/enrollmentAggregate.js index 27a8e0fed16e300b2a15c83a280f21155fcafeff..78cfe4e66e658c347b23ce7e117122eab80811b9 100644 --- a/src/libs/routes_v1/enrollmentAggregate.js +++ b/src/libs/routes_v1/enrollmentAggregate.js @@ -142,6 +142,26 @@ rqf.addField({ foreign: 'municipio_id', foreignTable: 'escola' } +}).addValue({ + name: 'min_year', + table: 'escola', + tableField: 'ano_censo', + resultField: 'year', + where: { + relation: '>=', + type: 'integer', + field: 'ano_censo', + }, +}).addValue({ + name: 'max_year', + table: 'escola', + tableField: 'ano_censo', + resultField: 'year', + where: { + relation: '<=', + type: 'integer', + field: 'ano_censo', + }, }).addValueToField({ name: 'state', table: 'estado', @@ -273,6 +293,9 @@ rqf.addField({ enrollmentAggregateApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { req.sql.from('escola') .field('SUM(escola.qt_mat_bas)', 'total') + .field('escola.ano_censo', 'year') + .group('escola.ano_censo') + .order('escola.ano_censo'); next(); }, query, response('enrollment_aggregate'));