Skip to content
Snippets Groups Projects
Commit 230225d2 authored by Glenda Train's avatar Glenda Train
Browse files

Merge branch 'auxiliar-route' into v1.6.0

parents 3265b415 16fb0ff5
No related branches found
No related tags found
1 merge request!145v1.6.0
Pipeline #17247 failed
......@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
## 1.6.0 - 2018-08-14
### Added
- Add school infrastructure route
### Changed
- Fix auxiliar indicator
## 1.5.0 - 2018-07-30
### Added
......
......@@ -238,6 +238,36 @@ rqf.addField({
foreign: 'escola_municipio_id',
foreignTable: 'docente'
}
}, 'filter').addValueToField({
name: 'school',
table: 'escola',
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: 'docente'
}
}, '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: 'docente'
}
}, 'filter').addValue({
name: 'location',
table: 'docente',
......@@ -298,7 +328,7 @@ auxiliarApp.get('/', rqf.parse(), (req, res, next) => {
.from('docente')
.group('docente.ano_censo')
.order('docente.ano_censo')
.where('(docente.tipo_turma_id <= 3 AND docente.dependencia_adm_id > 1 AND docente.tipo_docente = 2)');
.where('(docente.tipo_turma_id <= 3 AND docente.tipo_docente = 2)');
next();
}, rqf.build(), query, addMissing(rqf), id2str.transform(), response('auxiliar'));
......@@ -310,7 +340,7 @@ auxiliarApp.get('/count', rqf.parse(), (req, res, next) => {
.from('docente')
.group('docente.ano_censo')
.order('docente.ano_censo')
.where('((docente.tipo_turma_id <= 3) AND (docente.dependencia_adm_id = 2 OR docente.dependencia_adm_id = 3) AND (docente.tipo_docente = 2))');
.where('(docente.tipo_turma_id <= 3 AND docente.dependencia_adm_id <= 3 AND docente.tipo_docente = 2)');
next();
}, rqf.build(), query, addMissing(rqf), id2str.transform(), response('auxiliar'));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment