Merge branch 'rotas_indigenas' into 'development'

Rotas indigenas

See merge request !41

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;
+module.exports = indigenasEnrollmentApp;
\ No newline at end of file

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'));
 

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) {