From 892a5cf7fe45e16ef941d8ab7e3a00bb2167f8cf Mon Sep 17 00:00:00 2001
From: ems19 <ems19@inf.ufpr.br>
Date: Tue, 23 Jul 2024 19:09:58 -0300
Subject: [PATCH] adds year filter
---
src/libs/routes_v1/enrollmentAggregate.js | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/src/libs/routes_v1/enrollmentAggregate.js b/src/libs/routes_v1/enrollmentAggregate.js
index 27a8e0fe..78cfe4e6 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'));
--
GitLab