Merge new updates into master

adding filters and changing base consult on employees and teacher tables

edit base consult filters

src/libs/routes/enrollment.js

@@ -756,7 +756,7 @@ enrollmentApp.get('/', rqf.parse(), (req, res, next) => {
     .order('matricula.ano_censo')
     .where('((matricula.tipo<=3 OR matricula.tipo IS NULL) AND (matricula.tipo_atendimento_turma IS NULL OR matricula.tipo_atendimento_turma <= 2))');
     next();
-}, rqf.build(), query, id2str.transform(false), response('enrollment'));
+}, rqf.build(), (req, res, next) => {console.log(req.sql.toString()); next();}, query, id2str.transform(false), response('enrollment'));
 
 enrollmentApp.get('/diagnosis', rqf.parse(), (req, res, next) => {
     req.dims = {};