Merge new updates into master

adding filters and changing base consult on employees and teacher tables

edit base consult filters

src/libs/routes/studentsAee.js

@@ -71,8 +71,8 @@ rqf.addField({
     name: 'dims',
     field: true,
     where: false
-}).addValueToField({ // working
-    name: 'state',
+}).addValueToField({ 
+    name: 'state', // working
     table: 'estado',
     tableField: ['sigla', 'id'],
     resultField: ['sigla_uf', 'cod_uf'],
@@ -88,7 +88,7 @@ rqf.addField({
         foreignTable: 'numero_estudantes_aee'
     }
 }, 'filter').addValueToField({
-    name: 'city',
+    name: 'city', // working
     table: 'municipio',
     tableField: ['nome', 'id'],
     resultField: ['city_name', 'city_id'],
@@ -106,12 +106,11 @@ rqf.addField({
     name: 'region',
     table: 'regiao',
     tableField: ['nome', 'id'],
-    resultField: ['region_name', 'regiao_id'],
+    resultField: ['region_name', 'region_id'],
     where: {
         relation: '=',
         type: 'integer',
-        field: 'id',
-        table: 'numero_estudantes_aee'
+        field: 'id'
     },
     join: {
         primary: 'id',