diff --git a/src/libs/routes_v1/enrollmentAggregate.js b/src/libs/routes_v1/enrollmentAggregate.js index 62d1e9c8c64862a0b081844ac68e03915716ee4a..d50bfa3c65584a3e4fac122e3eae43d0b9ec4226 100644 --- a/src/libs/routes_v1/enrollmentAggregate.js +++ b/src/libs/routes_v1/enrollmentAggregate.js @@ -392,7 +392,7 @@ rqf.addField({ foreign: 'estado_id', foreignTable: 'escola' } -}, 'filter').addValueToField({ +}, 'filter').addValue({ name: 'city', table: 'municipio', tableField: ['nome', 'id'], @@ -402,29 +402,13 @@ rqf.addField({ type: 'integer', field: 'municipio_id', table: 'escola' - }, join: { primary: 'id', 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'],