From a83e8d53381cad938c1780a76d39b333e05a75b6 Mon Sep 17 00:00:00 2001
From: ns17 <ns17@inf.ufpr.br>
Date: Wed, 14 Oct 2020 10:01:11 -0300
Subject: [PATCH] fixing indigenous routes
---
src/libs/routes/SMPPIR/indigenas_enrollment.js | 2 +-
src/libs/routes/SMPPIR/indigenas_schools.js | 2 +-
src/libs/routes/SMPPIR/indigenas_territorial.js | 10 ++++++++++
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/libs/routes/SMPPIR/indigenas_enrollment.js b/src/libs/routes/SMPPIR/indigenas_enrollment.js
index ee69fec0..d07bf14d 100644
--- a/src/libs/routes/SMPPIR/indigenas_enrollment.js
+++ b/src/libs/routes/SMPPIR/indigenas_enrollment.js
@@ -138,7 +138,7 @@ rqf.addField({
indigenasSchoolsApp.get('/', rqf.parse(), rqf.build(), function (req, res, next) {
console.log(req.sql.toString());
- req.sql.field('SUM(total) AS Total').from('terras_indigenas');
+ req.sql.field('SUM(total) AS Total').from('indigenas_schools_ag');
next();
}, query, response('indigenas_mat'));
diff --git a/src/libs/routes/SMPPIR/indigenas_schools.js b/src/libs/routes/SMPPIR/indigenas_schools.js
index b1eaae31..51257142 100644
--- a/src/libs/routes/SMPPIR/indigenas_schools.js
+++ b/src/libs/routes/SMPPIR/indigenas_schools.js
@@ -138,7 +138,7 @@ rqf.addField({
indigenasSchoolsApp.get('/', rqf.parse(), rqf.build(), function (req, res, next) {
console.log(req.sql.toString());
- req.sql.field('COUNT(distinct id) AS Total').from('terras_indigenas');
+ req.sql.field('COUNT(distinct id) AS Total').from('indigenas_schools_ag');
next();
}, query, response('indigenas_esc'));
diff --git a/src/libs/routes/SMPPIR/indigenas_territorial.js b/src/libs/routes/SMPPIR/indigenas_territorial.js
index 1336a973..2ca8a0f3 100644
--- a/src/libs/routes/SMPPIR/indigenas_territorial.js
+++ b/src/libs/routes/SMPPIR/indigenas_territorial.js
@@ -114,6 +114,16 @@ rqf.addField({
type: 'string',
field: 'tipo_modalidade'
}
+}).addValue({
+ name: 'county',
+ table: 'terras_indigenas',
+ tableField: 'nome_municipio',
+ resultField: 'nome_municipio',
+ where: {
+ relation: '=',
+ type: 'string',
+ field: 'nome_municipio'
+ }
});
indigenasTerritorialApp.get('/', rqf.parse(), rqf.build(), function (req, res, next) {
--
GitLab