Skip to content
Snippets Groups Projects

dev -> homologa

Merged Fernando Gbur dos Santos requested to merge development into homologa
1 file
+ 2
17
Compare changes
  • Side-by-side
  • Inline
@@ -392,7 +392,7 @@ rqf.addField({
@@ -392,7 +392,7 @@ rqf.addField({
foreign: 'estado_id',
foreign: 'estado_id',
foreignTable: 'escola'
foreignTable: 'escola'
}
}
}, 'filter').addValueToField({
}, 'filter').addValue({
name: 'city',
name: 'city',
table: 'municipio',
table: 'municipio',
tableField: ['nome', 'id'],
tableField: ['nome', 'id'],
@@ -408,22 +408,7 @@ rqf.addField({
@@ -408,22 +408,7 @@ rqf.addField({
foreign: 'municipio_id',
foreign: 'municipio_id',
foreignTable: 'escola'
foreignTable: 'escola'
}
}
}, 'dims').addValueToField({
}).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({
name: 'school',
name: 'school',
table: 'escola',
table: 'escola',
tableField: ['nome_escola', 'id'],
tableField: ['nome_escola', 'id'],
Loading