Merge branch 'development' of gitlab.c3sl.ufpr.br:simcaq/simcaq-node into development

src/libs/routes/classroom.js

@@ -75,16 +75,37 @@ rqf.addField({
     name: 'dims',
     field: true,
     where: false
-}).addValue({
+}).addValueToField({
     name: 'school',
     table: 'escola',
-    tableField: 'id',
+    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: 'matricula'
     }
-}).addValueToField({
+}, 'dims').addValueToField({
+    name: 'school',
+    table: 'escola',
+    tableField: 'nome_escola',
+    resultField: 'school_name',
+    where: {
+        relation: '=',
+        type: 'integer',
+        field: 'id'
+    },
+    join: {
+        primary: ['id', 'ano_censo'],
+        foreign: ['escola_id', 'ano_censo'],
+        foreignTable: 'matricula'
+    }
+}, 'filter').addValueToField({
     name: 'city',
     table: 'municipio',
     tableField: ['nome', 'id'],