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

@@ -819,7 +819,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(), query, (req, res, next) => {
+}, rqf.build(), (req, res, next) => {console.log(req.sql.toString()); next()},query, (req, res, next) => {
     for (var res of req.result){
         res.cursando = Number(res.cursando);
         res.concluinte = Number(res.concluinte);
@@ -827,8 +827,10 @@ universityEnrollmentApp.get('/enrollment_situation', rqf.parse(), (req, res, nex
         res.trancado = Number(res.trancado);
         res.total = res.cursando + res.concluinte + res.evadido + res.trancado
     }
+    
     next();
 }, id2str.transform(), response('enrollmentSituation'));
 
 
+
 module.exports = universityEnrollmentApp;
\ No newline at end of file