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

CHANGELOG.md

@@ -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/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 1.11.12 - 2019-09-10
+## Changed
+- Changed classroom filters to match classroomCount
+
 ## 1.11.11 - 2019-09-09
 ## Changed
 - Changed classroomCount filters

src/libs/routes/classroom.js

+/*
+Copyright (C) 2016 Centro de Computacao Cientifica e Software Livre
+Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+
+This file is part of simcaq-node.
+
+simcaq-node is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+simcaq-node is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with simcaq-node.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 const express = require('express');
 
 const classroomApp = express.Router();
@@ -24,6 +44,9 @@ let rqf = new ReqQueryFields();
 
 let rqfCount = new ReqQueryFields();
 
+//classroomApp.use(cache('15 day'));
+
+
 // Complete range of the enrollments dataset.
 // Returns a tuple of start and ending years of the complete enrollments dataset.
 classroomApp.get('/year_range', (req, res, next) => {
@@ -226,7 +249,8 @@ classroomApp.get('/', cache('15 day'), rqf.parse(), rqf.build(), (req, res, next
         .field('escola.ano_censo', 'year')
         .group('escola.ano_censo')
         .order('escola.ano_censo')
-        .where('escola.situacao_de_funcionamento = 1 AND escola.local_func_predio_escolar = 1');
+        .where('escola.situacao_de_funcionamento = 1 AND escola.local_func_predio_escolar = 1')
+        .where('escola.ensino_regular = 1 OR escola.ensino_eja = 1 OR escola.educacao_profissional = 1');
     next();
 }, query, addMissing(rqf), id2str.transform(), response('classroom'));