Merge branch 'hotfix_school_code'

src/libs/routes/class.js

@@ -325,7 +325,22 @@ rqfCount.addField({
       type: 'boolean',
       field: 'tempo_integral'
   }
-}).addValue({
+}).addValueToField({
+    name: 'school',
+    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: 'turma'
+    }
+}, 'dims').addValueToField({
     name: 'school',
     table: 'escola',
     tableField: 'nome_escola',
@@ -340,7 +355,7 @@ rqfCount.addField({
         foreign: ['escola_id', 'ano_censo'],
         foreignTable: 'turma'
     }
-});
+}, 'filter');
 
 
 classApp.get('/', rqfCount.parse(), rqfCount.build(), (req, res, next) => {

src/libs/routes/teacher.js

@@ -296,7 +296,22 @@ rqf.addField({
         foreign: 'escola_municipio_id',
         foreignTable: 'docente'
     }
-}, 'filter').addValue({
+}, 'filter').addValueToField({
+    name: 'school',
+    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: 'docente'
+    }
+}, 'dims').addValueToField({
     name: 'school',
     table: 'escola',
     tableField: 'nome_escola',
@@ -311,7 +326,7 @@ rqf.addField({
         foreign: ['escola_id', 'ano_censo'],
         foreignTable: 'docente'
     }
-}).addValue({
+}, 'filter').addValue({
     name: 'location',
     table: 'docente',
     tableField: 'cod_localizacao',