diff --git a/src/libs/routes/SMPPIR/indigenas_enrollment.js b/src/libs/routes/SMPPIR/indigenas_enrollment.js index ee69fec0986150aa22af078daf819bf972dcfddf..898125705f123ae90adbaff569197f2d5bd64da6 100644 --- a/src/libs/routes/SMPPIR/indigenas_enrollment.js +++ b/src/libs/routes/SMPPIR/indigenas_enrollment.js @@ -22,7 +22,7 @@ along with SMPPIR-Node. If not, see <https://www.gnu.org/licenses/>. var express = require('express'); -var indigenasSchoolsApp = express.Router(); +var indigenasEnrollmentApp = express.Router(); var libs = process.cwd() + '/libs'; @@ -136,10 +136,10 @@ rqf.addField({ } }); -indigenasSchoolsApp.get('/', rqf.parse(), rqf.build(), function (req, res, next) { +indigenasEnrollmentApp.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')); -module.exports = indigenasSchoolsApp; \ No newline at end of file +module.exports = indigenasEnrollmentApp; \ No newline at end of file diff --git a/src/libs/routes/SMPPIR/indigenas_schools.js b/src/libs/routes/SMPPIR/indigenas_schools.js index b1eaae312215c689126043a8268ac4a16fc6b983..51257142e7b34bada5c052c859fcb4b4c6f18ca8 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 1336a97369205414713d17ade9eadf0d1238e5db..2ca8a0f324c68ee699fa91df0fdfd4c6132d6c77 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) {