Merge branch 'v1.6.0' into portalMecSchool

CHANGELOG.md

@@ -4,17 +4,18 @@ 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/).
 
-## UNRELEASED
+## 1.6.0 - 2018-08-17
 ### Added
-- Dimension state in route enrollment now returns state name and id
-- School route now has a search parameter. You can search by city name or state abbreviation
+- Dimension state in route `enrollment` now returns state name and id
+- `school` route now has a `search` parameter. You can search by city name or state abbreviation
 - Added all age range convertion
 - Added special class and all age range to id2str
-- Added school infratructure route
-- Added INEP route for Portal MEC
+- Added `school infratructure` route
+- Added `INEP` route for Portal MEC
 ### Changed
+- Fix `auxiliar` indicator
 - Add property "don't group" in RQF to dismiss the group by and order by clause
-- Change RQF filters in auxiliar route
+- Change RQF filters in `auxiliar` route
 - Fix total classrooms needed bug in classroom count
 - Add special class and all age range to enrollment route
 

src/libs/routes/api.js

@@ -76,10 +76,9 @@ const dailyChargeAmount = require(`${libs}/routes/dailyChargeAmount`);
 
 const cub = require(`${libs}/routes/cub`);
 
-const classCount = require(`${libs}/routes/classCount`);
-
 const portalMecInep = require(`${libs}/routes/portalMecInep`);
 
+
 api.get('/', (req, res) => {
     res.json({ msg: 'SimCAQ API is running' });
 });
@@ -120,7 +119,6 @@ api.use('/transport', transport);
 api.use('/cub', cub);
 api.use('/auxiliar', auxiliar);
 api.use('/verify_teacher', verifyTeacher);
-api.use('/class_count', classCount);
-api.use('/poltal_mec_inep', portalMecInep);
+api.use('/portal_mec_inep', portalMecInep);
 
 module.exports = api;

src/libs/routes/portalMecInep.js

@@ -46,14 +46,13 @@ rqf.addField({
 portalMecInepApp.get('/', rqf.parse(), (req, res, next) => {
 
     req.sql.field('DISTINCT escola.id', 'id')
-    .field('escola.nome_escola', 'school_name')
+    .field('escola.nome_escola', 'name')
     .from('escola')
     .join('estado', null, 'estado.id=escola.estado_id')
     .field('estado.nome', 'state_name')
     .join('municipio', null, 'municipio.id=escola.municipio_id')
     .field('municipio.nome', 'city_name')
 
-
     next();
 
 }, rqf.build(), query, response('portalMec_inep'));