Merge branch 'v1.9.5'

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.9.5 - 2019-03-15
+## Changed
+- Fix join's in class count route
+
 ## 1.9.4 - 2019-03-12
 ## Changed
 - Change docente.id to docente.id_docente

src/libs/routes/classCount.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 classCountApp = express.Router();
@@ -337,7 +357,7 @@ classCountApp.get('/count', rqf.parse(), (req, res, next) => {
 }, rqf.build(), query, addMissing(rqf), id2str.transform(), response('class_count'));
 
 // LDE
-classCountApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
+classCountApp.get('/', rqf.parse(), (req, res, next) => {
   // Faz a consulta do número de alunos pelas dimensões
   if(("education_level_mod" in req.dims) || ("education_level_mod" in req.filter) || ("education_level_short" in req.dims)) {
     req.sql.field("'Brasil'", 'name')