Merge new updates into master

adding filters and changing base consult on employees and teacher tables

edit base consult filters

src/libs/routes/universityEnrollment.js

@@ -198,7 +198,7 @@ universityEnrollmentApp.get('/upper_turn', (req, res, next) => {
             id: i,
             name: id2str.upperTurn(i)
         });
-    }
+    };
     req.result.push({
         id: 99,
         name: id2str.upperTurn(99)
@@ -823,7 +823,7 @@ universityEnrollmentApp.get('/enrollment_situation', rqf.parse(), (req, res, nex
     .group('localoferta_ens_superior_matricula.ano_censo')
     .order('localoferta_ens_superior_matricula.ano_censo')
     next()
-}, rqf.build(), /*(req, res, next) => {console.log(req.sql.toString()); next()},*/query, (req, res, next) => {
+}, rqf.build(),query, (req, res, next) => {
     for (var res of req.result){
         res.cursando = Number(res.cursando);
         res.concluinte = Number(res.concluinte);
@@ -837,4 +837,5 @@ universityEnrollmentApp.get('/enrollment_situation', rqf.parse(), (req, res, nex
 
 
 
-module.exports = universityEnrollmentApp;
\ No newline at end of file
+module.exports = universityEnrollmentApp;
+