Skip to content
Snippets Groups Projects
Commit 0f53a6e4 authored by Fernando Erd's avatar Fernando Erd :ok_hand:
Browse files

Merge remote-tracking branch 'origin/v1.11.11'

parents d9a3bdf5 c842a21a
Branches
No related tags found
1 merge request!28Development
...@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. ...@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/) The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/). and this project adheres to [Semantic Versioning](http://semver.org/).
## 1.11.11 - 2019-09-09
## Changed
- Changed classroomCount filters
## 1.11.10 - 2019-08-23 ## 1.11.10 - 2019-08-23
## Changed ## Changed
- Removed year limitation - Removed year limitation
......
...@@ -271,7 +271,8 @@ classroomCountApp.post('/', rqf.parse(), (req, res, next) => { ...@@ -271,7 +271,8 @@ classroomCountApp.post('/', rqf.parse(), (req, res, next) => {
.group('escola.ano_censo') .group('escola.ano_censo')
.order('escola.ano_censo') .order('escola.ano_censo')
.where('escola.situacao_de_funcionamento = 1') .where('escola.situacao_de_funcionamento = 1')
.where('escola.dependencia_adm_id < 4'); .where('escola.dependencia_adm_id < 4')
.where('escola.ensino_regular = 1 OR escola.ensino_eja = 1 OR escola.educacao_profissional = 1');
next(); next();
}, rqf.build(), query, id2str.transform(), (req, res, next) => { }, rqf.build(), query, id2str.transform(), (req, res, next) => {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment