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

src/libs/routes_v1/enrollmentAggregate.js

@@ -393,7 +393,7 @@ rqf.addField({
         foreign: 'estado_id',
         foreignTable: 'escola'
     }
-}, 'filter').addValueToField({
+}, 'filter').addValue({
     name: 'city',
     table: 'municipio',
     tableField: ['nome', 'id'],
@@ -409,22 +409,7 @@ rqf.addField({
         foreign: 'municipio_id',
         foreignTable: 'escola'
     }
-}, 'dims').addValueToField({
-    name: 'city',
-    table: 'municipio',
-    tableField: 'nome',
-    resultField: 'city_name',
-    where: {
-        relation: '=',
-        type: 'integer',
-        field: 'id'
-    },
-    join: {
-        primary: 'id',
-        foreign: 'municipio_id',
-        foreignTable: 'escola'
-    }
-}, 'filter').addValueToField({
+}).addValueToField({
     name: 'school',
     table: 'escola',
     tableField: ['nome_escola', 'id'],