Skip to content
Snippets Groups Projects
Commit f12d3d86 authored by Pietro Cavassin's avatar Pietro Cavassin
Browse files

Merge branch 'localoffer_upd' into 'dev'

Add local offer name and year filter

See merge request !333
parents 0ca0bbab 06345fd5
No related branches found
No related tags found
4 merge requests!335Homologa,!334Dev,!333Add local offer name and year filter,!309Merge new updates into master
...@@ -137,7 +137,18 @@ rqf.addField({ ...@@ -137,7 +137,18 @@ rqf.addField({
field: 'cod_ies', field: 'cod_ies',
table: 'localoferta_ens_superior' table: 'localoferta_ens_superior'
} }
}, 'filter'); }, 'filter').addValue({
name: 'year',
table: 'localoferta_ens_superior',
tableField: 'ano_censo',
resultField: 'year',
where: {
relation: '=',
type: 'integer',
table: 'localoferta_ens_superior',
field: 'ano_censo'
}
});
universityLocalOfferApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { universityLocalOfferApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
...@@ -145,6 +156,7 @@ universityLocalOfferApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => ...@@ -145,6 +156,7 @@ universityLocalOfferApp.get('/', rqf.parse(), rqf.build(), (req, res, next) =>
.field('distinct localoferta_ens_superior.cod_ies', 'id') .field('distinct localoferta_ens_superior.cod_ies', 'id')
.field('localoferta_ens_superior.ano_censo', 'year') .field('localoferta_ens_superior.ano_censo', 'year')
.field('ies_ens_superior.nome_ies', 'name') .field('ies_ens_superior.nome_ies', 'name')
.field('localoferta_ens_superior.nome', 'localoffer_name')
.field('localoferta_ens_superior.cod_uf', 'state_id') .field('localoferta_ens_superior.cod_uf', 'state_id')
.field('localoferta_ens_superior.cod_municipio', 'city_id') .field('localoferta_ens_superior.cod_municipio', 'city_id')
.field('localoferta_ens_superior.cod_regiao', 'region_id') .field('localoferta_ens_superior.cod_regiao', 'region_id')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment