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

@@ -103,7 +103,7 @@ rqf.addField({
         foreignTable: 'numero_estudantes_aee'
     }
 }, 'filter').addValue({
-    name: 'region',
+    name: 'region', // working
     table: 'regiao',
     tableField: ['nome', 'id'],
     resultField: ['region_name', 'region_id'],
@@ -119,14 +119,19 @@ rqf.addField({
     }
 }).addValueToField({
     name: 'school',
-    table: 'numero_estudantes_aee',
-    tableField: 'escola_id',
-    resultField: 'school_id',
+    table: 'escola',
+    tableField: ['nome_escola', 'id'],
+    resultField: ['school_name', 'school_id'],
     where: {
         relation: '=',
         type: 'integer',
         field: 'id'
     },
+    join: {
+        primary: ['id', 'ano_censo'],
+        foreign: ['escola_id', 'ano_censo'],
+        foreignTable: 'numero_estudantes_aee'
+    }
 }, 'filter').addValueToField({
     name: 'locale_id', // working
     table: 'numero_estudantes_aee',