diff --git a/src/libs/convert/especialEducation.js b/src/libs/convert/specialEducation.js similarity index 95% rename from src/libs/convert/especialEducation.js rename to src/libs/convert/specialEducation.js index 4634978459f9e89bc473560a14119b0f196d946e..aac420d29f5aff4dd1d38287b93794e2c5576962 100644 --- a/src/libs/convert/especialEducation.js +++ b/src/libs/convert/specialEducation.js @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with simcaq-node. If not, see <https://www.gnu.org/licenses/>. */ -module.exports = function especialEducation(id) { +module.exports = function specialEducation(id) { switch (id) { case 1: return 'Inclusiva'; diff --git a/src/libs/middlewares/aggregateData.js b/src/libs/middlewares/aggregateData.js index c20f3d551c76588f1a6602ffc282838357d8ae89..714830dfe020389b75cd009d9b04ce99dda39ca8 100644 --- a/src/libs/middlewares/aggregateData.js +++ b/src/libs/middlewares/aggregateData.js @@ -20,13 +20,13 @@ const convert = { integral_time_agg: 'integralTime', period_agg: 'period', modality_integral_time: 'educationLevelBasic', - especial_education: 'especialEducation' + special_education: 'specialEducation' } function aggregateData(req, res, next) { if (req.query.dims) { const newResult = [] - const aggregateFields = ['gender', 'age_range', 'ethnic_group', 'education_level_mod_agg', 'integral_time_agg', 'period_agg', 'modality_integral_time', 'especial_education'] + const aggregateFields = ['gender', 'age_range', 'ethnic_group', 'education_level_mod_agg', 'integral_time_agg', 'period_agg', 'modality_integral_time', 'special_education'] let id; const fields = req.query.dims.split(','); let currentAggregateField; diff --git a/src/libs/middlewares/id2str.js b/src/libs/middlewares/id2str.js index 06f24488923dba974e4b1fe5ad8eafe10a92d0a4..1d7b3de41b3209fe5d3f1b5d64f5152df500bccf 100644 --- a/src/libs/middlewares/id2str.js +++ b/src/libs/middlewares/id2str.js @@ -116,7 +116,7 @@ const metroCode = require(`${libs}/convert/metroCode`); const modalityShift = require(`${libs}/convert/modalityShift`); const incomeRange = require(`${libs}/convert/incomeRange`); const ageRangeAggregate = require(`${libs}/convert/ageRangeAggregate`); -const especialEducation = require(`${libs}/convert/especialEducation`); +const specialEducation = require(`${libs}/convert/specialEducation`); const ids = { gender_id: gender, @@ -226,7 +226,7 @@ const ids = { metro_code_id: metroCode, modality_shift_id: modalityShift, income_range_id: incomeRange, - especial_education: especialEducation + special_education: specialEducation }; function transform(removeId=false) { @@ -358,5 +358,5 @@ module.exports = { metroCode, modalityShift, incomeRange, - especialEducation + specialEducation }; diff --git a/src/libs/routes_v1/enrollmentAggregate.js b/src/libs/routes_v1/enrollmentAggregate.js index e7de586c71cc895ea5fbe79c369b521c80e20893..d266d2403c00b742c3329fc871d863b9cf986842 100644 --- a/src/libs/routes_v1/enrollmentAggregate.js +++ b/src/libs/routes_v1/enrollmentAggregate.js @@ -78,7 +78,7 @@ enrollmentAggregateApp.get('/adm_dependency_detailed', (req, res, next) => { next(); }, response('adm_dependency_detailed')); -enrollmentAggregateApp.get('/education_level_mod', (req, res, next) => { +enrollmentAggregateApp.get('/education_level_mod_agg', (req, res, next) => { req.result = [] for (let i = 1; i <= 13; i++) { @@ -87,9 +87,9 @@ enrollmentAggregateApp.get('/education_level_mod', (req, res, next) => { }); } next(); -}, response('education_level_mod')); +}, response('education_level_mod_agg')); -enrollmentAggregateApp.get('/integral_time', (req, res, next) => { +enrollmentAggregateApp.get('/integral_time_agg', (req, res, next) => { req.result = [] for (let i = 0; i <= 3; i++) { @@ -98,7 +98,7 @@ enrollmentAggregateApp.get('/integral_time', (req, res, next) => { }); } next(); -}, response('education_level_mod')); +}, response('integral_time_agg')); enrollmentAggregateApp.get('/location', (req, res, next) => { req.result = [] @@ -212,17 +212,17 @@ enrollmentAggregateApp.get('/state', (req, res, next) => { next(); }, response('state')); -enrollmentAggregateApp.get('/especial_education', (req, res, next) => { +enrollmentAggregateApp.get('/special_education', (req, res, next) => { req.result = [] for (let i = 1; i <= 2; i++) { req.result.push({ - id: i, name: id2str.especialEducation(i) + id: i, name: id2str.specialEducation(i) }); } next(); -}, response('especial_education')); +}, response('special_education')); rqf.addField({ @@ -574,7 +574,7 @@ enrollmentAggregateApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { .group('escola.ano_censo') .order('escola.ano_censo') } - else if (req.query.dims && req.query.dims.includes('especial_education')) { + else if (req.query.dims && req.query.dims.includes('special_education')) { req.sql.from('escola') .field('SUM(escola.qt_mat_esp_cc)', 'total_qt_mat_esp_cc') .field('SUM(escola.qt_mat_esp_ce)', 'total_qt_mat_esp_ce')